refactor: Use StringIteratorAggregate. (#234)

loophp · Jan 23, 2022 · 2f15b72 · 2f15b72
1 parent e19bde8
commit 2f15b72
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 150 deletions.
diff --git a/composer.json b/composer.json
@@ -32,7 +32,7 @@
     ],
     "require": {
         "php": ">= 7.4",
-        "loophp/iterators": "^1.5"
+        "loophp/iterators": "^1.5.6"
     },
     "require-dev": {
         "amphp/parallel-functions": "^1",

diff --git a/src/Collection.php b/src/Collection.php
@@ -17,7 +17,6 @@
 use loophp\collection\Contract\Collection as CollectionInterface;
 use loophp\collection\Contract\Operation;
 use loophp\collection\Iterator\ResourceIterator;
-use loophp\collection\Iterator\StringIterator;
 use loophp\collection\Operation\All;
 use loophp\collection\Operation\Append;
 use loophp\collection\Operation\Apply;
@@ -136,6 +135,7 @@
 use loophp\iterators\CachingIteratorAggregate;
 use loophp\iterators\ClosureIterator;
 use loophp\iterators\IterableIterator;
+use loophp\iterators\StringIteratorAggregate;
 use NoRewindIterator;
 use Psr\Cache\CacheItemPoolInterface;
 use Symfony\Component\Cache\Adapter\ArrayAdapter;
@@ -525,7 +525,7 @@ public static function fromResource($resource): self
      */
     public static function fromString(string $string, string $delimiter = ''): self
     {
-        return new self(static fn (): Iterator => new StringIterator($string, $delimiter));
+        return new self(static fn (): IteratorAggregate => new StringIteratorAggregate($string, $delimiter));
     }
 
     public function get($key, $default = null): CollectionInterface

diff --git a/src/Iterator/StringIterator.php b/src/Iterator/StringIterator.php
diff --git a/tests/unit/Iterator/StringIteratorTest.php b/tests/unit/Iterator/StringIteratorTest.php