Skip to content

Commit ac47b1e

Browse files
committed
Merge pull request #1225 from ChuckHeintzelman/bug/environ-config-not-merging-recursively
Changed environment config loading from array_merge() to array_replace_recursive()
2 parents 57e11e3 + 4549f1e commit ac47b1e

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

src/Illuminate/Config/FileLoader.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ public function load($environment, $group, $namespace = null)
8484

8585
if ($this->files->exists($file))
8686
{
87-
$items = array_merge($items, $this->files->getRequire($file));
87+
$items = array_replace_recursive($items, $this->files->getRequire($file));
8888
}
8989

9090
return $items;
@@ -207,7 +207,7 @@ public function addNamespace($namespace, $hint)
207207
{
208208
$this->hints[$namespace] = $hint;
209209
}
210-
210+
211211
/**
212212
* Returns all registered namespaces with the config
213213
* loader.

0 commit comments

Comments
 (0)