Merge pull request #79 from boesing/feature/typed-merge-stack

feature: introduce typed merge stack
boesing · Jun 7, 2021 · 3ba0be6 · 3ba0be6
2 parents d2ed907 + 2d9967c
commit 3ba0be6
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 12 deletions.
diff --git a/src/Map.php b/src/Map.php
@@ -46,13 +46,16 @@ public function __construct(array $data = [])
         parent::__construct($data);
     }
 
-    public function merge(...$stack): MapInterface
+    public function merge(MapInterface ...$stack): MapInterface
     {
         $instance = clone $this;
-        foreach ($stack as $list) {
-            $instance->data = array_merge($instance->data, $list->toNativeArray());
+        $merges   = [];
+        foreach ($stack as $map) {
+            $merges[] = $map->toNativeArray();
         }
 
+        $instance->data = array_merge($instance->data, ...$merges);
+
         return $instance;
     }
 

diff --git a/src/MapInterface.php b/src/MapInterface.php
@@ -32,7 +32,7 @@ public function sort(?callable $callback = null): MapInterface;
      * @psalm-param  list<MapInterface<TKey,TValue>> $stack
      * @psalm-return MapInterface<TKey,TValue>
      */
-    public function merge(...$stack): MapInterface;
+    public function merge(MapInterface ...$stack): MapInterface;
 
     /**
      * @psalm-param  MapInterface<TKey,TValue> $other

diff --git a/src/OrderedList.php b/src/OrderedList.php
@@ -11,7 +11,6 @@
 
 use function array_key_exists;
 use function array_keys;
-use function array_map;
 use function array_merge;
 use function array_replace;
 use function array_reverse;
@@ -46,14 +45,14 @@ final public function __construct(array $data = [])
         parent::__construct($data);
     }
 
-    public function merge(...$stack): OrderedListInterface
+    public function merge(OrderedListInterface ...$stack): OrderedListInterface
     {
         $instance = clone $this;
-        $values   = array_map(static function (OrderedListInterface $list): array {
-            return $list->toNativeArray();
-        }, $stack);
-
-        $instance->data = array_values(array_merge($instance->data, ...$values));
+        foreach ($stack as $list) {
+            foreach ($list->toNativeArray() as $value) {
+                $instance->data[] = $value;
+            }
+        }
 
         return $instance;
     }

diff --git a/src/OrderedListInterface.php b/src/OrderedListInterface.php
@@ -44,7 +44,7 @@ public function sort(?callable $callback = null): OrderedListInterface;
      * @psalm-param  list<OrderedListInterface<TValue>> $stack
      * @psalm-return OrderedListInterface<TValue>
      */
-    public function merge(...$stack): OrderedListInterface;
+    public function merge(OrderedListInterface ...$stack): OrderedListInterface;
 
     /**
      * @template     TNewValue

diff --git a/tests/GenericMapTest.php b/tests/GenericMapTest.php
@@ -185,6 +185,14 @@ public function mergeStacks(): Generator
                 ['baz' => 'bar', 'qoo' => 'ooq'],
             ],
         ];
+
+        yield 'none' => [
+            ['foo' => 'bar'],
+            ['foo' => 'bar'],
+            [
+                [],
+            ],
+        ];
     }
 
     /**

diff --git a/tests/GenericOrderedListTest.php b/tests/GenericOrderedListTest.php
@@ -164,6 +164,20 @@ public function mergeStacks(): Generator
                 ['baz', 'foo'],
             ],
         ];
+
+        yield 'none' => [
+            [
+                'foo',
+                'bar',
+            ],
+            [
+                'foo',
+                'bar',
+            ],
+            [
+                [],
+            ],
+        ];
     }
 
     public function testWillMapByUsingCallable(): void