Skip to content

Commit

Permalink
Apply fixes from StyleCI
Browse files Browse the repository at this point in the history
  • Loading branch information
taylorotwell authored and StyleCIBot committed Sep 8, 2021
1 parent f745372 commit 33eecce
Show file tree
Hide file tree
Showing 16 changed files with 39 additions and 39 deletions.
16 changes: 8 additions & 8 deletions src/Illuminate/Collections/Collection.php
Original file line number Diff line number Diff line change
Expand Up @@ -671,7 +671,7 @@ public function map(callable $callback)
* @template TMapToDictionaryKey of array-key
* @template TMapToDictionaryValue
*
* @param callable(TValue, TKey): array<TMapToDictionaryKey, TMapToDictionaryValue> $callback
* @param callable(TValue, TKey): array<TMapToDictionaryKey, TMapToDictionaryValue> $callback
* @return static<TMapToDictionaryKey, array<int, TMapToDictionaryValue>>
*/
public function mapToDictionary(callable $callback)
Expand Down Expand Up @@ -703,7 +703,7 @@ public function mapToDictionary(callable $callback)
* @template TMapWithKeysKey of array-key
* @template TMapWithKeysValue
*
* @param callable(TValue, TKey): array<TMapWithKeysKey, TMapWithKeysValue> $callback
* @param callable(TValue, TKey): array<TMapWithKeysKey, TMapWithKeysValue> $callback
* @return static<TMapWithKeysKey, TMapWithKeysValue>
*/
public function mapWithKeys(callable $callback)
Expand All @@ -724,7 +724,7 @@ public function mapWithKeys(callable $callback)
/**
* Merge the collection with the given items.
*
* @param \Illuminate\Contracts\Support\Arrayable<TKey, TValue>|iterable<TKey, TValue> $items
* @param \Illuminate\Contracts\Support\Arrayable<TKey, TValue>|iterable<TKey, TValue> $items
* @return static<TKey, TValue>
*/
public function merge($items)
Expand All @@ -735,7 +735,7 @@ public function merge($items)
/**
* Recursively merge the collection with the given items.
*
* @param \Illuminate\Contracts\Support\Arrayable<TKey, TValue>|iterable<TKey, TValue> $items
* @param \Illuminate\Contracts\Support\Arrayable<TKey, TValue>|iterable<TKey, TValue> $items
* @return static<TKey, array<int, TValue>>
*/
public function mergeRecursive($items)
Expand All @@ -748,7 +748,7 @@ public function mergeRecursive($items)
*
* @template TCombineValue
*
* @param \Illuminate\Contracts\Support\Arrayable<array-key, TCombineValue>|iterable<array-key, TCombineValue> $values
* @param \Illuminate\Contracts\Support\Arrayable<array-key, TCombineValue>|iterable<array-key, TCombineValue> $values
* @return static<TKey, TCombineValue>
*/
public function combine($values)
Expand All @@ -759,7 +759,7 @@ public function combine($values)
/**
* Union the collection with the given items.
*
* @param \Illuminate\Contracts\Support\Arrayable<TKey, TValue>|iterable<TKey, TValue> $items
* @param \Illuminate\Contracts\Support\Arrayable<TKey, TValue>|iterable<TKey, TValue> $items
* @return static<TKey, TValue>
*/
public function union($items)
Expand Down Expand Up @@ -794,7 +794,7 @@ public function nth($step, $offset = 0)
/**
* Get the items with the specified keys.
*
* @param \Illuminate\Support\Enumerable<array-key, TKey>|array<array-key, TKey> $keys
* @param \Illuminate\Support\Enumerable<array-key, TKey>|array<array-key, TKey> $keys
* @return static<TKey, TValue>
*/
public function only($keys)
Expand Down Expand Up @@ -933,7 +933,7 @@ public function random($number = null)
/**
* Replace the collection items with the given items.
*
* @param \Illuminate\Contracts\Support\Arrayable<TKey, TValue>|iterable<TKey, TValue> $items
* @param \Illuminate\Contracts\Support\Arrayable<TKey, TValue>|iterable<TKey, TValue> $items
* @return static<TKey, TValue>
*/
public function replace($items)
Expand Down
2 changes: 1 addition & 1 deletion src/Illuminate/Collections/Enumerable.php
Original file line number Diff line number Diff line change
Expand Up @@ -661,7 +661,7 @@ public function flatMap(callable $callback);
/**
* Map the values into a new class.
*
* @param class-string $class
* @param class-string $class
* @return static<TKey, mixed>
*/
public function mapInto($class);
Expand Down
20 changes: 10 additions & 10 deletions src/Illuminate/Collections/Traits/EnumeratesValues.php
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ public static function wrap($value)
* @template TUnwrapKey of array-key
* @template TUnwrapValue
*
* @param array<TUnwrapKey, TUnwrapValue>|static<TUnwrapKey, TUnwrapValue> $value
* @param array<TUnwrapKey, TUnwrapValue>|static<TUnwrapKey, TUnwrapValue> $value
* @return array<TUnwrapKey, TUnwrapValue>
*/
public static function unwrap($value)
Expand Down Expand Up @@ -346,7 +346,7 @@ public function mapSpread(callable $callback)
* @template TMapToGroupsKey of array-key
* @template TMapToGroupsValue
*
* @param callable(TValue, TKey): array<TMapToGroupsKey, TMapToGroupsValue> $callback
* @param callable(TValue, TKey): array<TMapToGroupsKey, TMapToGroupsValue> $callback
* @return static<TMapToGroupsKey, static<int, TMapToGroupsValue>>
*/
public function mapToGroups(callable $callback)
Expand All @@ -359,7 +359,7 @@ public function mapToGroups(callable $callback)
/**
* Map a collection and flatten the result by a single level.
*
* @param callable(TValue, TKey): mixed $callback
* @param callable(TValue, TKey): mixed $callback
* @return static<int, mixed>
*/
public function flatMap(callable $callback)
Expand All @@ -370,7 +370,7 @@ public function flatMap(callable $callback)
/**
* Map the values into a new class.
*
* @param class-string $class
* @param class-string $class
* @return static<TKey, mixed>
*/
public function mapInto($class)
Expand Down Expand Up @@ -436,8 +436,8 @@ public function forPage($page, $perPage)
* Partition the collection into two arrays using the given callback or key.
*
* @param (callable(TValue, TKey): bool)|TValue|string $key
* @param TValue|string|null $operator
* @param TValue|null $value
* @param TValue|string|null $operator
* @param TValue|null $value
* @return array<int, static<TKey, TValue>>
*/
public function partition($key, $operator = null, $value = null)
Expand Down Expand Up @@ -718,8 +718,8 @@ public function pipeInto($class)
* @template TReduceInitial
* @template TReduceReturnType
*
* @param callable(TReduceInitial|TReduceReturnType, TValue): TReduceReturnType $callback
* @param TReduceInitial $initial
* @param callable(TReduceInitial|TReduceReturnType, TValue): TReduceReturnType $callback
* @param TReduceInitial $initial
* @return TReduceReturnType
*/
public function reduce(callable $callback, $initial = null)
Expand All @@ -739,8 +739,8 @@ public function reduce(callable $callback, $initial = null)
* @template TReduceWithKeysInitial
* @template TReduceWithKeysReturnType
*
* @param callable(TReduceWithKeysInitial|TReduceWithKeysReturnType, TValue): TReduceWithKeysReturnType $callback
* @param TReduceWithKeysInitial $initial
* @param callable(TReduceWithKeysInitial|TReduceWithKeysReturnType, TValue): TReduceWithKeysReturnType $callback
* @param TReduceWithKeysInitial $initial
* @return TReduceWithKeysReturnType
*/
public function reduceWithKeys(callable $callback, $initial = null)
Expand Down
6 changes: 3 additions & 3 deletions src/Illuminate/Contracts/Foundation/Application.php
Original file line number Diff line number Diff line change
Expand Up @@ -24,23 +24,23 @@ public function basePath($path = '');
/**
* Get the path to the bootstrap directory.
*
* @param string $path Optionally, a path to append to the bootstrap path
* @param string $path Optionally, a path to append to the bootstrap path
* @return string
*/
public function bootstrapPath($path = '');

