Merge tag 'v11.35.0'

Signed-off-by: Mior Muhammad Zaki <crynobone@gmail.com>

Access/Gate.php

@@ -836,12 +836,14 @@ protected function formatAbilityToMethod($ability)
      */
     public function forUser($user)
     {
-        $callback = fn () => $user;
-
         return new static(
-            $this->container, $callback, $this->abilities,
-            $this->policies, $this->beforeCallbacks, $this->afterCallbacks,
-            $this->guessPolicyNamesUsingCallback
+            $this->container,
+            fn () => $user,
+            $this->abilities,
+            $this->policies,
+            $this->beforeCallbacks,
+            $this->afterCallbacks,
+            $this->guessPolicyNamesUsingCallback,
         );
     }
 

AuthManager.php

@@ -122,11 +122,9 @@ protected function callCustomCreator($name, array $config)
      */
     public function createSessionDriver($name, $config)
     {
-        $provider = $this->createUserProvider($config['provider'] ?? null);
-
         $guard = new SessionGuard(
             $name,
-            $provider,
+            $this->createUserProvider($config['provider'] ?? null),
             $this->app['session.store'],
             rehashOnLogin: $this->app['config']->get('hashing.rehash_on_login', true),
         );

CreatesUserProviders.php

@@ -63,9 +63,11 @@ protected function getProviderConfiguration($provider)
      */
     protected function createDatabaseProvider($config)
     {
-        $connection = $this->app['db']->connection($config['connection'] ?? null);
-
-        return new DatabaseUserProvider($connection, $this->app['hash'], $config['table']);
+        return new DatabaseUserProvider(
+            $this->app['db']->connection($config['connection'] ?? null),
+            $this->app['hash'],
+            $config['table'],
+        );
     }
 
     /**

Middleware/Authorize.php

@@ -73,9 +73,9 @@ protected function getGateArguments($request, $models)
             return [];
         }
 
-        return (new Collection($models))->map(function ($model) use ($request) {
-            return $model instanceof Model ? $model : $this->getModel($request, $model);
-        })->all();
+        return (new Collection($models))
+            ->map(fn ($model) => $model instanceof Model ? $model : $this->getModel($request, $model))
+            ->all();
     }
 
     /**