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.

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

[5.4] fix eloquent collection contains issue #19568

Merged
merged 3 commits into from
Jun 12, 2017
Merged

[5.4] fix eloquent collection contains issue #19568

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4ed80bf
fix eloquent collection contains issue
storyn26383 Jun 12, 2017
c766b5a
use $model->is($key) instead
storyn26383 Jun 12, 2017
7fe851c
remove useless code
storyn26383 Jun 12, 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
6 changes: 5 additions & 1 deletion src/Illuminate/Database/Eloquent/Collection.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,11 @@ public function contains($key, $operator = null, $value = null)
return parent::contains(...func_get_args());
}

$key = $key instanceof Model ? $key->getKey() : $key;
if ($key instanceof Model) {
return parent::contains(function ($model) use ($key) {
return $model->is($key);
});
}

return parent::contains(function ($model) use ($key) {
return $model->getKey() == $key;
Expand Down
23 changes: 20 additions & 3 deletions tests/Database/DatabaseEloquentCollectionTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,18 +45,35 @@ public function testContainsWithMultipleArguments()
public function testContainsIndicatesIfModelInArray()
{
$mockModel = m::mock('Illuminate\Database\Eloquent\Model');
$mockModel->shouldReceive('getKey')->andReturn(1);
$mockModel->shouldReceive('is')->with($mockModel)->andReturn(true);
$mockModel->shouldReceive('is')->andReturn(false);
$mockModel2 = m::mock('Illuminate\Database\Eloquent\Model');
$mockModel2->shouldReceive('getKey')->andReturn(2);
$mockModel2->shouldReceive('is')->with($mockModel2)->andReturn(true);
$mockModel2->shouldReceive('is')->andReturn(false);
$mockModel3 = m::mock('Illuminate\Database\Eloquent\Model');
$mockModel3->shouldReceive('getKey')->andReturn(3);
$mockModel3->shouldReceive('is')->with($mockModel3)->andReturn(true);
$mockModel3->shouldReceive('is')->andReturn(false);
$c = new Collection([$mockModel, $mockModel2]);

$this->assertTrue($c->contains($mockModel));
$this->assertTrue($c->contains($mockModel2));
$this->assertFalse($c->contains($mockModel3));
}

public function testContainsIndicatesIfDiffentModelInArray()
{
$mockModelFoo = m::namedMock('Foo', 'Illuminate\Database\Eloquent\Model');
$mockModelFoo->shouldReceive('is')->with($mockModelFoo)->andReturn(true);
$mockModelFoo->shouldReceive('is')->andReturn(false);
$mockModelBar = m::namedMock('Bar', 'Illuminate\Database\Eloquent\Model');
$mockModelBar->shouldReceive('is')->with($mockModelBar)->andReturn(true);
$mockModelBar->shouldReceive('is')->andReturn(false);
$c = new Collection([$mockModelFoo]);

$this->assertTrue($c->contains($mockModelFoo));
$this->assertFalse($c->contains($mockModelBar));
}

public function testContainsIndicatesIfKeyedModelInArray()
{
$mockModel = m::mock('Illuminate\Database\Eloquent\Model');
Expand Down