refactor: Simplify fromGenerator operation.

loophp · Dec 29, 2021 · b2e1dc9 · b2e1dc9
1 parent b2028d8
commit b2e1dc9
Showing 1 changed file with 2 additions and 9 deletions.
diff --git a/src/Collection.php b/src/Collection.php
@@ -136,6 +136,7 @@
 use loophp\iterators\CachingIteratorAggregate;
 use loophp\iterators\ClosureIterator;
 use loophp\iterators\IterableIterator;
+use NoRewindIterator;
 use Psr\Cache\CacheItemPoolInterface;
 use Symfony\Component\Cache\Adapter\ArrayAdapter;
 
@@ -485,15 +486,7 @@ public static function fromGenerator(Generator $generator): self
     {
         return self::fromIterable(
             new CachingIteratorAggregate(
-                new ClosureIterator(
-                    static function (Generator $generator): Generator {
-                        while ($generator->valid()) {
-                            yield $generator->key() => $generator->current();
-                            $generator->next();
-                        }
-                    },
-                    [$generator]
-                )
+                new NoRewindIterator($generator)
             )
         );
     }