Skip to content

Commit cb543f5

Browse files
Merge branch '9.x' into 10.x
2 parents 245e891 + e217dca commit cb543f5

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

src/Illuminate/Collections/Collection.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -374,7 +374,7 @@ public function except($keys)
374374
/**
375375
* Run a filter over each of the items.
376376
*
377-
* @param (callable(TValue, TKey): bool)|null $callback
377+
* @param (callable(TValue, TKey): bool)|null $callback
378378
* @return static
379379
*/
380380
public function filter(callable $callback = null)

src/Illuminate/Database/Eloquent/Collection.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ protected function loadMissingRelation(self $models, array $path)
253253
* Load a set of relationships onto the mixed relationship collection.
254254
*
255255
* @param string $relation
256-
* @param array<array-key, (callable(\Illuminate\Database\Eloquent\Builder): mixed)|string> $relations
256+
* @param array<array-key, (callable(\Illuminate\Database\Eloquent\Builder): mixed)|string> $relations
257257
* @return $this
258258
*/
259259
public function loadMorph($relation, $relations)
@@ -270,7 +270,7 @@ public function loadMorph($relation, $relations)
270270
* Load a set of relationship counts onto the mixed relationship collection.
271271
*
272272
* @param string $relation
273-
* @param array<array-key, (callable(\Illuminate\Database\Eloquent\Builder): mixed)|string> $relations
273+
* @param array<array-key, (callable(\Illuminate\Database\Eloquent\Builder): mixed)|string> $relations
274274
* @return $this
275275
*/
276276
public function loadMorphCount($relation, $relations)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ protected function prepareForPrecognition($request)
6969
*
7070
* @param \Illuminate\Http\Request $request
7171
* @param \Illuminate\Http\Response $response
72-
* @return \Illuminate\Http\Response $response
72+
* @return \Illuminate\Http\Response
7373
*/
7474
protected function appendVaryHeader($request, $response)
7575
{

src/Illuminate/Testing/TestResponse.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -894,7 +894,7 @@ public function assertJsonMissingValidationErrors($keys = null, $responseKey = '
894894
/**
895895
* Assert that the given key is a JSON array.
896896
*
897-
* @param $key
897+
* @param string|null $key
898898
* @return $this
899899
*/
900900
public function assertJsonIsArray($key = null)
@@ -915,7 +915,7 @@ public function assertJsonIsArray($key = null)
915915
/**
916916
* Assert that the given key is a JSON object.
917917
*
918-
* @param $key
918+
* @param string|null $key
919919
* @return $this
920920
*/
921921
public function assertJsonIsObject($key = null)

0 commit comments

Comments
 (0)