fixed multidimensional fallback

akaunting · Feb 12, 2021 · 7ac79e8 · 7ac79e8
1 parent 44a193f
commit 7ac79e8
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 1 deletion.
diff --git a/src/Contracts/Driver.php b/src/Contracts/Driver.php
@@ -219,7 +219,7 @@ public function load($force = false)
         $fallback_data = $this->with_fallback ? config('setting.fallback') : [];
         $driver_data = $this->readData();
 
-        $this->data = array_merge((array) $fallback_data, (array) $driver_data);
+        $this->data = Arr::merge((array) $fallback_data, (array) $driver_data);
         $this->loaded = true;
     }
 

diff --git a/src/Support/Arr.php b/src/Support/Arr.php
@@ -134,4 +134,31 @@ public static function forget(array &$data, $key)
 
         unset($data[$key]);
     }
+
+    /**
+     * Merge two multidimensional arrays recursive
+     *
+     * @param array $array_1
+     * @param array $array_2
+     *
+     * @return array
+     */
+    public static function merge(array $array_1, array $array_2)
+    {
+        $merged = $array_1;
+
+        foreach ($array_2 as $key => $value) {
+            if (is_array($value) && isset($merged[$key]) && is_array($merged[$key])) {
+                $merged[$key] = static::merge($merged[$key], $value);
+            } elseif (is_numeric($key)) {
+                if (!in_array($value, $merged)) {
+                    $merged[] = $value;
+                }
+            } else {
+                $merged[$key] = $value;
+            }
+        }
+
+        return $merged;
+    }
 }