Added config merging to service provider

stevebauman · stevebauman · commit b0b71312237f · 2015-08-13T16:02:15.000-04:00
diff --git a/src/AdldapServiceProvider.php b/src/AdldapServiceProvider.php
@@ -20,8 +20,12 @@ class AdldapServiceProvider extends ServiceProvider
      */
     public function boot()
     {
+        $config = __DIR__.'/Config/config.php';
+
+        $this->mergeConfigFrom($config, 'adldap');
+
         $this->publishes([
-            __DIR__.'/Config/config.php' => config_path('adldap.php'),
+            $config => config_path('adldap.php'),
         ]);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -20,8 +20,12 @@ class AdldapServiceProvider extends ServiceProvider`
`20`	`20`	`*/`
`21`	`21`	`public function boot()`
`22`	`22`	`{`
	`23`	`+ $config = __DIR__.'/Config/config.php';`
	`24`	`+`
	`25`	`+ $this->mergeConfigFrom($config, 'adldap');`
	`26`	`+`
`23`	`27`	`$this->publishes([`
`24`		`- __DIR__.'/Config/config.php' => config_path('adldap.php'),`
	`28`	`+ $config => config_path('adldap.php'),`
`25`	`29`	`]);`
`26`	`30`	`}`
`27`	`31`