refactor: Update and simplify typing information.

loophp · Jan 3, 2021 · 6ab1622 · 6ab1622
1 parent 68d7bdc
commit 6ab1622
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 9 deletions.
diff --git a/src/Operation/Head.php b/src/Operation/Head.php
@@ -6,6 +6,7 @@
 
 use Closure;
 use EmptyIterator;
+use Generator;
 use Iterator;
 
 /**
@@ -16,17 +17,17 @@
 final class Head extends AbstractOperation
 {
     /**
-     * @psalm-return Closure(Iterator<TKey, T>): Iterator<TKey, T>
+     * @psalm-return Closure(Iterator<TKey, T>):Generator<TKey, T, mixed, EmptyIterator|mixed>
      */
     public function __invoke(): Closure
     {
         return
             /**
              * @psalm-param Iterator<TKey, T> $iterator
              *
-             * @psalm-return Iterator<TKey, T>
+             * @psalm-return Generator<TKey, T, mixed, EmptyIterator|void>
              */
-            static function (Iterator $iterator): Iterator {
+            static function (Iterator $iterator): Generator {
                 $isEmpty = true;
 
                 foreach ($iterator as $key => $current) {
@@ -39,6 +40,10 @@ static function (Iterator $iterator): Iterator {
                     return new EmptyIterator();
                 }
 
+                /**
+                 * @psalm-var TKey $key
+                 * @psalm-var T $current
+                 */
                 return yield $key => $current;
             };
     }

diff --git a/src/Operation/Init.php b/src/Operation/Init.php
@@ -29,13 +29,11 @@ public function __invoke(): Closure
              */
             static function (Iterator $iterator): Generator {
                 $cacheIterator = new CachingIterator($iterator, CachingIterator::FULL_CACHE);
-                $cacheIterator->next();
 
-                for (; $iterator->valid(); $cacheIterator->next()) {
-                    /** @psalm-var TKey $key */
-                    $key = $cacheIterator->key();
-                    /** @psalm-var T $current */
-                    $current = $cacheIterator->current();
+                foreach ($cacheIterator as $key => $current) {
+                    if (false === $iterator->valid()) {
+                        break;
+                    }
 
                     yield $key => $current;
                 }