Merge tag 'v12.25.0'

Signed-off-by: Mior Muhammad Zaki <[email protected]>

Author: crynobone

CHANGELOG.md

@@ -52,6 +52,8 @@
         "symfony/mailer": "^7.4.0|^8.0.0",
         "symfony/mime": "^7.4.0|^8.0.0",
         "symfony/process": "^7.4.0|^8.0.0",
+        "symfony/polyfill-php84": "^1.31",
+        "symfony/polyfill-php85": "^1.31",
         "symfony/routing": "^7.4.0|^8.0.0",
         "symfony/uid": "^7.4.0|^8.0.0",
         "symfony/var-dumper": "^7.4.0|^8.0.0",

composer.json

@@ -326,7 +326,7 @@ public function after(callable $callback)
      * Determine if all of the given abilities should be granted for the current user.
      *
      * @param  iterable|\UnitEnum|string  $ability
-     * @param  array|mixed  $arguments
+     * @param  mixed  $arguments
      * @return bool
      */
     public function allows($ability, $arguments = [])
@@ -338,7 +338,7 @@ public function allows($ability, $arguments = [])
      * Determine if any of the given abilities should be denied for the current user.
      *
      * @param  iterable|\UnitEnum|string  $ability
-     * @param  array|mixed  $arguments
+     * @param  mixed  $arguments
      * @return bool
      */
     public function denies($ability, $arguments = [])
@@ -350,7 +350,7 @@ public function denies($ability, $arguments = [])
      * Determine if all of the given abilities should be granted for the current user.
      *
      * @param  iterable|\UnitEnum|string  $abilities
-     * @param  array|mixed  $arguments
+     * @param  mixed  $arguments
      * @return bool
      */
     public function check($abilities, $arguments = [])
@@ -364,7 +364,7 @@ public function check($abilities, $arguments = [])
      * Determine if any one of the given abilities should be granted for the current user.
      *
      * @param  iterable|\UnitEnum|string  $abilities
-     * @param  array|mixed  $arguments
+     * @param  mixed  $arguments
      * @return bool
      */
     public function any($abilities, $arguments = [])
@@ -376,7 +376,7 @@ public function any($abilities, $arguments = [])
      * Determine if all of the given abilities should be denied for the current user.
      *
      * @param  iterable|\UnitEnum|string  $abilities
-     * @param  array|mixed  $arguments
+     * @param  mixed  $arguments
      * @return bool
      */
     public function none($abilities, $arguments = [])
@@ -388,7 +388,7 @@ public function none($abilities, $arguments = [])
      * Determine if the given ability should be granted for the current user.
      *
      * @param  \UnitEnum|string  $ability
-     * @param  array|mixed  $arguments
+     * @param  mixed  $arguments
      * @return \Illuminate\Auth\Access\Response
      *
      * @throws \Illuminate\Auth\Access\AuthorizationException

src/Illuminate/Auth/Access/Gate.php

@@ -20,7 +20,7 @@ protected function allow($message = null, $code = null)
      * Throws an unauthorized exception.
      *
      * @param  string|null  $message
-     * @param  mixed|null  $code
+     * @param  mixed  $code
      * @return \Illuminate\Auth\Access\Response
      */
     protected function deny($message = null, $code = null)

src/Illuminate/Auth/Access/HandlesAuthorization.php

@@ -5,6 +5,7 @@
 use Closure;
 use Illuminate\Contracts\Routing\ResponseFactory;
 use Illuminate\Contracts\Routing\UrlGenerator;
