Skip to content
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

[11.x] Update signature of the where(All|Any) methods, make $operator argument required #52384

Closed
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
12 changes: 6 additions & 6 deletions src/Illuminate/Database/Query/Builder.php
Original file line number Diff line number Diff line change
Expand Up @@ -2244,7 +2244,7 @@ public function orWhereFullText($columns, $value, array $options = [])
* @param string $boolean
* @return $this
*/
public function whereAll($columns, $operator = null, $value = null, $boolean = 'and')
public function whereAll($columns, $operator, $value = null, $boolean = 'and')
{
[$value, $operator] = $this->prepareValueAndOperator(
$value, $operator, func_num_args() === 2
Expand All @@ -2267,7 +2267,7 @@ public function whereAll($columns, $operator = null, $value = null, $boolean = '
* @param mixed $value
* @return $this
*/
public function orWhereAll($columns, $operator = null, $value = null)
public function orWhereAll($columns, $operator, $value = null)
{
return $this->whereAll($columns, $operator, $value, 'or');
}
Expand All @@ -2281,7 +2281,7 @@ public function orWhereAll($columns, $operator = null, $value = null)
* @param string $boolean
* @return $this
*/
public function whereAny($columns, $operator = null, $value = null, $boolean = 'and')
public function whereAny($columns, $operator, $value = null, $boolean = 'and')
{
[$value, $operator] = $this->prepareValueAndOperator(
$value, $operator, func_num_args() === 2
Expand All @@ -2304,7 +2304,7 @@ public function whereAny($columns, $operator = null, $value = null, $boolean = '
* @param mixed $value
* @return $this
*/
public function orWhereAny($columns, $operator = null, $value = null)
public function orWhereAny($columns, $operator, $value = null)
{
return $this->whereAny($columns, $operator, $value, 'or');
}
Expand All @@ -2318,7 +2318,7 @@ public function orWhereAny($columns, $operator = null, $value = null)
* @param string $boolean
* @return $this
*/
public function whereNone($columns, $operator = null, $value = null, $boolean = 'and')
public function whereNone($columns, $operator, $value = null, $boolean = 'and')
{
return $this->whereAny($columns, $operator, $value, $boolean.' not');
}
Expand All @@ -2331,7 +2331,7 @@ public function whereNone($columns, $operator = null, $value = null, $boolean =
* @param mixed $value
* @return $this
*/
public function orWhereNone($columns, $operator = null, $value = null)
public function orWhereNone($columns, $operator, $value = null)
{
return $this->whereNone($columns, $operator, $value, 'or');
}
Expand Down