From 35f2515833726d4689f3aff7229fffeaa06239fd Mon Sep 17 00:00:00 2001 From: KwanUng-Park Date: Wed, 6 Sep 2017 17:20:30 +0900 Subject: [PATCH 1/2] Fix: Solved mergiConfig error --- .../LaravelFacebookSdkServiceProvider.php | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/src/LaravelFacebookSdk/LaravelFacebookSdkServiceProvider.php b/src/LaravelFacebookSdk/LaravelFacebookSdkServiceProvider.php index 55f7f10..7dfe127 100644 --- a/src/LaravelFacebookSdk/LaravelFacebookSdkServiceProvider.php +++ b/src/LaravelFacebookSdk/LaravelFacebookSdkServiceProvider.php @@ -26,9 +26,15 @@ public function boot() return; } - $this->publishes([ - __DIR__.'/../config/laravel-facebook-sdk.php' => \config_path('laravel-facebook-sdk.php'), - ], 'config'); + $configPath = realpath(__DIR__ . '/../config/laravel-facebook-sdk.php'); + + if ($this->isLumen()) { + $this->app->configure('laravel-facebook-sdk'); + }else{ + $this->publishes([$configPath => config_path('laravel-facebook-sdk.php')]); + } + + $this->mergeConfigFrom($configPath, 'laravel-facebook-sdk'); } /** @@ -38,11 +44,6 @@ public function boot() */ public function register() { - if ($this->isLumen()) { - $this->app->configure('laravel-facebook-sdk'); - } - $this->mergeConfigFrom(__DIR__.'/../config/laravel-facebook-sdk.php', 'laravel-facebook-sdk'); - // Main Service $this->app->bind('SammyK\LaravelFacebookSdk\LaravelFacebookSdk', function ($app) { $config = $app['config']->get('laravel-facebook-sdk.facebook_config'); From 325ab66a25d1515793c1875c9dfd28e45cf9e709 Mon Sep 17 00:00:00 2001 From: KwanUng-Park Date: Mon, 11 Sep 2017 10:03:14 +0900 Subject: [PATCH 2/2] fix: lint fix --- src/LaravelFacebookSdk/LaravelFacebookSdkServiceProvider.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/LaravelFacebookSdk/LaravelFacebookSdkServiceProvider.php b/src/LaravelFacebookSdk/LaravelFacebookSdkServiceProvider.php index 7dfe127..7573a56 100644 --- a/src/LaravelFacebookSdk/LaravelFacebookSdkServiceProvider.php +++ b/src/LaravelFacebookSdk/LaravelFacebookSdkServiceProvider.php @@ -30,7 +30,7 @@ public function boot() if ($this->isLumen()) { $this->app->configure('laravel-facebook-sdk'); - }else{ + } else { $this->publishes([$configPath => config_path('laravel-facebook-sdk.php')]); }