fix service provider

Author: Joel Butcher

config/config.php

@@ -1,8 +1,9 @@
 <?php
 
 return [
-    'client_id' => env('FACEBOOK_APP_ID'),
-    'client_secret' => env('FACEBOOK_APP_SECRET'),
-    'enable_beta_mode' => env('FACEBOOK_ENABLE_BETA', false),
-    'default_graph_version' => env('FACEBOOK_GRAPH_VERSION', 'v10'),
+    'app_id' => env('FACEBOOK_APP_ID'),
+    'app_secret' => env('FACEBOOK_APP_SECRET'),
+    'redirect_uri' => env('FACEBOOK_REDIRECT_URI'),
+    'graph_version' => env('FACEBOOK_GRAPH_VERSION', 'v11.0'),
+    'beta_mode' => env('FACEBOOK_ENABLE_BETA', false),
 ];

src/FacebookServiceProvider.php

@@ -2,12 +2,13 @@
 
 namespace JoelButcher\Facebook;
 
-use Facebook\Facebook;
-use Facebook\HttpClients\FacebookGuzzleHttpClient;
-use Facebook\HttpClients\FacebookHttpClientInterface;
 use Facebook\PersistentData\PersistentDataInterface;
+use Facebook\Url\UrlDetectionHandler;
+use Facebook\Url\UrlDetectionInterface;
+use Http\Client\HttpClient;
 use Illuminate\Contracts\Foundation\Application;
 use Illuminate\Support\ServiceProvider;
+use JoelButcher\Facebook\Facades\Facebook as FacebookFacade;
 
 class FacebookServiceProvider extends ServiceProvider
 {
@@ -19,14 +20,14 @@ class FacebookServiceProvider extends ServiceProvider
     public function register(): void
     {
         $this->mergeConfig();
-        $this->registerDefaultPersistentDataHandler();
         $this->registerDefaultHttpClient();
+        $this->registerUrlDetectionHandler();
+        $this->registerDefaultPersistentDataHandler();
         $this->registerFacebook();
-        $this->registerFacebookWrapper();
 
-        // Register the Facebook Graph facade to allow method passthrough via __callStatic.
-        // E.g. \JoelButcher\Facebook\Facebook::getClient()
-        $this->app->singleton('facebook-graph', fn (Application $app) => $app[Facebook::class]);
+        $this->app->singleton('facebook-graph', function (Application $app) {
+            return $app[Facebook::class];
+        });
     }
 
     /**
@@ -70,23 +71,39 @@ protected function getConfigPath(): string
     }
 
     /**
-     * Register a default binding for the persistent data interface.
+     * Register a default binding for the Facebook HTTP client interface.
      *
      * @return void
      */
-    protected function registerDefaultPersistentDataHandler(): void
+    protected function registerDefaultHttpClient(): void
     {
-        $this->app->singleton(PersistentDataInterface::class, fn () => null);
+        $this->app->singleton(HttpClient::class, function () {
+            return null;
+        });
     }
 
     /**
-     * Register a default binding for the Facebook HTTP client interface.
+     * Register the default URL Protection handler for the Facebook SDK.
      *
      * @return void
      */
-    protected function registerDefaultHttpClient(): void
+    protected function registerUrlDetectionHandler(): void
     {
-        $this->app->singleton(FacebookHttpClientInterface::class, fn () => new FacebookGuzzleHttpClient);
+        $this->app->singleton(UrlDetectionInterface::class, function () {
+            return new UrlDetectionHandler;
+        });
+    }
+
+    /**
+     * Register a default binding for the persistent data interface.
+     *
+     * @return void
+     */
+    protected function registerDefaultPersistentDataHandler(): void
+    {
+        $this->app->singleton(PersistentDataInterface::class, function () {
+            return null;
+        });
     }
 
     /**
@@ -102,26 +119,15 @@ protected function registerFacebook(): void
         // a controller)
         $this->app->singleton(Facebook::class, function (Application $app) {
             return new Facebook([
-                'app_id' => $app['config']->get('facebook.client_id'),
-                'app_secret' => $app['config']->get('facebook.client_secret'),
-                'enable_beta_mode' => $app['config']->get('facebook.enable_beta_mode'),
-                'default_graph_version' => $app['config']->get('facebook.api_version'),
+                'app_id' => $app['config']->get('facebook.app_id'),
+                'app_secret' => $app['config']->get('facebook.app_secret'),
+                'redirect_uri' => $app['config']->get('facebook.redirect_uri'),
+                'default_graph_version' => $app['config']->get('facebook.graph_version'),
+                'enable_beta_mode' => $app['config']->get('facebook.beta_mode'),
                 'persistent_data_handler' => $app[PersistentDataInterface::class],
-                'http_client_handler' => $app[FacebookHttpClientInterface::class],
+                'http_client' => $app[HttpClient::class],
+                'url_detection_handler' => $app[UrlDetectionInterface::class],
             ]);
         });
     }
-
-    /**
-     * Register a binding for the Facebook Graph PHP SDK wrapper.
-     *
-     * @return void
-     */
-    protected function registerFacebookWrapper(): void
-    {
-        // Register the Facebook Graph manager as a wrapper for the Facebook SDK.
-        $this->app->singleton(Facebook:: class, function (Application $app) {
-            return new Facebook($app[Facebook::class]);
-        });
-    }
 }