Update DocumentsServiceProvider.php

tswonke · web-flow · commit 8ed87d7e1917 · 2018-02-04T16:18:59.000+01:00
According to https://laravel.com/docs/5.5/packages#configuration the `mergeConfigFrom()`-method should be placed in `register()`?
diff --git a/src/DocumentsServiceProvider.php b/src/DocumentsServiceProvider.php
@@ -27,10 +27,6 @@ public function boot()
 
         $this->loadTranslationsFrom(realpath(__DIR__.'/../resources/lang'), 'webfactor');
 
-        $this->mergeConfigFrom(
-            __DIR__.'/../config/webfactor/documents.php', 'webfactor.documents'
-        );
-
         $this->publishFiles();
     }
 
@@ -41,7 +37,9 @@ public function boot()
      */
     public function register()
     {
-        //
+        $this->mergeConfigFrom(
+            __DIR__.'/../config/webfactor/documents.php', 'webfactor.documents'
+        );
     }
 
     public function publishFiles()

Original file line number	Diff line number	Diff line change
`@@ -27,10 +27,6 @@ public function boot()`
`27`	`27`
`28`	`28`	`$this->loadTranslationsFrom(realpath(__DIR__.'/../resources/lang'), 'webfactor');`
`29`	`29`
`30`		`- $this->mergeConfigFrom(`
`31`		`- __DIR__.'/../config/webfactor/documents.php', 'webfactor.documents'`
`32`		`- );`
`33`		`-`
`34`	`30`	`$this->publishFiles();`
`35`	`31`	`}`
`36`	`32`
`@@ -41,7 +37,9 @@ public function boot()`
`41`	`37`	`*/`
`42`	`38`	`public function register()`
`43`	`39`	`{`
`44`		`- //`
	`40`	`+ $this->mergeConfigFrom(`
	`41`	`+ __DIR__.'/../config/webfactor/documents.php', 'webfactor.documents'`
	`42`	`+ );`
`45`	`43`	`}`
`46`	`44`
`47`	`45`	`public function publishFiles()`