Merge branch '11.x'

# Conflicts:
#	CHANGELOG.md
#	src/Illuminate/Foundation/Application.php

Author: driesvints

config/hashing.php

@@ -30,7 +30,7 @@
 
     'bcrypt' => [
         'rounds' => env('BCRYPT_ROUNDS', 12),
-        'verify' => true,
+        'verify' => env('HASH_VERIFY', true),
     ],
 
     /*
@@ -48,7 +48,7 @@
         'memory' => env('ARGON_MEMORY', 65536),
         'threads' => env('ARGON_THREADS', 1),
         'time' => env('ARGON_TIME', 4),
-        'verify' => true,
+        'verify' => env('HASH_VERIFY', true),
     ],
 
     /*

src/Illuminate/Auth/Access/AuthorizationException.php

@@ -29,7 +29,7 @@ class AuthorizationException extends Exception
      * @param  \Throwable|null  $previous
      * @return void
      */
-    public function __construct($message = null, $code = null, Throwable $previous = null)
+    public function __construct($message = null, $code = null, ?Throwable $previous = null)
     {
         parent::__construct($message ?? 'This action is unauthorized.', 0, $previous);
 

src/Illuminate/Auth/Access/Gate.php

@@ -100,7 +100,7 @@ public function __construct(Container $container,
         array $policies = [],
         array $beforeCallbacks = [],
         array $afterCallbacks = [],
-        callable $guessPolicyNamesUsingCallback = null)
+        ?callable $guessPolicyNamesUsingCallback = null)
     {
         $this->policies = $policies;
         $this->container = $container;
@@ -224,7 +224,7 @@ public function define($ability, $callback)
      * @param  array|null  $abilities
      * @return $this
      */
-    public function resource($name, $class, array $abilities = null)
+    public function resource($name, $class, ?array $abilities = null)
     {
         $abilities = $abilities ?: [
             'viewAny' => 'viewAny',

src/Illuminate/Auth/Middleware/Authorize.php

@@ -62,7 +62,7 @@ public function handle($request, Closure $next, $ability, ...$models)
      *
      * @param  \Illuminate\Http\Request  $request
      * @param  array|null  $models
-     * @return \Illuminate\Database\Eloquent\Model|array|string
+     * @return array
      */
     protected function getGateArguments($request, $models)
     {

src/Illuminate/Auth/Passwords/PasswordBroker.php

@@ -45,7 +45,7 @@ public function __construct(TokenRepositoryInterface $tokens, UserProvider $user
      * @param  \Closure|null  $callback
      * @return string
      */
-    public function sendResetLink(array $credentials, Closure $callback = null)
+    public function sendResetLink(array $credentials, ?Closure $callback = null)
     {
         // First we will check to see if we found a user at the given credentials and
         // if we did not we will redirect back to this current URI with a piece of

src/Illuminate/Auth/RequestGuard.php

@@ -33,7 +33,7 @@ class RequestGuard implements Guard
      * @param  \Illuminate\Contracts\Auth\UserProvider|null  $provider
      * @return void
      */
-    public function __construct(callable $callback, Request $request, UserProvider $provider = null)
+    public function __construct(callable $callback, Request $request, ?UserProvider $provider = null)
     {
         $this->request = $request;
         $this->callback = $callback;

src/Illuminate/Auth/SessionGuard.php

@@ -131,8 +131,8 @@ class SessionGuard implements StatefulGuard, SupportsBasicAuth
     public function __construct($name,
                                 UserProvider $provider,
                                 Session $session,
-                                Request $request = null,
-                                Timebox $timebox = null,
+                                ?Request $request = null,
+                                ?Timebox $timebox = null,
                                 bool $rehashOnLogin = true)
     {
         $this->name = $name;
@@ -253,6 +253,8 @@ public function once(array $credentials = [])
         $this->fireAttemptEvent($credentials);
 
         if ($this->validate($credentials)) {
+            $this->rehashPasswordIfRequired($this->lastAttempted, $credentials);
+
             $this->setUser($this->lastAttempted);
 
             return true;

src/Illuminate/Broadcasting/BroadcastManager.php

@@ -64,7 +64,7 @@ public function __construct($app)
      * @param  array|null  $attributes
      * @return void
      */
-    public function routes(array $attributes = null)
+    public function routes(?array $attributes = null)
     {
         if ($this->app instanceof CachesRoutes && $this->app->routesAreCached()) {
             return;
@@ -86,7 +86,7 @@ public function routes(array $attributes = null)
      * @param  array|null  $attributes
      * @return void
      */
-    public function userRoutes(array $attributes = null)
+    public function userRoutes(?array $attributes = null)
     {
         if ($this->app instanceof CachesRoutes && $this->app->routesAreCached()) {
             return;
@@ -110,7 +110,7 @@ public function userRoutes(array $attributes = null)
      * @param  array|null  $attributes
      * @return void
      */
-    public function channelRoutes(array $attributes = null)
+    public function channelRoutes(?array $attributes = null)
     {
         $this->routes($attributes);
     }

src/Illuminate/Bus/Batch.php

@@ -450,7 +450,7 @@ public function delete()
      * @param  \Throwable|null  $e
      * @return void
      */
-    protected function invokeHandlerCallback($handler, Batch $batch, Throwable $e = null)
+    protected function invokeHandlerCallback($handler, Batch $batch, ?Throwable $e = null)
     {
         try {
             return $handler($batch, $e);

src/Illuminate/Bus/DatabaseBatchRepository.php

@@ -374,9 +374,9 @@ protected function toBatch($batch)
             (int) $batch->failed_jobs,
             (array) json_decode($batch->failed_job_ids, true),
             $this->unserialize($batch->options),
-            CarbonImmutable::createFromTimestamp($batch->created_at),
-            $batch->cancelled_at ? CarbonImmutable::createFromTimestamp($batch->cancelled_at) : $batch->cancelled_at,
-            $batch->finished_at ? CarbonImmutable::createFromTimestamp($batch->finished_at) : $batch->finished_at
+            CarbonImmutable::createFromTimestamp($batch->created_at, date_default_timezone_get()),
+            $batch->cancelled_at ? CarbonImmutable::createFromTimestamp($batch->cancelled_at, date_default_timezone_get()) : $batch->cancelled_at,
+            $batch->finished_at ? CarbonImmutable::createFromTimestamp($batch->finished_at, date_default_timezone_get()) : $batch->finished_at
         );
     }