Use loophp/iterators

composer.json

@@ -35,7 +35,8 @@
         }
     ],
     "require": {
-        "php": ">= 7.4"
+        "php": ">= 7.4",
+        "loophp/iterators": "^1.3"
     },
     "require-dev": {
         "amphp/parallel-functions": "^1",

spec/loophp/collection/CollectionSpec.php

@@ -22,8 +22,8 @@
 use loophp\collection\Collection;
 use loophp\collection\Contract\Collection as CollectionInterface;
 use loophp\collection\Contract\Operation;
-use loophp\collection\Iterator\ClosureIterator;
 use loophp\collection\Operation\AbstractOperation;
+use loophp\iterators\ClosureIterator;
 use OutOfBoundsException;
 use PhpSpec\Exception\Example\FailureException;
 use PhpSpec\Exception\Example\MatcherException;

spec/loophp/collection/Iterator/MultipleIterableIteratorSpec.php

@@ -16,13 +16,6 @@
 
 class MultipleIterableIteratorSpec extends ObjectBehavior
 {
-    public function it_can_iterate_with_a_single_iterable(): void
-    {
-        $this->beConstructedWith([1, 2, 3]);
-
-        $this->getInnerIterator()->shouldIterateAs([1, 2, 3]);
-    }
-
     public function it_can_iterate_with_multiple_iterables(): void
     {
         $this->beConstructedWith([1, 2, 3], new ArrayIterator([4, 5, 6]));
@@ -41,7 +34,7 @@ public function it_can_iterate_with_multiple_iterables(): void
             yield 2 => 6;
         };
 
-        $this->getInnerIterator()->shouldIterateAs($expected());
+        $this->shouldIterateAs($expected());
     }
 
     public function it_is_initializable_with_a_single_iterable(): void

spec/loophp/collection/Iterator/PsrCacheIteratorSpec.php

@@ -80,16 +80,6 @@ public function it_can_cache_data(CacheItemPoolInterface $cache): void
             ->shouldHaveBeenCalledOnce();
     }
 
-    public function it_can_get_the_inner_iterator(Iterator $iterator, CacheItemPoolInterface $cache): void
-    {
-        $this
-            ->beConstructedWith($iterator, $cache);
-
-        $this
-            ->getInnerIterator()
-            ->shouldReturn($iterator);
-    }
-
     public function it_is_initializable(Iterator $iterator, CacheItemPoolInterface $cache): void
     {
         $this->beConstructedWith($iterator, $cache);

spec/loophp/collection/Iterator/RandomIteratorSpec.php

@@ -104,11 +104,6 @@ public function it_can_get_key(): void
         $this->key()->shouldReturn('a');
     }
 
-    public function it_can_get_the_innerIterator(): void
-    {
-        $this->getInnerIterator()->shouldBeAnInstanceOf(ArrayIterator::class);
-    }
-
     public function it_can_next(): void
     {
         $this->beConstructedWith(new ArrayIterator([1, 2, 3]));

spec/loophp/collection/Iterator/ResourceIteratorSpec.php

@@ -21,7 +21,7 @@ public function it_can_iterate(): void
     {
         $this->beConstructedWith(fopen('data://text/plain,ABCD', 'rb'));
 
-        $this->getInnerIterator()->shouldIterateAs(['A', 'B', 'C', 'D']);
+        $this->shouldIterateAs(['A', 'B', 'C', 'D']);
     }
 
     public function it_closes_opened_file_if_needed(): void
@@ -30,7 +30,7 @@ public function it_closes_opened_file_if_needed(): void
 
         $this->beConstructedWith($file, true);
 
-        $this->getInnerIterator()->shouldIterateAs(['a', 'b', 'c']);
+        $this->shouldIterateAs(['a', 'b', 'c']);
 
         if (is_resource($file)) {
             throw new FailureException('Failed to close resource!');
@@ -57,7 +57,7 @@ public function it_does_not_close_resource_by_default(): void
 
         $this->beConstructedWith($file);
 
-        $this->getInnerIterator()->shouldIterateAs(['a', 'b', 'c']);
+        $this->shouldIterateAs(['a', 'b', 'c']);
 
         if (!is_resource($file)) {
             throw new FailureException('Resource was closed but should not have been!');

spec/loophp/collection/Iterator/StringIteratorSpec.php

@@ -18,14 +18,14 @@ public function it_can_iterate_with_default_delimiter(): void
     {
         $this->beConstructedWith('A string.');
 
-        $this->getInnerIterator()->shouldIterateAs(['A', ' ', 's', 't', 'r', 'i', 'n', 'g', '.']);
+        $this->shouldIterateAs(['A', ' ', 's', 't', 'r', 'i', 'n', 'g', '.']);
     }
 
     public function it_can_iterate_with_given_delimiter(): void
     {
         $this->beConstructedWith('I am a string.', ' ');
 
-        $this->getInnerIterator()->shouldIterateAs(['I', 'am', 'a', 'string.']);
+        $this->shouldIterateAs(['I', 'am', 'a', 'string.']);
     }
 
     public function it_is_initializable_with_default_delimiter(): void

src/Collection.php

@@ -15,9 +15,6 @@
 use Iterator;
 use loophp\collection\Contract\Collection as CollectionInterface;
 use loophp\collection\Contract\Operation;
-use loophp\collection\Iterator\ArrayCacheIterator;
-use loophp\collection\Iterator\ClosureIterator;
-use loophp\collection\Iterator\IterableIterator;
 use loophp\collection\Iterator\ResourceIterator;
 use loophp\collection\Iterator\StringIterator;
 use loophp\collection\Operation\All;
@@ -135,6 +132,9 @@
 use loophp\collection\Operation\Words;
 use loophp\collection\Operation\Wrap;
 use loophp\collection\Operation\Zip;
+use loophp\iterators\CachingIteratorAggregate;
+use loophp\iterators\ClosureIterator;
+use loophp\iterators\IterableIterator;
 use Psr\Cache\CacheItemPoolInterface;
 use Symfony\Component\Cache\Adapter\ArrayAdapter;
 
@@ -484,7 +484,7 @@ public static function fromFile(string $filepath): self
     public static function fromGenerator(Generator $generator): self
     {
         return self::fromIterable(
-            new ArrayCacheIterator(
+            new CachingIteratorAggregate(
                 new ClosureIterator(
                     static function (Generator $generator): Generator {
                         while ($generator->valid()) {