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

[8.x] Adds firstOrFail to Illuminate\Support\Collections and Illuminate\Support\LazyCollections #38420

Merged
merged 14 commits into from
Aug 19, 2021
Merged

[8.x] Adds firstOrFail to Illuminate\Support\Collections and Illuminate\Support\LazyCollections #38420

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
2999a01
Add firstOrFail method to Collections and LazyCollections
Aug 17, 2021
ff9db09
Restore test that got moved, fixed some grammaticals in test names
Aug 17, 2021
a8ebd11
Style fixes
Aug 17, 2021
03fe614
Make take(2) as take(1) instead
Aug 18, 2021
5d9bdac
use unless instead of when
powellblyth Aug 18, 2021
55271b0
Use Unless instead of When
powellblyth Aug 18, 2021
df2226d
Revert L9 changes, add test requested by @JosephSilber
Aug 18, 2021
6efef00
Remove unneeded try catch
Aug 19, 2021
32c6417
Remove unneeded include
Aug 19, 2021
d3994b6
Test that when an enumeration does not contain an item, that firstOrF…
Aug 19, 2021
178218c
Style fix
Aug 19, 2021
207a9cb
Merge branch '8.x' into 8.x
powellblyth Aug 19, 2021
1525486
Update Collection.php
taylorotwell Aug 19, 2021
f87195a
Update LazyCollection.php
taylorotwell Aug 19, 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
2 changes: 1 addition & 1 deletion src/Illuminate/Collections/Collection.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1148,7 +1148,7 @@ public function firstOrFail($key = null, $operator = null, $value = null)
? $this->operatorForWhere(...func_get_args())
: $key;

$items = $this->unless($filter == null)->filter($filter);
$items = $this->when($filter)->filter($filter);
powellblyth marked this conversation as resolved.
Show resolved Hide resolved

if ($items->isEmpty()) {
throw new ItemNotFoundException;
Expand Down
2 changes: 1 addition & 1 deletion src/Illuminate/Collections/LazyCollection.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1091,7 +1091,7 @@ public function firstOrFail($key = null, $operator = null, $value = null)
: $key;

return $this
->unless($filter == null)
->when($filter)
powellblyth marked this conversation as resolved.
Show resolved Hide resolved
->filter($filter)
->take(1)
->collect()
Expand Down
28 changes: 28 additions & 0 deletions tests/Support/SupportLazyCollectionIsLazyTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

namespace Illuminate\Tests\Support;

use Illuminate\Collections\ItemNotFoundException;
Copy link
Contributor

Choose a reason for hiding this comment

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

See #38449

use Illuminate\Collections\MultipleItemsFoundException;
use Illuminate\Support\LazyCollection;
use PHPUnit\Framework\TestCase;
Expand Down Expand Up @@ -986,6 +987,33 @@ public function testSliceIsLazy()
});
}

public function testFindFirstOrFailIsLazy()
{
$this->assertEnumerates(1, function ($collection) {
try {
$collection->firstOrFail();
} catch (ItemNotFoundException $e) {
//
}
Copy link
Contributor

Choose a reason for hiding this comment

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

Do you expect this to throw? Why?

});

$this->assertEnumerates(1, function ($collection) {
$collection->firstOrFail(function ($item) {
return $item === 1;
});
});

$this->assertEnumerates(2, function ($collection) {
try {
$collection->firstOrFail(function ($item) {
return $item % 2 === 0;
});
} catch (ItemNotFoundException $e) {
//
}
Copy link
Contributor

Choose a reason for hiding this comment

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

Same here. Why would this fail?

And really, you're not testing an actual failure, and ensuring it enumerates the whole collection once.

});
}

public function testSomeIsLazy()
{
$this->assertEnumerates(5, function ($collection) {
Expand Down