+use Illuminate\Support\Facades\Date;
 
 class RequirePassword
 {
@@ -92,7 +93,7 @@ public function handle($request, Closure $next, $redirectToRoute = null, $passwo
      */
     protected function shouldConfirmPassword($request, $passwordTimeoutSeconds = null)
     {
-        $confirmedAt = time() - $request->session()->get('auth.password_confirmed_at', 0);
+        $confirmedAt = Date::now()->unix() - $request->session()->get('auth.password_confirmed_at', 0);
 
         return $confirmedAt > ($passwordTimeoutSeconds ?? $this->passwordTimeout);
     }

src/Illuminate/Auth/Middleware/RequirePassword.php

@@ -21,7 +21,7 @@ class VerifyEmail extends Notification
     /**
      * The callback that should be used to build the mail message.
      *
-     * @var \Closure|null
+     * @var (\Closure(mixed, string): \Illuminate\Notifications\Messages\MailMessage|\Illuminate\Contracts\Mail\Mailable)|null
      */
     public static $toMailCallback;
 
@@ -104,7 +104,7 @@ public static function createUrlUsing($callback)
     /**
      * Set a callback that should be used when building the notification mail message.
      *
-     * @param  \Closure  $callback
+     * @param  \Closure(mixed, string): (\Illuminate\Notifications\Messages\MailMessage|\Illuminate\Contracts\Mail\Mailable)  $callback
      * @return void
      */
     public static function toMailUsing($callback)

src/Illuminate/Auth/Notifications/VerifyEmail.php

@@ -24,7 +24,6 @@ public function __construct(
         protected string $hashKey,
         protected int $expires = 3600,
         protected int $throttle = 60,
-        protected string $prefix = '',
     ) {
     }
 
@@ -41,7 +40,7 @@ public function create(CanResetPasswordContract $user)
         $token = hash_hmac('sha256', Str::random(40), $this->hashKey);
 
         $this->cache->put(
-            $this->prefix.$user->getEmailForPasswordReset(),
+            $this->cacheKey($user),
             [$this->hasher->make($token), Carbon::now()->format($this->format)],
             $this->expires,
         );
@@ -58,7 +57,7 @@ public function create(CanResetPasswordContract $user)
      */
     public function exists(CanResetPasswordContract $user, #[\SensitiveParameter] $token)
     {
-        [$record, $createdAt] = $this->cache->get($this->prefix.$user->getEmailForPasswordReset());
+        [$record, $createdAt] = $this->cache->get($this->cacheKey($user));
 
         return $record
             && ! $this->tokenExpired($createdAt)
@@ -84,7 +83,7 @@ protected function tokenExpired($createdAt)
      */
     public function recentlyCreatedToken(CanResetPasswordContract $user)
     {
-        [$record, $createdAt] = $this->cache->get($this->prefix.$user->getEmailForPasswordReset());
+        [$record, $createdAt] = $this->cache->get($this->cacheKey($user));
 
         return $record && $this->tokenRecentlyCreated($createdAt);
     }
@@ -114,7 +113,7 @@ protected function tokenRecentlyCreated($createdAt)
      */
     public function delete(CanResetPasswordContract $user)
     {
-        $this->cache->forget($this->prefix.$user->getEmailForPasswordReset());
+        $this->cache->forget($this->cacheKey($user));
     }
 
     /**
@@ -125,4 +124,15 @@ public function delete(CanResetPasswordContract $user)
     public function deleteExpired()
     {
     }
+
+    /**
+     * Determine the cache key for the given user.
+     *
+     * @param  \Illuminate\Contracts\Auth\CanResetPassword  $user
+     * @return string
+     */
+    public function cacheKey(CanResetPasswordContract $user): string
+    {
+        return hash('sha256', $user->getEmailForPasswordReset());
+    }
 }

src/Illuminate/Auth/Passwords/CacheTokenRepository.php

@@ -95,7 +95,6 @@ protected function createTokenRepository(array $config)
                 $key,
                 ($config['expire'] ?? 60) * 60,
                 $config['throttle'] ?? 0,
-                $config['prefix'] ?? '',
             );
         }
 

src/Illuminate/Auth/Passwords/PasswordBrokerManager.php

@@ -4,7 +4,11 @@
 
 use Illuminate\Broadcasting\BroadcastException;
 use Illuminate\Contracts\Redis\Factory as Redis;
+use Illuminate\Redis\Connections\PhpRedisClusterConnection;
+use Illuminate\Redis\Connections\PredisClusterConnection;
+use Illuminate\Redis\Connections\PredisConnection;
 use Illuminate\Support\Arr;
+use Predis\Connection\Cluster\RedisCluster;
 use Predis\Connection\ConnectionException;
 use RedisException;
 use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
@@ -125,10 +129,30 @@ public function broadcast(array $channels, $event, array $payload = [])
         ]);
 
         try {
-            $connection->eval(
-                $this->broadcastMultipleChannelsScript(),
-                0, $payload, ...$this->formatChannels($channels)
-            );
+            if ($connection instanceof PhpRedisClusterConnection) {
+                foreach ($channels as $channel) {
+                    $connection->publish($channel, $payload);
+                }
+            } elseif ($connection instanceof PredisClusterConnection &&
+                $connection->client()->getConnection() instanceof RedisCluster) {
+                $randomClusterNodeConnection = new PredisConnection(
+                    $connection->client()->getClientBy('slot', mt_rand(0, 16383))
+                );
+
+                if ($events = $connection->getEventDispatcher()) {
+                    $randomClusterNodeConnection->setEventDispatcher($events);
+                }
+
+                $randomClusterNodeConnection->eval(
+                    $this->broadcastMultipleChannelsScript(),
+                    0, $payload, ...$this->formatChannels($channels)
+                );
+            } else {
+                $connection->eval(
+                    $this->broadcastMultipleChannelsScript(),
+                    0, $payload, ...$this->formatChannels($channels)
+                );
+            }
         } catch (ConnectionException|RedisException $e) {
             throw new BroadcastException(
                 sprintf('Redis error: %s.', $e->getMessage())

src/Illuminate/Broadcasting/Broadcasters/RedisBroadcaster.php

@@ -4,6 +4,8 @@
 
 use Illuminate\Support\Arr;
 
+use function Illuminate\Support\enum_value;
+
 trait InteractsWithBroadcasting
 {
     /**
@@ -16,11 +18,13 @@ trait InteractsWithBroadcasting
     /**
      * Broadcast the event using a specific broadcaster.
      *
-     * @param  array|string|null  $connection
+     * @param  \UnitEnum|array|string|null  $connection
      * @return $this
      */
     public function broadcastVia($connection = null)
     {
+        $connection = enum_value($connection);
+
         $this->broadcastConnection = is_null($connection)
             ? [null]
             : Arr::wrap($connection);