Merge branch '10.x' of github.com:laravel/framework into 10.x

Author: taylorotwell

src/Illuminate/Auth/Middleware/RequirePassword.php

@@ -48,7 +48,7 @@ public function __construct(ResponseFactory $responseFactory, UrlGenerator $urlG
      * Specify the redirect route and timeout for the middleware.
      *
      * @param  string|null  $redirectToRoute
-     * @param  string|null  $passwordTimeoutSeconds
+     * @param  string|int|null  $passwordTimeoutSeconds
      * @return string
      *
      * @named-arguments-supported

src/Illuminate/Cache/FileStore.php

@@ -338,7 +338,7 @@ protected function emptyPayload()
      * @param  string  $key
      * @return string
      */
-    protected function path($key)
+    public function path($key)
     {
         $parts = array_slice(str_split($hash = sha1($key), 2), 0, 2);
 

src/Illuminate/Collections/Collection.php

@@ -374,7 +374,7 @@ public function except($keys)
     /**
      * Run a filter over each of the items.
      *
-     * @param (callable(TValue, TKey): bool)|null  $callback
+     * @param  (callable(TValue, TKey): bool)|null  $callback
      * @return static
      */
     public function filter(callable $callback = null)

src/Illuminate/Database/DetectsLostConnections.php

@@ -62,6 +62,9 @@ protected function causedByLostConnection(Throwable $e)
             'SSL: Operation timed out',
             'Reason: Server is in script upgrade mode. Only administrator can connect at this time.',
             'Unknown $curl_error_code: 77',
+            'SSL: Handshake timed out',
+            'SQLSTATE[08006] [7] SSL error: sslv3 alert unexpected message',
+            'SQLSTATE[08006] [7] unrecognized SSL error code:',
         ]);
     }
 }

src/Illuminate/Database/Eloquent/Collection.php

@@ -253,7 +253,7 @@ protected function loadMissingRelation(self $models, array $path)
      * Load a set of relationships onto the mixed relationship collection.
      *
      * @param  string  $relation
-     * @param  array<array-key, (callable(\Illuminate\Database\Eloquent\Builder): mixed)|string> $relations
+     * @param  array<array-key, (callable(\Illuminate\Database\Eloquent\Builder): mixed)|string>  $relations
      * @return $this
      */
     public function loadMorph($relation, $relations)
@@ -270,7 +270,7 @@ public function loadMorph($relation, $relations)
      * Load a set of relationship counts onto the mixed relationship collection.
      *
      * @param  string  $relation
-     * @param  array<array-key, (callable(\Illuminate\Database\Eloquent\Builder): mixed)|string> $relations
+     * @param  array<array-key, (callable(\Illuminate\Database\Eloquent\Builder): mixed)|string>  $relations
      * @return $this
      */
     public function loadMorphCount($relation, $relations)

src/Illuminate/Foundation/Http/Middleware/HandlePrecognitiveRequests.php

@@ -69,7 +69,7 @@ protected function prepareForPrecognition($request)
      *
      * @param  \Illuminate\Http\Request  $request
      * @param  \Illuminate\Http\Response  $response
-     * @return \Illuminate\Http\Response $response
+     * @return \Illuminate\Http\Response
      */
     protected function appendVaryHeader($request, $response)
     {

src/Illuminate/Routing/Controllers/Middleware.php

@@ -55,7 +55,7 @@ public function only(array|string $only)
     /**
      * Specify the controller methods the middleware should not apply to.
      *
-     * @param  array|string  $only
+     * @param  array|string  $except
      * @return $this
      */
     public function except(array|string $except)

src/Illuminate/Routing/Middleware/ThrottleRequests.php

@@ -215,7 +215,7 @@ protected function resolveRequestSignature($request)
      * @param  string  $key
      * @param  int  $maxAttempts
      * @param  callable|null  $responseCallback
-     * @return \Illuminate\Http\Exceptions\ThrottleRequestsException
+     * @return \Illuminate\Http\Exceptions\ThrottleRequestsException|\Illuminate\Http\Exceptions\HttpResponseException
      */
     protected function buildException($request, $key, $maxAttempts, $responseCallback = null)
     {

src/Illuminate/Support/Sleep.php

@@ -427,7 +427,7 @@ protected function shouldNotSleep()
     /**
      * Only sleep when the given condition is true.
      *
-     * @param  (\Closure($this): bool)|bool $condition
+     * @param  (\Closure($this): bool)|bool  $condition
      * @return $this
      */
     public function when($condition)
@@ -440,7 +440,7 @@ public function when($condition)
     /**
      * Don't sleep when the given condition is true.
      *
-     * @param  (\Closure($this): bool)|bool $condition
+     * @param  (\Closure($this): bool)|bool  $condition
      * @return $this
      */
     public function unless($condition)

src/Illuminate/Testing/TestResponse.php

@@ -894,7 +894,7 @@ public function assertJsonMissingValidationErrors($keys = null, $responseKey = '
     /**
      * Assert that the given key is a JSON array.
      *
-     * @param $key
+     * @param  string|null  $key
      * @return $this
      */
     public function assertJsonIsArray($key = null)
@@ -915,7 +915,7 @@ public function assertJsonIsArray($key = null)
     /**
      * Assert that the given key is a JSON object.
      *
-     * @param $key
+     * @param  string|null  $key
      * @return $this
      */
     public function assertJsonIsObject($key = null)