Skip to content

[5.5] Clean up default "where" operator #22264

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.

Sign up for GitHub

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 2 commits into from
Dec 1, 2017
Merged

[5.5] Clean up default "where" operator #22264

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3d185f0
Clean up default "where" operator
JosephSilber Dec 1, 2017
e596a7d
Pass arguments directly
JosephSilber Dec 1, 2017
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
32 changes: 10 additions & 22 deletions src/Illuminate/Support/Collection.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,13 +226,7 @@ public function contains($key, $operator = null, $value = null)
return in_array($key, $this->items);
}

if (func_num_args() == 2) {
$value = $operator;

$operator = '=';
}

return $this->contains($this->operatorForWhere($key, $operator, $value));
return $this->contains($this->operatorForWhere(...func_get_args()));
}

/**
Expand Down Expand Up @@ -385,13 +379,7 @@ public function every($key, $operator = null, $value = null)
return true;
}

if (func_num_args() == 2) {
$value = $operator;

$operator = '=';
}

return $this->every($this->operatorForWhere($key, $operator, $value));
return $this->every($this->operatorForWhere(...func_get_args()));
}

/**
Expand Down Expand Up @@ -481,8 +469,14 @@ public function where($key, $operator, $value = null)
* @param mixed $value
* @return \Closure
*/
protected function operatorForWhere($key, $operator, $value)
protected function operatorForWhere($key, $operator, $value = null)
{
if (func_num_args() == 2) {
$value = $operator;

$operator = '=';
}

return function ($item) use ($key, $operator, $value) {
$retrieved = data_get($item, $key);

Expand Down Expand Up @@ -598,13 +592,7 @@ public function first(callable $callback = null, $default = null)
*/
public function firstWhere($key, $operator, $value = null)
{
if (func_num_args() == 2) {
$value = $operator;

$operator = '=';
}

return $this->first($this->operatorForWhere($key, $operator, $value));
return $this->first($this->operatorForWhere(...func_get_args()));
}

/**
Expand Down