diff --git a/src/Illuminate/Config/FileLoader.php b/src/Illuminate/Config/FileLoader.php index c367d52edad7..8314e9b0dafe 100644 --- a/src/Illuminate/Config/FileLoader.php +++ b/src/Illuminate/Config/FileLoader.php @@ -84,7 +84,7 @@ public function load($environment, $group, $namespace = null) if ($this->files->exists($file)) { - $items = array_merge($items, $this->files->getRequire($file)); + $items = array_replace_recursive($items, $this->files->getRequire($file)); } return $items; @@ -207,7 +207,7 @@ public function addNamespace($namespace, $hint) { $this->hints[$namespace] = $hint; } - + /** * Returns all registered namespaces with the config * loader.