Update Unpair operation.

loophp · Aug 25, 2020 · 2d7ce6e · 2d7ce6e
1 parent def5f26
commit 2d7ce6e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/spec/loophp/collection/CollectionSpec.php b/spec/loophp/collection/CollectionSpec.php
@@ -1884,10 +1884,10 @@ public function it_can_unpair(): void
         $this::fromIterable($input)
             ->unpair()
             ->shouldIterateAs([
-                ['k1', 'v1'],
-                ['k2', 'v2'],
-                ['k3', 'v3'],
-                ['k4', 'v4'],
+                'k1', 'v1',
+                'k2', 'v2',
+                'k3', 'v3',
+                'k4', 'v4',
             ]);
     }
 

diff --git a/src/Operation/Unpair.php b/src/Operation/Unpair.php
@@ -20,13 +20,15 @@ public function __invoke(): Closure
     {
         return
             /**
-             * @psalm-param \Iterator<TKey, T> $iterator
+             * @psalm-param Iterator<TKey, T> $iterator
              *
-             * @psalm-return \Generator<int, array{TKey, T}>
+             * @psalm-return Generator<int, array{TKey, T}>
              */
             static function (Iterator $iterator): Generator {
                 foreach ($iterator as $key => $value) {
-                    yield [$key, $value];
+                    yield $key;
+
+                    yield $value;
                 }
             };
     }