修正Arr::mergeDeep

Author: yunwuxin

src/helper/Arr.php

@@ -637,9 +637,7 @@ public static function mergeDeep(array ...$arrays): array
         $result = [];
         foreach ($arrays as $array) {
             foreach ($array as $key => $value) {
-                if (is_integer($key)) {
-                    $result[] = $value;
-                } elseif (isset($result[$key]) && is_array($result[$key]) && is_array($value)) {
+                if (isset($result[$key]) && is_array($result[$key]) && is_array($value)) {
                     $result[$key] = self::mergeDeep(
                         $result[$key],
                         $value

tests/ArrTest.php

@@ -55,7 +55,7 @@ public function testCrossJoin()
 
     public function testDivide()
     {
-        list($keys, $values) = Arr::divide(['name' => 'ThinkPHP']);
+        [$keys, $values] = Arr::divide(['name' => 'ThinkPHP']);
         $this->assertSame(['name'], $keys);
         $this->assertSame(['ThinkPHP'], $values);
     }
@@ -109,7 +109,7 @@ public function testFirst()
     public function testLast()
     {
         $array = [100, 200, 300];
-        $last = Arr::last($array, function ($value) {
+        $last  = Arr::last($array, function ($value) {
             return $value < 250;
         });
         $this->assertSame(200, $last);
@@ -234,17 +234,17 @@ public function testPrepend()
     public function testPull()
     {
         $array = ['name' => 'ThinkPHP', 'price' => 100];
-        $name = Arr::pull($array, 'name');
+        $name  = Arr::pull($array, 'name');
         $this->assertSame('ThinkPHP', $name);
         $this->assertSame(['price' => 100], $array);
         // Only works on first level keys
         $array = ['[email protected]' => 'Joe', 'jack@localhost' => 'Jane'];
-        $name = Arr::pull($array, '[email protected]');
+        $name  = Arr::pull($array, '[email protected]');
         $this->assertSame('Joe', $name);
         $this->assertSame(['jack@localhost' => 'Jane'], $array);
         // Does not work for nested keys
         $array = ['emails' => ['[email protected]' => 'Joe', 'jack@localhost' => 'Jane']];
-        $name = Arr::pull($array, '[email protected]');
+        $name  = Arr::pull($array, '[email protected]');
         $this->assertNull($name);
         $this->assertSame(['emails' => ['[email protected]' => 'Joe', 'jack@localhost' => 'Jane']], $array);
     }
@@ -331,12 +331,42 @@ public function testForget()
 
     public function testWrap()
     {
-        $string = 'a';
-        $array = ['a'];
-        $object = new stdClass();
+        $string        = 'a';
+        $array         = ['a'];
+        $object        = new stdClass();
         $object->value = 'a';
         $this->assertSame(['a'], Arr::wrap($string));
         $this->assertSame($array, Arr::wrap($array));
         $this->assertSame([$object], Arr::wrap($object));
     }
+
+    public function testMergeDeep()
+    {
+        $this->assertSame(
+            [
+                'a' => [
+                    'c' => [2],
+                    'e' => 5,
+                    'f' => 4,
+                ],
+                'x' => 3,
+            ],
+            Arr::mergeDeep(
+                [
+                    'a' => [
+                        'c' => [1],
+                        'e' => 5,
+                    ],
+                    'x' => 4,
+                ],
+                [
+                    'a' => [
+                        'c' => [2],
+                        'f' => 4,
+                    ],
+                    'x' => 3,
+                ]
+            )
+        );
+    }
 }