Tweak config merge

barryvdh · barryvdh · commit db4820c3afab · 2015-01-26T20:54:02.000+01:00
diff --git a/src/ServiceProvider.php b/src/ServiceProvider.php
@@ -119,6 +119,6 @@ protected function loadConfigFrom($key, $path)
     {
         $defaults = $this->app['files']->getRequire($path);
         $config = $this->app['config']->get($key, []);
-        $this->app['config']->set($key, array_merge($defaults, $config));
+        $this->app['config']->set($key, config_merge($defaults, $config));
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -119,6 +119,6 @@ protected function loadConfigFrom($key, $path)`
`119`	`119`	`{`
`120`	`120`	`$defaults = $this->app['files']->getRequire($path);`
`121`	`121`	`$config = $this->app['config']->get($key, []);`
`122`		`- $this->app['config']->set($key, array_merge($defaults, $config));`
	`122`	`+ $this->app['config']->set($key, config_merge($defaults, $config));`
`123`	`123`	`}`
`124`	`124`	`}`