refactor: Use EmptyIterator.

loophp · Dec 20, 2020 · 4390145 · 4390145
1 parent f1eeb5d
commit 4390145
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 5 deletions.
diff --git a/src/Operation/Chunk.php b/src/Operation/Chunk.php
@@ -6,6 +6,7 @@
 
 use ArrayIterator;
 use Closure;
+use EmptyIterator;
 use Generator;
 use Iterator;
 
@@ -42,7 +43,7 @@ static function (Iterator $iterator) use ($sizes): Generator {
 
                     foreach ($iterator as $value) {
                         if (0 >= $sizesIterator->current()) {
-                            return yield from [];
+                            return new EmptyIterator();
                         }
 
                         if (count($values) !== $sizesIterator->current()) {

diff --git a/src/Operation/Drop.php b/src/Operation/Drop.php
@@ -5,6 +5,7 @@
 namespace loophp\collection\Operation;
 
 use Closure;
+use EmptyIterator;
 use Generator;
 use Iterator;
 use LimitIterator;
@@ -33,7 +34,7 @@ public function __invoke(): Closure
                  */
                 static function (Iterator $iterator) use ($offsets): Generator {
                     if (!$iterator->valid()) {
-                        return yield from [];
+                        return new EmptyIterator();
                     }
 
                     return yield from new LimitIterator($iterator, array_sum($offsets));

diff --git a/src/Operation/Head.php b/src/Operation/Head.php
@@ -5,6 +5,7 @@
 namespace loophp\collection\Operation;
 
 use Closure;
+use EmptyIterator;
 use Generator;
 use Iterator;
 
@@ -28,7 +29,7 @@ public function __invoke(): Closure
              */
             static function (Iterator $iterator): Generator {
                 if (!$iterator->valid()) {
-                    return yield from [];
+                    return new EmptyIterator();
                 }
 
                 return yield $iterator->key() => $iterator->current();

diff --git a/src/Operation/Last.php b/src/Operation/Last.php
@@ -6,6 +6,7 @@
 
 use CachingIterator;
 use Closure;
+use EmptyIterator;
 use Generator;
 use Iterator;
 
@@ -29,7 +30,7 @@ public function __invoke(): Closure
              */
             static function (Iterator $iterator): Generator {
                 if (!$iterator->valid()) {
-                    return yield from [];
+                    return new EmptyIterator();
                 }
 
                 $cachingIterator = new CachingIterator($iterator, CachingIterator::FULL_CACHE);

diff --git a/src/Operation/Times.php b/src/Operation/Times.php
@@ -5,6 +5,7 @@
 namespace loophp\collection\Operation;
 
 use Closure;
+use EmptyIterator;
 use Generator;
 use Iterator;
 
@@ -39,7 +40,7 @@ public function __invoke(): Closure
                      */
                     static function (?Iterator $iterator = null) use ($number, $callback): Generator {
                         if (1 > $number) {
-                            yield from [];
+                            return new EmptyIterator();
                         }
 
                         $callback ??= static fn (int $value): int => $value;