Add merge method for configs.

mrdatamapper · Aug 27, 2017 · a5ddd30 · a5ddd30
1 parent 5c9583c
commit a5ddd30
Show file tree

Hide file tree

Showing 4 changed files with 53 additions and 4 deletions.
diff --git a/src/ConfigLoader.php b/src/ConfigLoader.php
@@ -206,7 +206,7 @@ protected function read($level, $name = self::NAME_CONFIG)
         foreach ($dirs as $dir) {
             $dirContent = $dir->getContent($name);
             $dirContent = $this->postProcess($dirContent, $dir, $name, $level);
-            $config = ArrayTools::mergeRecursiveDisabled($config, $dirContent);
+            $config = ConfigTools::merge($config, $dirContent);
         }
         return $config;
     }
@@ -217,7 +217,7 @@ public function getConfig($name = self::NAME_CONFIG)
             $levels = $this->getLevels();
             $config = [];
             foreach ($levels as $level) {
-                $config = ArrayTools::mergeRecursiveDisabled($config, $this->read($level, $name));
+                $config = ConfigTools::merge($config, $this->read($level, $name));
             }
             $this->config[$name] = new Config($config, $this->getDiContainer());
         }

diff --git a/src/ConfigTools.php b/src/ConfigTools.php
@@ -0,0 +1,48 @@
+<?php
+
+
+namespace Akademiano\Config;
+
+
+class ConfigTools
+{
+    /**
+     * @param array
+     * @param array
+     * @return array
+     */
+    public static function merge()
+    {
+        $arrays = func_get_args();
+        $merged = array_shift($arrays);
+        foreach ($arrays as $currentArray) {
+            foreach ($currentArray as $key => $value) {
+                if (is_array($value) && isset ($merged[$key]) && is_array($merged[$key])) {
+                    $merged[$key] = self::merge($merged[$key], $value);
+                } else {
+                    //проверяем что это не отключение параметров
+                    $unSetted = false;
+                    if ($value === null && !is_integer($key)) {
+                        if (false !== $keyMerged = array_search($key, $merged)) {
+                            if (is_integer($keyMerged)) {
+                                unset($merged[$keyMerged]);
+                                $unSetted = true;
+                            }
+                        }
+                    }
+                    if (!$unSetted) {
+                        //Числовой ключ добавляем, если такого значения нет, иначе заменяем
+                        if (is_integer($key) && is_string($value)) {
+                            if (!array_search($value, $merged)) {
+                                $merged[] = $value;
+                            }
+                        } else {
+                            $merged[$key] = $value;
+                        }
+                    }
+                }
+            }
+        }
+        return $merged;
+    }
+}
diff --git a/src/FS/ConfigDir.php b/src/FS/ConfigDir.php
@@ -8,6 +8,7 @@
 use Akademiano\Config\Exception\ConfigFileInvalidTypeException;
 use Akademiano\Utils\ArrayTools;
 use Akademiano\Utils\FileSystem;
+use Akademiano\Config\ConfigTools;
 
 class ConfigDir
 {
@@ -174,7 +175,7 @@ protected function read($configName)
         $files = $this->getFiles($configName);
         $content = [];
         foreach ($files as $file) {
-            $content = ArrayTools::mergeRecursiveDisabled($content, $file->getContent());
+            $content = ConfigTools::merge($content, $file->getContent());
         }
         return $content;
     }

diff --git a/tests/unit/ConfigLoaderTest.php b/tests/unit/ConfigLoaderTest.php
@@ -29,7 +29,7 @@ protected function _before()
         $configDefaultLocal = include $configDir . DIRECTORY_SEPARATOR . "local.config.php";
 
         $this->configDefault = new Akademiano\Config\Config(
-            \Akademiano\Utils\ArrayTools::mergeRecursiveDisabled(
+            \Akademiano\Config\ConfigTools::merge(
                 $configDefaultGlobal,
                 $configDefaultLocal
             )