Merge pull request #182 from arubacao/master

Improve ServiceProvider
SammyK · Jul 22, 2017 · 1ab1c80 · 1ab1c80
2 parents 893b323 + 4373ba5
commit 1ab1c80
Showing 1 changed file with 22 additions and 4 deletions.
diff --git a/src/LaravelFacebookSdk/LaravelFacebookSdkServiceProvider.php b/src/LaravelFacebookSdk/LaravelFacebookSdkServiceProvider.php
@@ -9,7 +9,7 @@ class LaravelFacebookSdkServiceProvider extends ServiceProvider
      *
      * @var bool
      */
-    protected $defer = false;
+    protected $defer = true;
 
     /**
      * Bootstrap the application events.
@@ -18,6 +18,10 @@ class LaravelFacebookSdkServiceProvider extends ServiceProvider
      */
     public function boot()
     {
+        if (! $this->app->runningInConsole()) {
+            return;
+        }
+
         if ($this->isLumen()) {
             return;
         }
@@ -34,11 +38,13 @@ 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) {
-            if ($this->isLumen()) {
-                $app->configure('laravel-facebook-sdk');
-            }
             $config = $app['config']->get('laravel-facebook-sdk.facebook_config');
 
             if (! isset($config['persistent_data_handler']) && isset($app['session.store'])) {
@@ -57,6 +63,18 @@ public function register()
         });
     }
 
+    /**
+     * Get the services provided by the provider.
+     *
+     * @return array
+     */
+    public function provides()
+    {
+        return [
+            'SammyK\LaravelFacebookSdk\LaravelFacebookSdk',
+        ];
+    }
+
     private function isLumen()
     {
         return is_a(\app(), 'Laravel\Lumen\Application');