Merge pull request #19 from Treggats/phpunit-fixes

getting tests ready for newer php versions

Author: petericebear

.travis.yml

@@ -1,8 +1,6 @@
 language: php
 
 php:
-  - 7.0
-  - 7.1
   - 7.2
   - 7.3
 

composer.json

@@ -35,7 +35,10 @@
         "test": "vendor/bin/phpunit"
     },
     "config": {
-        "sort-packages": true
+        "sort-packages": true,
+        "platform": {
+            "php": "7.2.0"
+        }
     },
     "minimum-stability": "dev",
     "extra": {

tests/MessagebirdChannelTest.php

@@ -4,16 +4,16 @@
 
 use Mockery;
 use GuzzleHttp\Client;
+use PHPUnit\Framework\TestCase;
 use Illuminate\Notifications\Notifiable;
 use Illuminate\Notifications\Notification;
 use NotificationChannels\Messagebird\MessagebirdClient;
 use NotificationChannels\Messagebird\MessagebirdChannel;
 use NotificationChannels\Messagebird\MessagebirdMessage;
-use PHPUnit\Framework\TestCase;
 
 class MessagebirdChannelTest extends TestCase
 {
-    public function setUp()
+    public function setUp(): void
     {
         $this->notification = new TestNotification;
         $this->string_notification = new TestStringNotification;
@@ -23,7 +23,7 @@ public function setUp()
         $this->channel = new MessagebirdChannel($this->client);
     }
 
-    public function tearDown()
+    public function tearDown(): void
     {
         Mockery::close();
         parent::tearDown();
@@ -40,14 +40,14 @@ public function it_can_be_instantiated()
     public function test_it_shares_message()
     {
         $this->client->shouldReceive('send')->once();
-        $this->channel->send($this->notifiable, $this->notification);
+        $this->assertNull($this->channel->send($this->notifiable, $this->notification));
     }
 
     /** @test */
     public function if_string_message_can_be_send()
     {
         $this->client->shouldReceive('send')->once();
-        $this->channel->send($this->notifiable, $this->string_notification);
+        $this->assertNull($this->channel->send($this->notifiable, $this->string_notification));
     }
 }
 

tests/MessagebirdClientTest.php

@@ -4,20 +4,20 @@
 
 use Mockery;
 use GuzzleHttp\Client;
+use PHPUnit\Framework\TestCase;
 use NotificationChannels\Messagebird\MessagebirdClient;
 use NotificationChannels\Messagebird\MessagebirdMessage;
-use PHPUnit\Framework\TestCase;
 
 class MessagebirdClientTest extends TestCase
 {
-    public function setUp()
+    public function setUp(): void
     {
         $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')->setReference('000123');
     }
 
-    public function tearDown()
+    public function tearDown(): void
     {
         Mockery::close();
         parent::tearDown();
@@ -33,6 +33,7 @@ public function it_can_be_instantiated()
     /** @test */
     public function it_can_send_message()
     {
-        $this->client->send($this->message);
+        $this->client->shouldReceive('send')->with($this->message)->once();
+        $this->assertNull($this->client->send($this->message));
     }
 }