Merge pull request #4 from gpassarelli/master

Update version of Intercom PHP Client #3

composer.json

@@ -8,8 +8,8 @@
     "email": "dciesielski87@gmail.com"
   }],
   "require": {
-    "php": ">=5.4.0",
-    "intercom/intercom-php": "1.5.0"
+    "php": ">= 5.6",
+    "intercom/intercom-php"       : "^3.0"
   },
   "autoload": {
     "psr-4": {

config/intercom.php

@@ -0,0 +1,6 @@
+<?php
+
+return [
+    'app_id' => env('INTERCOM_APP_ID'),
+    'api_key' => env('INTERCOM_APP_KEY'),
+];

src/Intercom.php → src/Facades/Intercom.php

@@ -1,6 +1,5 @@
 <?php
-
-namespace Darkin1\Intercom;
+namespace Darkin1\Intercom\Facades;
 
 use Illuminate\Support\Facades\Facade;
 

src/IntercomApi.php

@@ -1,8 +1,7 @@
 <?php
-
 namespace Darkin1\Intercom;
 
-use Intercom\IntercomBasicAuthClient;
+use Intercom\IntercomClient;
 
 /**
  * Class IntercomApi
@@ -18,7 +17,7 @@ class IntercomApi
     /**
      * @param $intercom
      */
-    public function __construct(IntercomBasicAuthClient $intercom)
+    public function __construct($intercom)
     {
         $this->intercom = $intercom;
     }
@@ -32,7 +31,7 @@ public function __construct(IntercomBasicAuthClient $intercom)
      */
     public function __call($method, array $args)
     {
-        return call_user_func_array([$this->intercom, $method], $args);
+        return $this->intercom->{$method};
     }
 
 }

src/IntercomServiceProvider.php

@@ -3,24 +3,58 @@
 
 use Illuminate\Support\ServiceProvider;
 use Illuminate\Support\Facades\Config;
-use Intercom\IntercomBasicAuthClient;
+use Intercom\IntercomClient;
+
 class IntercomServiceProvider extends ServiceProvider
 {
+    /**
+     * Indicates if loading of the provider is deferred.
+     *
+     * @var bool
+     */
+    protected $defer = true;
 
+    /**
+     * Bootstrap the application events.
+     *
+     * @return void
+     */
+    public function boot()
+    {
+        // Allow users to publish config to override the defaults.
+        $this->publishes([
+            __DIR__.'/../config/intercom.php' => config_path('intercom.php'),
+        ], 'darkin1/intercom');
+    }
     /**
      * Register the service provider.
      *
      * @return void
      */
     public function register()
     {
-        $this->app->bind('intercom', function () {
-            $intercom = IntercomBasicAuthClient::factory([
-                'app_id' => Config::get('intercom.app_id'),
-                'api_key' => Config::get('intercom.api_key'),
-            ]);
+        // Use the provided config as default.
+        $this->mergeConfigFrom(
+            __DIR__.'/../config/intercom.php', 'intercom'
+        );
+
+        $this->app->singleton('intercom', function ($app) {
+            $appID  = $app['config']->get('intercom.app_id');
+            $apiKey = $app['config']->get('intercom.api_key');
+
+            $intercom = new IntercomClient($appID, $apiKey);
 
             return new IntercomApi($intercom);
         });
     }
+
+    /**
+     * Get the services provided by the provider.
+     *
+     * @return array
+     */
+    public function provides()
+    {
+        return array('intercom');
+    }
 }