Skip to content

Commit

Permalink
Merge pull request #35887 from iamgergo/8.x
Browse files Browse the repository at this point in the history
[8.x] Formatting some docblocks
  • Loading branch information
driesvints committed Jan 14, 2021
2 parents 6876909 + 49ee16b commit 67451f9
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 6 deletions.
2 changes: 1 addition & 1 deletion src/Illuminate/Collections/Collection.php
Expand Up @@ -888,7 +888,7 @@ public function reduce(callable $callback, $initial = null)
* Reduce an associative collection to a single value.
*
* @param callable $callback
* @param mixed $initial
* @param mixed $initial
* @return mixed
*/
public function reduceWithKeys(callable $callback, $initial = null)
Expand Down
2 changes: 1 addition & 1 deletion src/Illuminate/Collections/LazyCollection.php
Expand Up @@ -849,7 +849,7 @@ public function reduce(callable $callback, $initial = null)
* Reduce an associative collection to a single value.
*
* @param callable $callback
* @param mixed $initial
* @param mixed $initial
* @return mixed
*/
public function reduceWithKeys(callable $callback, $initial = null)
Expand Down
2 changes: 1 addition & 1 deletion src/Illuminate/Database/Eloquent/Relations/Relation.php
Expand Up @@ -223,7 +223,7 @@ public function getRelationExistenceQuery(Builder $query, Builder $parentQuery,
/**
* Get a relationship join table hash.
*
* @param bool $incrementJoinCount
* @param bool $incrementJoinCount
* @return string
*/
public function getRelationCountHash($incrementJoinCount = true)
Expand Down
Expand Up @@ -12,7 +12,7 @@ class UrlGenerationException extends Exception
* Create a new exception for missing route parameters.
*
* @param \Illuminate\Routing\Route $route
* @param array $parameters
* @param array $parameters
* @return static
*/
public static function forMissingParameters(Route $route, array $parameters = [])
Expand Down
3 changes: 1 addition & 2 deletions src/Illuminate/Testing/AssertableJsonString.php
Expand Up @@ -276,8 +276,7 @@ public function assertSubset(array $data, $strict = false)
/**
* Reorder associative array keys to make it easy to compare arrays.
*
* @param array $data
*
* @param array $data
* @return array
*/
protected function reorderAssocKeys(array $data)
Expand Down

0 comments on commit 67451f9

Please sign in to comment.