Merge pull request #1225 from ChuckHeintzelman/bug/environ-config-not-merging-recursively

taylorotwell · taylorotwell · commit ac47b1ea62c9 · 2013-05-07T19:29:15.000-07:00
Changed environment config loading from array_merge() to array_replace_recursive()
diff --git 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.

Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ public function load($environment, $group, $namespace = null)`
`84`	`84`
`85`	`85`	`if ($this->files->exists($file))`
`86`	`86`	`{`
`87`		`- $items = array_merge($items, $this->files->getRequire($file));`
	`87`	`+ $items = array_replace_recursive($items, $this->files->getRequire($file));`
`88`	`88`	`}`
`89`	`89`
`90`	`90`	`return $items;`
`@@ -207,7 +207,7 @@ public function addNamespace($namespace, $hint)`
`207`	`207`	`{`
`208`	`208`	`$this->hints[$namespace] = $hint;`
`209`	`209`	`}`
`210`		`-`
	`210`	`+`
`211`	`211`	`/**`
`212`	`212`	`* Returns all registered namespaces with the config`
`213`	`213`	`* loader.`