10000 [6.x] Fix param types in docblocks by iamgergo · Pull Request #31252 · laravel/framework · GitHub
[go: up one dir, main page]

Skip to content

[6.x] Fix param types in docblocks #31252

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 27, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Fix param types in docblocks
  • Loading branch information
iamgergo committed Jan 27, 2020
commit 25123a404987c65436b6237e3397b43e875a749f
2 changes: 1 addition & 1 deletion src/Illuminate/Auth/Access/HandlesAuthorization.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ protected function allow($message = null, $code = null)
/**
* Throws an unauthorized exception.
*
* @param string $message
* @param string|null $message
* @param mixed|null $code
* @return \Illuminate\Auth\Access\Response
*/
Expand Down
2 changes: 1 addition & 1 deletion src/Illuminate/Cookie/CookieJar.php
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ public function hasQueued($key, $path = null)
*
* @param string $key
* @param mixed $default
* @param string $path
* @param string|null $path
* @return \Symfony\Component\HttpFoundation\Cookie
*/
public function queued($key, $default = null, $path = null)
Expand Down
4 changes: 2 additions & 2 deletions src/Illuminate/Database/Concerns/BuildsQueries.php
Original file line number Diff line number Diff line change
Expand Up @@ -117,8 +117,8 @@ public function chunkById($count, callable $callback, $column = null, $alias = n
*
* @param callable $callback
* @param int $count
* @param string $column
* @param string $alias
* @param string|null $column
* @param string|null $alias
* @return bool
*/
public function eachById(callable $callback, $count = 1000, $column = null, $alias = null)
Expand Down
4 changes: 2 additions & 2 deletions src/Illuminate/Database/Eloquent/Builder.php
Original file line number Diff line number Diff line change
Expand Up @@ -703,7 +703,7 @@ public function pluck($column, $key = null)
/**
* Paginate the given query.
*
* @param int $perPage
* @param int|null $perPage
* @param array $columns
* @param string $pageName
* @param int|null $page
Expand All @@ -730,7 +730,7 @@ public function paginate($perPage = null, $columns = ['*'], $pageName = 'page',
/**
* Paginate the given query into a simple paginator.
*
* @param int $perPage
* @param int|null $perPage
* @param array $columns
* @param string $pageName
* @param int|null $page
Expand Down
68 changes: 34 additions & 34 deletions src/Illuminate/Database/Eloquent/Concerns/HasRelationships.php
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@ trait HasRelationships
* Define a one-to-one relationship.
*
* @param string $related
* @param string $foreignKey
* @param string $localKey
* @param string|null $foreignKey
* @param string|null $localKey
* @return \Illuminate\Database\Eloquent\Relations\HasOne
*/
public function hasOne($related, $foreignKey = null, $localKey = null)
Expand Down Expand Up @@ -125,9 +125,9 @@ protected function newHasOneThrough(Builder $query, Model $farParent, Model $thr
*
* @param string $related
* @param string $name
* @param string $type
* @param string $id
* @param string $localKey
* @param string|null $type
* @param string|null $id
* @param string|null $localKey
* @return \Illuminate\Database\Eloquent\Relations\MorphOne
*/
public function morphOne($related, $name, $type = null, $id = null, $localKey = null)
Expand Down Expand Up @@ -162,9 +162,9 @@ protected function newMorphOne(Builder $query, Model $parent, $type, $id, $local
* Define an inverse one-to-one or many relationship.
*
* @param string $related
* @param string $foreignKey
* @param string $ownerKey
* @param string $relation
* @param string|null $foreignKey
* @param string|null $ownerKey
* @param string|null $relation
* @return \Illuminate\Database\Eloquent\Relations\BelongsTo
*/
public function belongsTo($related, $foreignKey = null, $ownerKey = null, $relation = null)
Expand Down Expand Up @@ -213,10 +213,10 @@ protected function newBelongsTo(Builder $query, Model $child, $foreignKey, $owne
/**
* Define a polymorphic, inverse one-to-one or many relationship.
*
* @param string $name
* @param string $type
* @param string $id
* @param string $ownerKey
* @param string|null $name
* @param string|null $type
* @param string|null $id
* @param string|null $ownerKey
* @return \Illuminate\Database\Eloquent\Relations\MorphTo
*/
public function morphTo($name = null, $type = null, $id = null, $ownerKey = null)
Expand Down Expand Up @@ -318,8 +318,8 @@ protected function guessBelongsToRelation()
* Define a one-to-many relationship.
*
* @param string $related
* @param string $foreignKey
* @param string $localKey
* @param string|null $foreignKey
* @param string|null $localKey
* @return \Illuminate\Database\Eloquent\Relations\HasMany
*/
public function hasMany($related, $foreignKey = null, $localKey = null)
Expand Down Expand Up @@ -397,9 +397,9 @@ protected function newHasManyThrough(Builder $query, Model $farParent, Model $th
*
* @param string $related
* @param string $name
* @param string $type
* @param string $id
* @param string $localKey
* @param string|null $type
* @param string|null $id
* @param string|null $localKey
* @return \Illuminate\Database\Eloquent\Relations\MorphMany
*/
public function morphMany($related, $name, $type = null, $id = null, $localKey = null)
Expand Down Expand Up @@ -437,12 +437,12 @@ protected function newMorphMany(Builder $query, Model $parent, $type, $id, $loca
* Define a many-to-many relationship.
*
* @param string $related
* @param string $table
* @param string $foreignPivotKey
* @param string $relatedPivotKey
* @param string $parentKey
* @param string $relatedKey
* @param string $relation
* @param string|null $table
* @param string|null $foreignPivotKey
* @param string|null $relatedPivotKey
* @param string|null $parentKey
* @param string|null $relatedKey
* @param string|null $relation
* @return \Illuminate\Database\Eloquent\Relations\BelongsToMany
*/
public function belongsToMany($related, $table = null, $foreignPivotKey = null, $relatedPivotKey = null,
Expand Down Expand Up @@ -502,11 +502,11 @@ protected function newBelongsToMany(Builder $query, Model $parent, $table, $fore
*
* @param string $related
* @param string $name
* @param string $table
* @param string $foreignPivotKey
* @param string $relatedPivotKey
* @param string $parentKey
* @param string $relatedKey
* @param string|null $table
* @param string|null $foreignPivotKey
* @param string|null $relatedPivotKey
* @param string|null $parentKey
* @param string|null $relatedKey
* @param bool $inverse
* @return \Illuminate\Database\Eloquent\Relations\MorphToMany
*/
Expand Down Expand Up @@ -554,7 +554,7 @@ public function morphToMany($related, $name, $table = null, $foreignPivotKey = n
* @param string $relatedPivotKey
* @param string $parentKey
* @param string $relatedKey
* @param string $relationName
* @param string|null $relationName
* @param bool $inverse
* @return \Illuminate\Database\Eloquent\Relations\MorphToMany
*/
Expand All @@ -571,11 +571,11 @@ protected function newMorphToMany(Builder $query, Model $parent, $name, $table,
*
* @param string $related
* @param string $name
* @param string $table
* @param string $foreignPivotKey
* @param string $relatedPivotKey
* @param string $parentKey
* @param string $relatedKey
* @param string|null $table
* @param string|null $foreignPivotKey
* @param string|null $relatedPivotKey
* @param string|null $parentKey
* @param string|null $relatedKey
* @return \Illuminate\Database\Eloquent\Relations\MorphToMany
*/
public function morphedByMany($related, $name, $table = null, $foreignPivotKey = null,
Expand Down
8 changes: 4 additions & 4 deletions src/Illuminate/Database/Eloquent/Relations/BelongsToMany.php
Original file line number Diff line number Diff line change
Expand Up @@ -344,7 +344,7 @@ public function as($accessor)
* Set a where clause for a pivot table column.
*
* @param string $column
* @param string $operator
* @param string|null $operator
* @param mixed $value
* @param string $boolean
* @return $this
Expand Down Expand Up @@ -376,7 +376,7 @@ public function wherePivotIn($column, $values, $boolean = 'and', $not = false)
* Set an "or where" clause for a pivot table column.
*
* @param string $column
* @param string $operator
* @param string|null $operator
* @param mixed $value
* @return $this
*/
Expand Down Expand Up @@ -681,7 +681,7 @@ protected function aliasedPivotColumns()
/**
* Get a paginator for the "select" statement.
*
* @param int $perPage
* @param int|null $perPage
* @param array $columns
* @param string $pageName
* @param int|null $page
Expand All @@ -699,7 +699,7 @@ public function paginate($perPage = null, $columns = ['*'], $pageName = 'page',
/**
* Paginate the given query into a simple paginator.
*
* @param int $perPage
* @param int|null $perPage
* @param array $columns
* @param string $pageName
* @param int|null $page
Expand Down
4 changes: 2 additions & 2 deletions src/Illuminate/Database/Eloquent/Relations/HasManyThrough.php
Original file line number Diff line number Diff line change
Expand Up @@ -373,7 +373,7 @@ public function get($columns = ['*'])
/**
* Get a paginator for the "select" statement.
*
* @param int $perPage
* @param int|null $perPage
* @param array $columns
* @param string $pageName
* @param int $page
Expand All @@ -389,7 +389,7 @@ public function paginate($perPage = null, $columns = ['*'], $pageName = 'page',
/**
* Paginate the given query into a simple paginator.
*
* @param int $perPage
* @param int|null $perPage
* @param array $columns
* @param string $pageName
* @param int|null $page
Expand Down
2 changes: 1 addition & 1 deletion src/Illuminate/Database/Eloquent/Relations/MorphToMany.php
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ class MorphToMany extends BelongsToMany
* @param string $relatedPivotKey
* @param string $parentKey
* @param string $relatedKey
* @param string $relationName
* @param string|null $relationName
* @param bool $inverse
* @return void
*/
Expand Down
2 changes: 1 addition & 1 deletion src/Illuminate/Foundation/helpers.php
Original file line number Diff line number Diff line change
Expand Up @@ -918,7 +918,7 @@ function __($key = null, $replace = [], $locale = null)
/**
* Generate a url for the application.
*
* @param string $path
* @param string|null $path
* @param mixed $parameters
* @param bool|null $secure
* @return \Illuminate\Contracts\Routing\UrlGenerator|string
Expand Down
2 changes: 1 addition & 1 deletion src/Illuminate/Support/Facades/Cookie.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public static function has($key)
/**
* Retrieve a cookie from the request.
*
* @param string $key
* @param string|null $key
* @param mixed $default
* @return string|array|null
*/
Expand Down
4 changes: 2 additions & 2 deletions src/Illuminate/Support/MessageBag.php
Original file line number Diff line number Diff line change
Expand Up @@ -150,8 +150,8 @@ public function hasAny($keys = [])
/**
* Get the first message from the message bag for a given key.
*
* @param string $key
* @param string $format
* @param string|null $key
* @param string|null $format
* @return string
*/
public function first($key = null, $format = null)
Expand Down
4 changes: 2 additions & 2 deletions src/Illuminate/Support/ServiceProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -227,8 +227,8 @@ protected function addPublishGroup($group, $paths)
/**
* Get the paths to publish.
*
* @param string $provider
* @param string $gr 10000 oup
* @param string|null $provider
* @param string|null $group
* @return array
*/
public static function pathsToPublish($provider = null, $group = null)
Expand Down
2 changes: 1 addition & 1 deletion src/Illuminate/Support/Str.php
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,7 @@ public static function kebab($value)
* Return the length of the given string.
*
* @param string $value
* @param string $encoding
* @param string|null $encoding
* @return int
*/
public static function length($value, $encoding = null)
Expand Down
2 changes: 1 addition & 1 deletion src/Illuminate/Support/Traits/EnumeratesValues.php
Original file line number Diff line number Diff line change
Expand Up @@ -825,7 +825,7 @@ protected function getArrayableItems($items)
* Get an operator checker callback.
*
* @param string $key
* @param string $operator
* @param string|string $operator
* @param mixed $value
* @return \Closure
*/
Expand Down
0