Skip to content

[8.x] Modify DatabaseRule to accept Arrayable instance inside where methods #39620

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

Closed
wants to merge 2 commits into from
Closed

[8.x] Modify DatabaseRule to accept Arrayable instance inside where methods #39620

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4ba6ce1
Modify DatabaseRule to accept Arrayable instance inside where methods
amaelftah Nov 15, 2021
896825a
Fix doc blocks
amaelftah Nov 15, 2021
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
17 changes: 9 additions & 8 deletions src/Illuminate/Validation/Rules/DatabaseRule.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
namespace Illuminate\Validation\Rules;

use Closure;
use Illuminate\Contracts\Support\Arrayable;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Support\Str;

Expand Down Expand Up @@ -81,12 +82,12 @@ public function resolveTableName($table)
* Set a "where" constraint on the query.
*
* @param \Closure|string $column
* @param array|string|int|null $value
* @param \Illuminate\Contracts\Support\Arrayable|array|string|int|null $value
* @return $this
*/
public function where($column, $value = null)
{
if (is_array($value)) {
if ($value instanceof Arrayable || is_array($value)) {
return $this->whereIn($column, $value);
}

Expand All @@ -107,12 +108,12 @@ public function where($column, $value = null)
* Set a "where not" constraint on the query.
*
* @param string $column
* @param array|string $value
* @param \Illuminate\Contracts\Support\Arrayable|array|string $value
* @return $this
*/
public function whereNot($column, $value)
{
if (is_array($value)) {
if ($value instanceof Arrayable || is_array($value)) {
return $this->whereNotIn($column, $value);
}

Expand Down Expand Up @@ -145,10 +146,10 @@ public function whereNotNull($column)
* Set a "where in" constraint on the query.
*
* @param string $column
* @param array $values
* @param \Illuminate\Contracts\Support\Arrayable|array $values
* @return $this
*/
public function whereIn($column, array $values)
public function whereIn($column, $values)
Copy link
Member

@driesvints driesvints Nov 15, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can't change a method signature on a minor release since it's potentially breaking to anyone overwriting it.

Copy link
Contributor Author

@amaelftah amaelftah Nov 15, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

got it ... should i close it and open a new one for 9.x ... or also in 9.x we don't won't to introduce breaking behavior like this ?

Copy link
Member

@driesvints driesvints Nov 15, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can try master yeah

{
return $this->where(function ($query) use ($column, $values) {
$query->whereIn($column, $values);
Expand All @@ -159,10 +160,10 @@ public function whereIn($column, array $values)
* Set a "where not in" constraint on the query.
*
* @param string $column
* @param array $values
* @param \Illuminate\Contracts\Support\Arrayable|array $values
* @return $this
*/
public function whereNotIn($column, array $values)
public function whereNotIn($column, $values)
{
return $this->where(function ($query) use ($column, $values) {
$query->whereNotIn($column, $values);
Expand Down