fix: Simple fix which should fix the issue.

loophp · Dec 30, 2020 · 804b4de · 804b4de
1 parent f09ae23
commit 804b4de
Showing 1 changed file with 6 additions and 12 deletions.
diff --git a/src/Operation/Last.php b/src/Operation/Last.php
@@ -4,7 +4,6 @@
 
 namespace loophp\collection\Operation;
 
-use CachingIterator;
 use Closure;
 use EmptyIterator;
 use Generator;
@@ -29,20 +28,15 @@ public function __invoke(): Closure
              * @psalm-return Generator<TKey, T>
              */
             static function (Iterator $iterator): Generator {
-                if (!$iterator->valid()) {
-                    return new EmptyIterator();
-                }
-
-                $cachingIterator = new CachingIterator($iterator, CachingIterator::FULL_CACHE);
+                $isEmpty = 1;
 
-                while ($iterator->valid()) {
-                    $cachingIterator->next();
+                foreach ($iterator as $key => $current) {
+                    $isEmpty = 0;
                 }
 
-                /** @psalm-var TKey $key */
-                $key = $cachingIterator->key();
-                /** @psalm-var T $current */
-                $current = $cachingIterator->current();
+                if (1 === $isEmpty) {
+                    return new EmptyIterator();
+                }
 
                 return yield $key => $current;
             };