Merge tag 'v11.33.2'

Signed-off-by: Mior Muhammad Zaki <crynobone@gmail.com>
illuminate · Nov 20, 2024 · bbda102 · bbda102
2 parents 61e0148 + d899014
commit bbda102
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 20 deletions.
diff --git a/Access/Gate.php b/Access/Gate.php
@@ -96,14 +96,15 @@ class Gate implements GateContract
      * @param  callable|null  $guessPolicyNamesUsingCallback
      * @return void
      */
-    public function __construct(Container $container,
+    public function __construct(
+        Container $container,
         callable $userResolver,
         array $abilities = [],
         array $policies = [],
         array $beforeCallbacks = [],
         array $afterCallbacks = [],
-        ?callable $guessPolicyNamesUsingCallback = null)
-    {
+        ?callable $guessPolicyNamesUsingCallback = null,
+    ) {
         $this->policies = $policies;
         $this->container = $container;
         $this->abilities = $abilities;
@@ -354,7 +355,7 @@ public function denies($ability, $arguments = [])
      */
     public function check($abilities, $arguments = [])
     {
-        return collect($abilities)->every(
+        return (new Collection($abilities))->every(
             fn ($ability) => $this->inspect($ability, $arguments)->allowed()
         );
     }
@@ -368,7 +369,7 @@ public function check($abilities, $arguments = [])
      */
     public function any($abilities, $arguments = [])
     {
-        return collect($abilities)->contains(fn ($ability) => $this->check($ability, $arguments));
+        return (new Collection($abilities))->contains(fn ($ability) => $this->check($ability, $arguments));
     }
 
     /**

diff --git a/Middleware/Authorize.php b/Middleware/Authorize.php
@@ -5,6 +5,7 @@
 use Closure;
 use Illuminate\Contracts\Auth\Access\Gate;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Support\Collection;
 
 use function Illuminate\Support\enum_value;
 
@@ -72,7 +73,7 @@ protected function getGateArguments($request, $models)
             return [];
         }
 
-        return collect($models)->map(function ($model) use ($request) {
+        return (new Collection($models))->map(function ($model) use ($request) {
             return $model instanceof Model ? $model : $this->getModel($request, $model);
         })->all();
     }

diff --git a/Passwords/CacheTokenRepository.php b/Passwords/CacheTokenRepository.php
@@ -42,7 +42,7 @@ public function create(CanResetPasswordContract $user)
 
         $this->cache->put(
             $this->prefix.$user->getEmailForPasswordReset(),
-            [$token, Carbon::now()->format($this->format)],
+            [$this->hasher->make($token), Carbon::now()->format($this->format)],
             $this->expires,
         );
 

diff --git a/Passwords/DatabaseTokenRepository.php b/Passwords/DatabaseTokenRepository.php
@@ -63,10 +63,14 @@ class DatabaseTokenRepository implements TokenRepositoryInterface
      * @param  int  $throttle
      * @return void
      */
-    public function __construct(ConnectionInterface $connection, HasherContract $hasher,
-                                $table, $hashKey, $expires = 60,
-                                $throttle = 60)
-    {
+    public function __construct(
+        ConnectionInterface $connection,
+        HasherContract $hasher,
+        $table,
+        $hashKey,
+        $expires = 60,
+        $throttle = 60,
+    ) {
         $this->table = $table;
         $this->hasher = $hasher;
         $this->hashKey = $hashKey;

diff --git a/SessionGuard.php b/SessionGuard.php
@@ -128,13 +128,14 @@ class SessionGuard implements StatefulGuard, SupportsBasicAuth
      * @param  bool  $rehashOnLogin
      * @return void
      */
-    public function __construct($name,
-                                UserProvider $provider,
-                                Session $session,
-                                ?Request $request = null,
-                                ?Timebox $timebox = null,
-                                bool $rehashOnLogin = true)
-    {
+    public function __construct(
+        $name,
+        UserProvider $provider,
+        Session $session,
+        ?Request $request = null,
+        ?Timebox $timebox = null,
+        bool $rehashOnLogin = true,
+    ) {
         $this->name = $name;
         $this->session = $session;
         $this->request = $request;

diff --git a/TokenGuard.php b/TokenGuard.php
@@ -54,8 +54,8 @@ public function __construct(
         Request $request,
         $inputKey = 'api_token',
         $storageKey = 'api_token',
-        $hash = false)
-    {
+        $hash = false,
+    ) {
         $this->hash = $hash;
         $this->request = $request;
         $this->provider = $provider;