Update Collapse operation.

loophp · Jul 6, 2020 · 795aa06 · 795aa06
1 parent baa9caf
commit 795aa06
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 5 deletions.
diff --git a/spec/loophp/collection/CollectionSpec.php b/spec/loophp/collection/CollectionSpec.php
@@ -218,10 +218,26 @@ public function it_can_chunk(): void
 
     public function it_can_collapse(): void
     {
-        $this::fromIterable(range('A', 'J'))
-            ->chunk(2)
+        $generator = static function () {
+            yield 0 => 'A';
+
+            yield 1 => 'B';
+
+            yield 'foo' => 'C';
+
+            yield 0 => 'E';
+
+            yield 1 => 'F';
+        };
+
+        $this::fromIterable([
+            ['A', 'B', 'foo' => 'C'],
+            'D',
+            ['E', 'F'],
+            'G',
+        ])
             ->collapse()
-            ->shouldIterateAs(['A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J']);
+            ->shouldIterateAs($generator());
 
         $this::fromIterable(range('A', 'E'))
             ->collapse()

diff --git a/src/Operation/Collapse.php b/src/Operation/Collapse.php
@@ -18,8 +18,8 @@ public function __invoke(): Closure
                     continue;
                 }
 
-                foreach ($value as $subValue) {
-                    yield $subValue;
+                foreach ($value as $subKey => $subValue) {
+                    yield $subKey => $subValue;
                 }
             }
         };