Merge branch 'master' of github.com:brozot/Laravel-FCM

arubacao · arubacao · commit d64aa52ebb4d · 2017-05-25T11:44:21.000+02:00
diff --git a/src/FCMServiceProvider.php b/src/FCMServiceProvider.php
@@ -23,7 +23,9 @@ public function boot()
 
     public function register()
     {
-        $this->mergeConfigFrom(__DIR__.'/../config/fcm.php', 'fcm');
+		if (!str_contains($this->app->version(), 'Lumen')) {
+            $this->mergeConfigFrom(__DIR__.'/../config/fcm.php', 'fcm');
+        }
 
         $this->app->singleton('fcm.client', function ($app) {
             return (new FCMManager($app))->driver();

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,9 @@ public function boot()`
`23`	`23`
`24`	`24`	`public function register()`
`25`	`25`	`{`
`26`		`- $this->mergeConfigFrom(__DIR__.'/../config/fcm.php', 'fcm');`
	`26`	`+ if (!str_contains($this->app->version(), 'Lumen')) {`
	`27`	`+ $this->mergeConfigFrom(__DIR__.'/../config/fcm.php', 'fcm');`
	`28`	`+ }`
`27`	`29`
`28`	`30`	`$this->app->singleton('fcm.client', function ($app) {`
`29`	`31`	`return (new FCMManager($app))->driver();`