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

Jump to bottom

[5.3] Add containsStrict method #14657

Merged
merged 2 commits into from
Aug 7, 2016
Merged

[5.3] Add containsStrict method #14657

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bb65960
Add containsStrict method
mnabialek Aug 6, 2016
9b95e19
Fix code style
mnabialek Aug 6, 2016
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
22 changes: 22 additions & 0 deletions src/Illuminate/Support/Collection.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,28 @@ public function contains($key, $value = null)
return in_array($key, $this->items);
}

/**
* Determine if an item exists in the collection using strict comparison.
*
* @param mixed $key
* @param mixed $value
* @return bool
*/
public function containsStrict($key, $value = null)
Copy link
Member

Choose a reason for hiding this comment

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

Wouldn't it be better to add operator support, like we did for where?

{
if (func_num_args() == 2) {
return $this->contains(function ($item) use ($key, $value) {
return data_get($item, $key) === $value;
});
}

if ($this->useAsCallable($key)) {
return ! is_null($this->first($key));
}

return in_array($key, $this->items, true);
}

/**
* Get the items in the collection that are not present in the given items.
*
Expand Down
30 changes: 30 additions & 0 deletions tests/Support/SupportCollectionTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1063,6 +1063,36 @@ public function testContains()
$this->assertFalse($c->contains('foo'));
}

public function testContainsStrict()
{
$c = new Collection([1, 3, 5, '02']);

$this->assertTrue($c->containsStrict(1));
$this->assertFalse($c->containsStrict(2));
$this->assertTrue($c->containsStrict('02'));
$this->assertTrue($c->containsStrict(function ($value) {
return $value < 5;
}));
$this->assertFalse($c->containsStrict(function ($value) {
return $value > 5;
}));

$c = new Collection([['v' => 1], ['v' => 3], ['v' => '04'], ['v' => 5]]);

$this->assertTrue($c->containsStrict('v', 1));
$this->assertFalse($c->containsStrict('v', 2));
$this->assertFalse($c->containsStrict('v', 4));
$this->assertTrue($c->containsStrict('v', '04'));

$c = new Collection(['date', 'class', (object) ['foo' => 50], '']);

$this->assertTrue($c->containsStrict('date'));
$this->assertTrue($c->containsStrict('class'));
$this->assertFalse($c->containsStrict('foo'));
$this->assertFalse($c->containsStrict(null));
$this->assertTrue($c->containsStrict(''));
}

public function testGettingSumFromCollection()
{
$c = new Collection([(object) ['foo' => 50], (object) ['foo' => 50]]);
Expand Down