Update using Guzzle instead of massive Lib

Author: petericebear

.gitignore

@@ -2,3 +2,4 @@
 build
 composer.phar
 composer.lock
+/.idea

composer.json

@@ -15,8 +15,8 @@
         "php": ">=5.6.4",
         "illuminate/notifications": "^5.3",
         "illuminate/support": "^5.1|^5.2|^5.3",
-        "illuminate/queue": "^5.3@dev",
-        "messagebird/php-rest-api": "^1.4"
+        "illuminate/queue": "^5.3",
+        "guzzlehttp/guzzle": "^6.2"
     },
     "require-dev": {
         "mockery/mockery": "^0.9.5",

src/Exceptions/CouldNotSendNotification.php

@@ -14,20 +14,4 @@ public static function serviceRespondedWithAnError(Exception $exception)
     {
         return new static("MessageBird service responded with an error '{$exception->getCode()}: {$exception->getMessage()}'");
     }
-
-    /**
-     * @return static
-     */
-    public static function couldNotAuthenticate()
-    {
-        return new static('You have entered the wrong credentials.');
-    }
-
-    /**
-     * @return static
-     */
-    public static function notEnoughCredits()
-    {
-        return new static('Not enough credits.');
-    }
 }

src/MessagebirdClient.php

@@ -3,22 +3,27 @@
 namespace NotificationChannels\Messagebird;
 
 use Exception;
-use MessageBird\Exceptions\AuthenticateException;
-use MessageBird\Exceptions\BalanceException;
+use GuzzleHttp\Client;
 use NotificationChannels\Messagebird\Exceptions\CouldNotSendNotification;
-use MessageBird\Client;
 
 class MessagebirdClient
 {
     protected $client;
+    protected $access_key;
 
-    public function __construct(Client $client)
+    /**
+     * MessagebirdClient constructor.
+     * @param Client $client
+     * @param $access_key string API Key from Messagebird API
+     */
+    public function __construct(Client $client, $access_key)
     {
         $this->client = $client;
+        $this->access_key = $access_key;
     }
 
     /**
-     * Send the Message through MessageBird Client.
+     * Send the Message
      * @param MessagebirdMessage $message
      * @throws CouldNotSendNotification
      */
@@ -32,11 +37,12 @@ public function send(MessagebirdMessage $message)
         }
 
         try {
-            $this->client->messages->create($message);
-        } catch (AuthenticateException $exception) {
-            throw CouldNotSendNotification::couldNotAuthenticate();
-        } catch (BalanceException $exception) {
-            throw CouldNotSendNotification::notEnoughCredits();
+            $this->client->request('POST', 'https://rest.messagebird.com/messages', [
+                'body' => $message->toJson(),
+                'headers' => [
+                    'Authorization' => 'AccessKey ' . $this->access_key
+                ],
+            ]);
         } catch (Exception $exception) {
             throw CouldNotSendNotification::serviceRespondedWithAnError($exception);
         }

src/MessagebirdMessage.php

@@ -2,10 +2,12 @@
 
 namespace NotificationChannels\Messagebird;
 
-use MessageBird\Objects\Message;
-
-class MessagebirdMessage extends Message
+class MessagebirdMessage
 {
+    public $body;
+    public $originator;
+    public $recipients;
+
     public static function create($body = '')
     {
         return new static($body);
@@ -34,12 +36,17 @@ public function setOriginator($originator)
 
     public function setRecipients($recipients)
     {
-        if (is_string($recipients)) {
-            $recipients = [$recipients];
+        if (is_array($recipients)) {
+            $recipients = implode(',', $recipients);
         }
 
         $this->recipients = $recipients;
 
         return $this;
     }
+
+    public function toJson()
+    {
+        return json_encode($this);
+    }
 }

src/MessagebirdServiceProvider.php

@@ -3,7 +3,7 @@
 namespace NotificationChannels\Messagebird;
 
 use Illuminate\Support\ServiceProvider;
-use MessageBird\Client;
+use GuzzleHttp\Client;
 use NotificationChannels\Messagebird\Exceptions\InvalidConfiguration;
 
 class MessagebirdServiceProvider extends ServiceProvider
@@ -22,9 +22,7 @@ public function boot()
                     throw InvalidConfiguration::configurationNotSet();
                 }
 
-                return new MessagebirdClient(new Client(
-                    $config['access_key']
-                ));
+                return new MessagebirdClient(new Client(), $config['access_key']);
             });
     }
 }

tests/MessagebirdChannelTest.php

