Fix for dead cursor

doctrine · Dec 19, 2024 · db1f368 · db1f368
1 parent 153ea2a
commit db1f368
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 1 deletion.
diff --git a/lib/Doctrine/ODM/MongoDB/Iterator/CachingIterator.php b/lib/Doctrine/ODM/MongoDB/Iterator/CachingIterator.php
@@ -52,7 +52,11 @@ public function __construct(Traversable $iterator)
     {
         $this->iterator = new IteratorIterator($iterator);
         $this->iterator->rewind();
-        $this->storeCurrentItem();
+        if ($this->iterator->valid()) {
+            $this->storeCurrentItem();
+        } else {
+            $this->iterator = null;
+        }
     }
 
     /** @see https://php.net/countable.count */

diff --git a/lib/Doctrine/ODM/MongoDB/Iterator/HydratingIterator.php b/lib/Doctrine/ODM/MongoDB/Iterator/HydratingIterator.php
@@ -35,6 +35,7 @@ final class HydratingIterator implements Iterator
     public function __construct(Traversable $traversable, private UnitOfWork $unitOfWork, private ClassMetadata $class, private array $unitOfWorkHints = [])
     {
         $this->iterator = new IteratorIterator($traversable);
+        $this->iterator->rewind();
     }
 
     public function __destruct()

diff --git a/tests/Doctrine/ODM/MongoDB/Tests/Functional/Iterator/CachingIteratorTest.php b/tests/Doctrine/ODM/MongoDB/Tests/Functional/Iterator/CachingIteratorTest.php
@@ -59,6 +59,19 @@ public function testIterationWithEmptySet(): void
         self::assertFalse($iterator->valid());
     }
 
+    public function testIterationWithInvalidIterator(): void
+    {
+        $mock = $this->createMock(Iterator::class);
+        // The method next() should not be called on a dead cursor.
+        $mock->expects(self::never())->method('next');
+        // The method valid() return false on a dead cursor.
+        $mock->expects(self::once())->method('valid')->willReturn(false);
+
+        $iterator = new CachingIterator($mock);
+
+        $this->assertEquals([], $iterator->toArray());
+    }
+
     public function testPartialIterationDoesNotExhaust(): void
     {
         $traversable = $this->getTraversableThatThrows([1, 2, new Exception()]);