使用 array_replace_recursive 代替 array_merge 修正数组数字下标合并键丢失

awheel · Jun 21, 2018 · 923d0af · 923d0af
1 parent 4972178
commit 923d0af
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/App.php b/src/App.php
@@ -101,7 +101,7 @@ public function bootstrap()
         static::setInstance($this);
 
         // 加载组件
-        $component = array_merge($this->component, $this->configGet('app.component'));
+        $component = array_replace_recursive($this->component, $this->configGet('app.component'));
         foreach ($component as $item) {
             $class = new $item;
             if (!$class instanceof Component) continue;
@@ -277,7 +277,7 @@ protected function loadConfigure($item, $force = false)
             $env_config = require $env_config_file;
         }
 
-        $this->config[$item] = array_merge($config, $env_config);
+        $this->config[$item] = array_replace_recursive($config, $env_config);
 
         return $this->config[$item];
     }

diff --git a/src/Http/Request.php b/src/Http/Request.php
@@ -32,7 +32,7 @@ public function enableHttpRequestParameterOverride()
      */
     public function input()
     {
-        return array_merge($this->query->all(), $this->attributes->all(), $this->request->all());
+        return array_replace_recursive($this->query->all(), $this->attributes->all(), $this->request->all());
     }
 
     /**