@@ -2,9 +2,9 @@
 
 namespace NotificationChannels\Messagebird\Test;
 
+use GuzzleHttp\Client;
 use Illuminate\Notifications\Notifiable;
 use Illuminate\Notifications\Notification;
-use MessageBird\Client;
 use Mockery;
 use NotificationChannels\Messagebird\MessagebirdChannel;
 use NotificationChannels\Messagebird\MessagebirdClient;
@@ -17,8 +17,8 @@ public function setUp()
     {
         $this->notification = new TestNotification;
         $this->notifiable = new TestNotifiable;
-        $this->messagebirdClient = Mockery::mock(new Client('test_1234567890'));
-        $this->client = Mockery::mock(new MessagebirdClient($this->messagebirdClient));
+        $this->guzzle = Mockery::mock(new Client());
+        $this->client = Mockery::mock(new MessagebirdClient($this->guzzle, 'test_ek1qBbKbHoA20gZHM40RBjxzX'));
         $this->channel = new MessagebirdChannel($this->client);
     }
 
@@ -34,6 +34,13 @@ public function it_can_be_instantiated()
         $this->assertInstanceOf(MessagebirdClient::class, $this->client);
         $this->assertInstanceOf(MessagebirdChannel::class, $this->channel);
     }
+
+    /** @test */
+    public function test_it_shares_message()
+    {
+        $this->client->shouldReceive('send')->once();
+        $this->channel->send($this->notifiable, $this->notification);
+    }
 }
 
 class TestNotifiable
@@ -42,14 +49,14 @@ class TestNotifiable
 
     public function routeNotificationForMessagebird()
     {
-        return '0031650520659';
+        return '31650520659';
     }
 }
 
 class TestNotification extends Notification
 {
     public function toMessagebird($notifiable)
     {
-        return (new MessagebirdMessage('Message content'))->setOriginator('APPNAME')->setRecipients('0031650520659');
+        return (new MessagebirdMessage('Message content'))->setOriginator('APPNAME')->setRecipients('31650520659');
     }
 }

tests/MessagebirdClientTest.php

@@ -2,17 +2,19 @@
 
 namespace NotificationChannels\Messagebird\Test;
 
-use MessageBird\Client;
+use GuzzleHttp\Client;
 use Mockery;
 use NotificationChannels\Messagebird\MessagebirdClient;
+use NotificationChannels\Messagebird\MessagebirdMessage;
 use PHPUnit_Framework_TestCase;
 
 class MessagebirdClientTest extends PHPUnit_Framework_TestCase
 {
     public function setUp()
     {
-        $this->messagebirdClient = Mockery::mock(new Client('test_1234567890'));
-        $this->client = Mockery::mock(new MessagebirdClient($this->messagebirdClient));
+        $this->guzzle = Mockery::mock(new Client());
+        $this->client = Mockery::mock(new MessagebirdClient($this->guzzle, 'test_ek1qBbKbHoA20gZHM40RBjxzX'));
+        $this->message = (new MessagebirdMessage('Message content'))->setOriginator('APPNAME')->setRecipients('31650520659');
     }
 
     public function tearDown()
@@ -25,5 +27,12 @@ public function tearDown()
     public function it_can_be_instantiated()
     {
         $this->assertInstanceOf(MessagebirdClient::class, $this->client);
+        $this->assertInstanceOf(MessagebirdMessage::class, $this->message);
+    }
+
+    /** @test */
+    public function it_can_send_message()
+    {
+        $this->client->send($this->message);
     }
 }

tests/MessagebirdMessageTest.php

@@ -50,16 +50,24 @@ public function it_can_set_originator()
     /** @test */
     public function it_can_set_recipients_from_array()
     {
-        $message = (new MessagebirdMessage)->setRecipients([31650520659]);
+        $message = (new MessagebirdMessage)->setRecipients([31650520659, 31599858770]);
 
-        $this->assertEquals([31650520659], $message->recipients);
+        $this->assertEquals('31650520659,31599858770', $message->recipients);
+    }
+
+    /** @test */
+    public function it_can_set_recipients_from_integer()
+    {
+        $message = (new MessagebirdMessage)->setRecipients(31650520659);
+
+        $this->assertEquals(31650520659, $message->recipients);
     }
 
     /** @test */
     public function it_can_set_recipients_from_string()
     {
         $message = (new MessagebirdMessage)->setRecipients('31650520659');
 
-        $this->assertEquals([31650520659], $message->recipients);
+        $this->assertEquals('31650520659', $message->recipients);
     }
 }