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

* Fix takeUntilTimeout * Add extra test * Small fix
laravel · Mar 6, 2022 · 34bb59a · 34bb59a
1 parent a9098ee
commit 34bb59a
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 2 deletions.
diff --git a/src/Illuminate/Collections/LazyCollection.php b/src/Illuminate/Collections/LazyCollection.php
@@ -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 (! $iterator->valid() || $this->now() > $timeout) {
+                return;
+            }
+
+            yield $iterator->key() => $iterator->current();
+
+            while ($iterator->valid() && $this->now() < $timeout) {
+                $iterator->next();
+
+                yield $iterator->key() => $iterator->current();
+            }
         });
     }
 

diff --git a/tests/Support/SupportLazyCollectionTest.php b/tests/Support/SupportLazyCollectionTest.php
@@ -196,6 +196,32 @@ public function testTakeUntilTimeout()
         m::close();
     }
 
+    public function testTakeUntilTimeoutWithPastTimeout()
+    {
+        $timeout = Carbon::now()->subMinute();
+
+        $mock = m::mock(LazyCollection::class.'[now]');
+
+        $results = $mock
+            ->times(10)
+            ->tap(function ($collection) use ($mock, $timeout) {
+                tap($collection)
+                    ->mockery_init($mock->mockery_getContainer())
+                    ->shouldAllowMockingProtectedMethods()
+                    ->shouldReceive('now')
+                    ->times(1)
+                    ->andReturn(
+                        (clone $timeout)->add(1, 'minute')->getTimestamp(),
+                    );
+            })
+            ->takeUntilTimeout($timeout)
+            ->all();
+
+        $this->assertSame([], $results);
+
+        m::close();
+    }
+
     public function testTapEach()
     {
         $data = LazyCollection::times(10);