refactor: Update Head and First operations.

Signed-off-by: Pol Dellaiera <pol.dellaiera@protonmail.com>
loophp · Nov 6, 2020 · eb792af · eb792af
1 parent 8b848bb
commit eb792af
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 17 deletions.
diff --git a/src/Operation/Column.php b/src/Operation/Column.php
@@ -48,7 +48,7 @@ static function ($column): Closure {
                 $pipe = Pipe::of()(
                     Transpose::of(),
                     Filter::of()($filterCallbackBuilder($column)),
-                    First::of(),
+                    Head::of(),
                     Unwrap::of()
                 );
 

diff --git a/src/Operation/First.php b/src/Operation/First.php
@@ -20,18 +20,10 @@ final class First extends AbstractOperation
      */
     public function __invoke(): Closure
     {
-        return
-            /**
-             * @psalm-param Iterator<TKey, T> $iterator
-             *
-             * @psalm-return Generator<TKey, T>
-             */
-            static function (Iterator $iterator): Generator {
-                if (!$iterator->valid()) {
-                    return yield from [];
-                }
+        /** @psalm-var Closure(Iterator<TKey, T>): Generator<TKey, T> $head */
+        $head = Head::of();
 
-                return yield $iterator->key() => $iterator->current();
-            };
+        // Point free style.
+        return $head;
     }
 }
diff --git a/src/Operation/Head.php b/src/Operation/Head.php
@@ -20,10 +20,18 @@ final class Head extends AbstractOperation
      */
     public function __invoke(): Closure
     {
-        /** @psalm-var Closure(Iterator<TKey, T>): Generator<TKey, T> $first */
-        $first = First::of();
+        return
+            /**
+             * @psalm-param Iterator<TKey, T> $iterator
+             *
+             * @psalm-return Generator<TKey, T>
+             */
+            static function (Iterator $iterator): Generator {
+                if (!$iterator->valid()) {
+                    return yield from [];
+                }
 
-        // Point free style.
-        return $first;
+                return yield $iterator->key() => $iterator->current();
+            };
     }
 }