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.

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

[9.x] Fix takeUntilTimeout method of LazyCollection #41354

Merged
Merged
Changes from 1 commit
Commits
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
Next Next commit
Fix takeUntilTimeout
  • Loading branch information
gdebrauwer committed Mar 5, 2022
commit 09143121fe8948baebf077fd54fa83434667db9f
16 changes: 14 additions & 2 deletions src/Illuminate/Collections/LazyCollection.php
Original file line number Diff line number Diff line change
Expand Up @@ -1413,8 +1413,20 @@ public function takeUntilTimeout(DateTimeInterface $timeout)
{
$timeout = $timeout->getTimestamp();

return $this->takeWhile(function () use ($timeout) {
return $this->now() < $timeout;
return new static(function () use ($timeout) {
$iterator = $this->getIterator();

if ($this->now() > $timeout) {
return;
}

yield $iterator->key() => $iterator->current();

while ($iterator->valid() && $this->now() < $timeout) {
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. It is always pulling an extra item.

$iterator->next();

yield $iterator->key() => $iterator->current();
}
Comment on lines +1423 to +1429
Copy link
Contributor

Choose a reason for hiding this comment

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

This can be simplified into a single foreach block.

});
}

Expand Down