Merge branch '9.x' into 10.x

laravel · Jun 11, 2023 · cb543f5 · cb543f5
2 parents 245e891 + e217dca
commit cb543f5
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/src/Illuminate/Collections/Collection.php b/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)

diff --git a/src/Illuminate/Database/Eloquent/Collection.php b/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)

diff --git a/src/Illuminate/Foundation/Http/Middleware/HandlePrecognitiveRequests.php b/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)
     {

diff --git a/src/Illuminate/Testing/TestResponse.php b/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)