Merge 22735a7 into e496601

Author: yiiliveext

src/ArrayHelper.php

@@ -5,6 +5,7 @@
 use InvalidArgumentException;
 use Yiisoft\Arrays\Modifier\ModifierInterface;
 use Yiisoft\Strings\StringHelper;
+use Yiisoft\Arrays\Modifier\ReverseBlockMerge;
 
 /**
  * Yii array helper provides static methods allowing you to deal with arrays more efficiently.
@@ -105,6 +106,12 @@ public static function toArray($object, array $properties = [], bool $recursive
      */
     public static function merge(...$args): array
     {
+        $lastArray = end($args);
+        if (isset($lastArray[ReverseBlockMerge::class]) && $lastArray[ReverseBlockMerge::class] instanceof ReverseBlockMerge) {
+            reset($lastArray);
+            return self::applyModifiers(self::performReverseBlockMerge(...$args));
+        }
+
         return self::applyModifiers(self::performMerge(...$args));
     }
 
@@ -130,6 +137,28 @@ private static function performMerge(...$args): array
         return $res;
     }
 
+    private static function performReverseBlockMerge(...$args): array
+    {
+        $res = array_pop($args) ?: [];
+        while (!empty($args)) {
+            foreach (array_pop($args) as $k => $v) {
+                if (is_int($k)) {
+                    if (array_key_exists($k, $res) && $res[$k] !== $v) {
+                        $res[] = $v;
+                    } else {
+                        $res[$k] = $v;
+                    }
+                } elseif (is_array($v) && isset($res[$k]) && is_array($res[$k])) {
+                    $res[$k] = self::performReverseBlockMerge($v, $res[$k]);
+                } elseif (!isset($res[$k])) {
+                    $res[$k] = $v;
+                }
+            }
+        }
+
+        return $res;
+    }
+
     public static function applyModifiers(array $data): array
     {
         $modifiers = [];

src/Modifier/ReverseBlockMerge.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace Yiisoft\Arrays\Modifier;
+
+/**
+ * Reverse arrays order
+ */
+class ReverseBlockMerge implements ModifierInterface
+{
+    public function apply(array $data, string $key): array
+    {
+        return $data;
+    }
+}

tests/ArrayHelperTest.php

@@ -9,6 +9,7 @@
 use Yiisoft\Arrays\ArrayableInterface;
 use Yiisoft\Arrays\ArrayHelper;
 use Yiisoft\Arrays\Modifier\RemoveKeys;
+use Yiisoft\Arrays\Modifier\ReverseBlockMerge;
 use Yiisoft\Arrays\Modifier\ReverseValues;
 use Yiisoft\Arrays\Modifier\ReplaceValue;
 use Yiisoft\Arrays\Modifier\UnsetValue;
@@ -372,6 +373,40 @@ public function testMergeWithReverseValues(): void
         $this->assertSame($expected, $result);
     }
 
+    public function testMergeWithReverseBlock(): void
+    {
+        $a = [
+            'name' => 'Yii',
+            'options' => [
+                'option1' => 'valueA',
+                'option3' => 'valueAA',
+            ],
+            'version' => '1.0',
+            ReverseBlockMerge::class => new ReverseBlockMerge(),
+        ];
+        $b = [
+            'version' => '1.1',
+            'options' => [
+                'option1' => 'valueB',
+                'option2' => 'valueBB',
+            ],
+            ReverseBlockMerge::class => new ReverseBlockMerge(),
+        ];
+
+        $result = ArrayHelper::merge($a, $b);
+        $expected = [
+            'version' => '1.1',
+            'options' => [
+                'option1' => 'valueB',
+                'option2' => 'valueBB',
+                'option3' => 'valueAA',
+            ],
+            'name' => 'Yii',
+        ];
+
+        $this->assertSame($expected, $result);
+    }
+
     public function testMergeWithNullValues(): void
     {
         $a = [