Make sure config merging takes place

GrahamCampbell · web-flow · commit 94f6daf21315 · 2018-03-06T17:34:36.000Z
diff --git a/src/TinkerServiceProvider.php b/src/TinkerServiceProvider.php
@@ -30,6 +30,8 @@ public function boot()
         } elseif ($this->app instanceof LumenApplication) {
             $this->app->configure('tinker');
         }
+
+        $this->mergeConfigFrom($source, 'tinker');
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,8 @@ public function boot()`
`30`	`30`	`} elseif ($this->app instanceof LumenApplication) {`
`31`	`31`	`$this->app->configure('tinker');`
`32`	`32`	`}`
	`33`	`+`
	`34`	`+ $this->mergeConfigFrom($source, 'tinker');`
`33`	`35`	`}`
`34`	`36`
`35`	`37`	`/**`