/**
* Get the path to the application configuration files.
*
* @param string $path Optionally, a path to append to the config path
* @param string $path Optionally, a path to append to the config path
* @return string
*/
public function configPath($path = '');

/**
* Get the path to the database directory.
*
* @param string $path Optionally, a path to append to the database path
* @param string $path Optionally, a path to append to the database path
* @return string
*/
public function databasePath($path = '');
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -384,7 +384,7 @@ public function orWhereRelation($relation, $column, $operator = null, $value = n
* Add a polymorphic relationship condition to the query with a where clause.
*
* @param \Illuminate\Database\Eloquent\Relations\MorphTo|string $relation
* @param string|array $types
* @param string|array $types
* @param \Closure|string|array|\Illuminate\Database\Query\Expression $column
* @param mixed $operator
* @param mixed $value
Expand All @@ -401,7 +401,7 @@ public function whereMorphRelation($relation, $types, $column, $operator = null,
* Add a polymorphic relationship condition to the query with an "or where" clause.
*
* @param \Illuminate\Database\Eloquent\Relations\MorphTo|string $relation
* @param string|array $types
* @param string|array $types
* @param \Closure|string|array|\Illuminate\Database\Query\Expression $column
* @param mixed $operator
* @param mixed $value
Expand Down
2 changes: 1 addition & 1 deletion src/Illuminate/Database/Query/Grammars/Grammar.php
Original file line number Diff line number Diff line change
Expand Up @@ -1028,7 +1028,7 @@ protected function compileUpdateWithJoins(Builder $query, $table, $columns, $whe
/**
* Compile an "upsert" statement into SQL.
*
* @param \Illuminate\Database\Query\Builder $query
* @param \Illuminate\Database\Query\Builder $query
* @param array $values
* @param array $uniqueBy
* @param array $update
Expand Down
8 changes: 4 additions & 4 deletions src/Illuminate/Foundation/Application.php
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,7 @@ public function useAppPath($path)
/**
* Get the base path of the Laravel installation.
*
* @param string $path Optionally, a path to append to the base path
* @param string $path Optionally, a path to append to the base path
* @return string
*/
public function basePath($path = '')
Expand All @@ -363,7 +363,7 @@ public function basePath($path = '')
/**
* Get the path to the bootstrap directory.
*
* @param string $path Optionally, a path to append to the bootstrap path
* @param string $path Optionally, a path to append to the bootstrap path
* @return string
*/
public function bootstrapPath($path = '')
Expand All @@ -374,7 +374,7 @@ public function bootstrapPath($path = '')
/**
* Get the path to the application configuration files.
*
* @param string $path Optionally, a path to append to the config path
* @param string $path Optionally, a path to append to the config path
* @return string
*/
public function configPath($path = '')
Expand All @@ -385,7 +385,7 @@ public function configPath($path = '')
/**
* Get the path to the database directory.
*
* @param string $path Optionally, a path to append to the database path
* @param string $path Optionally, a path to append to the database path
* @return string
*/
public function databasePath($path = '')
Expand Down
2 changes: 1 addition & 1 deletion src/Illuminate/Http/Client/Events/RequestSending.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ class RequestSending
/**
* Create a new event instance.
*
* @param \Illuminate\Http\Client\Request $request
* @param \Illuminate\Http\Client\Request $request
* @return void
*/
public function __construct(Request $request)
Expand Down
2 changes: 1 addition & 1 deletion src/Illuminate/Http/Client/Response.php
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ public function serverError()
/**
* Execute the given callback if there was a server or client error.
*
* @param \Closure|callable $callback
* @param \Closure|callable $callback
* @return $this
*/
public function onError(callable $callback)
Expand Down
2 changes: 1 addition & 1 deletion src/Illuminate/Pagination/CursorPaginator.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ class CursorPaginator extends AbstractCursorPaginator implements Arrayable, Arra
* @param mixed $items
* @param int $perPage
* @param \Illuminate\Pagination\Cursor|null $cursor
* @param array $options (path, query, fragment, pageName)
* @param array $options (path, query, fragment, pageName)
* @return void
*/
public function __construct($items, $perPage, $cursor = null, array $options = [])
Expand Down
2 changes: 1 addition & 1 deletion src/Illuminate/Pagination/LengthAwarePaginator.php
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ class LengthAwarePaginator extends AbstractPaginator implements Arrayable, Array
* @param int $total
* @param int $perPage
* @param int|null $currentPage
* @param array $options (path, query, fragment, pageName)
* @param array $options (path, query, fragment, pageName)
* @return void
*/
public function __construct($items, $total, $perPage, $currentPage = null, array $options = [])
Expand Down
2 changes: 1 addition & 1 deletion src/Illuminate/Pagination/Paginator.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ class Paginator extends AbstractPaginator implements Arrayable, ArrayAccess, Cou
* @param mixed $items
* @param int $perPage
* @param int|null $currentPage
* @param array $options (path, query, fragment, pageName)
* @param array $options (path, query, fragment, pageName)
* @return void
*/
public function __construct($items, $perPage, $currentPage = null, array $options = [])
Expand Down
4 changes: 2 additions & 2 deletions src/Illuminate/Queue/SerializableClosure.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ class SerializableClosure extends OpisSerializableClosure
/**
* Transform the use variables before serialization.
*
* @param array $data The Closure's use variables
* @param array $data The Closure's use variables
* @return array
*/
protected function transformUseVariables($data)
Expand All @@ -26,7 +26,7 @@ protected function transformUseVariables($data)
/**
* Resolve the use variables after unserialization.
*
* @param array $data The Closure's transformed use variables
* @param array $data The Closure's transformed use variables
* @return array
*/
protected function resolveUseVariables($data)
Expand Down
2 changes: 1 addition & 1 deletion src/Illuminate/Support/Testing/Fakes/BusFake.php
Original file line number Diff line number Diff line change
Expand Up @@ -636,7 +636,7 @@ public function batch($jobs)
/**
* Record the fake pending batch dispatch.
*
* @param \Illuminate\Bus\PendingBatch $pendingBatch
* @param \Illuminate\Bus\PendingBatch $pendingBatch
* @return \Illuminate\Bus\Batch
*/
public function recordPendingBatch(PendingBatch $pendingBatch)
Expand Down
2 changes: 1 addition & 1 deletion src/Illuminate/Support/Testing/Fakes/MailFake.php
Original file line number Diff line number Diff line change
Expand Up @@ -419,7 +419,7 @@ public function failures()
* Infer mailable class using reflection if a typehinted closure is passed to assertion.
*
* @param string|\Closure $mailable
* @param callable|null $callback
* @param callable|null $callback
* @return array
*/
protected function prepareMailableAndCallback($mailable, $callback)
Expand Down
2 changes: 1 addition & 1 deletion src/Illuminate/View/Compilers/ComponentTagCompiler.php
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ class ComponentTagCompiler
*
* @param array $aliases
* @param array $namespaces
* @param \Illuminate\View\Compilers\BladeCompiler|null $blade
* @param \Illuminate\View\Compilers\BladeCompiler|null $blade
* @return void
*/
public function __construct(array $aliases = [], array $namespaces = [], ?BladeCompiler $blade = null)
Expand Down

0 comments on commit 33eecce

Please sign in to comment.