Improve Query Limit implementation

thephpleague · Sep 20, 2024 · 8708a75 · 8708a75
1 parent 81b7b58
commit 8708a75
Showing 1 changed file with 11 additions and 3 deletions.
diff --git a/src/Query/Limit.php b/src/Query/Limit.php
@@ -15,7 +15,7 @@
 
 use ArrayIterator;
 use Iterator;
-use IteratorIterator;
+use IteratorAggregate;
 use LimitIterator;
 use Traversable;
 
@@ -44,14 +44,22 @@ public static function new(int $offset, int $length): self
      */
     public function slice(iterable $value): LimitIterator
     {
+        if ($value instanceof IteratorAggregate) {
+            $value = $value->getIterator();
+        }
+
         return new LimitIterator(
             match (true) {
                 $value instanceof Iterator => $value,
-                $value instanceof Traversable => new IteratorIterator($value),
+                $value instanceof Traversable => (function () use ($value): Iterator {
+                    foreach ($value as $offset => $record) {
+                        yield $offset => $record;
+                    }
+                })(),
                 default => new ArrayIterator($value),
             },
             $this->offset,
-            $this->length,
+            $this->length
         );
     }
 }