Fix tests and build (#41)

* Update to latest phpunit and mockery

* Fix test expectations

* Linting

* Test with PHP 7.4

* Remove unnecessary test tear down

Author: jessarcher

.gitignore

@@ -2,3 +2,4 @@
 build
 composer.phar
 composer.lock
+.phpunit.result.cache

.travis.yml

@@ -3,6 +3,7 @@ language: php
 php:
   - 7.2
   - 7.3
+  - 7.4
 
 env:
   matrix:

composer.json

@@ -40,8 +40,8 @@
         "pusher/pusher-php-server": "~3.0 || ~4.0"
     },
     "require-dev": {
-        "mockery/mockery": "^0.9.5",
-        "phpunit/phpunit": "5.*"
+        "mockery/mockery": "^1.3",
+        "phpunit/phpunit": "^8.5"
     },
     "autoload": {
         "psr-4": {

phpunit.xml.dist

@@ -22,7 +22,7 @@
     <logging>
         <log type="tap" target="build/report.tap"/>
         <log type="junit" target="build/report.junit.xml"/>
-        <log type="coverage-html" target="build/coverage" charset="UTF-8" yui="true" highlight="true"/>
+        <log type="coverage-html" target="build/coverage"/>
         <log type="coverage-text" target="build/coverage.txt"/>
         <log type="coverage-clover" target="build/logs/clover.xml"/>
     </logging>

tests/ChannelTest.php

@@ -2,19 +2,19 @@
 
 namespace NotificationChannels\PusherPushNotifications\Test;
 
-use Mockery;
-use Pusher\Pusher;
-use PHPUnit_Framework_TestCase;
 use Illuminate\Events\Dispatcher;
+use Illuminate\Notifications\Events\NotificationFailed;
 use Illuminate\Notifications\Notifiable;
 use Illuminate\Notifications\Notification;
-use Illuminate\Notifications\Events\NotificationFailed;
+use Mockery;
+use Mockery\Adapter\Phpunit\MockeryTestCase;
 use NotificationChannels\PusherPushNotifications\PusherChannel;
 use NotificationChannels\PusherPushNotifications\PusherMessage;
+use Pusher\Pusher;
 
-class ChannelTest extends PHPUnit_Framework_TestCase
+class ChannelTest extends MockeryTestCase
 {
-    public function setUp()
+    public function setUp(): void
     {
         $this->pusher = Mockery::mock(Pusher::class);
 
@@ -27,21 +27,14 @@ public function setUp()
         $this->notifiable = new TestNotifiable;
     }
 
-    public function tearDown()
-    {
-        Mockery::close();
-
-        parent::tearDown();
-    }
-
     /** @test */
     public function it_can_send_a_notification()
     {
         $message = $this->notification->toPushNotification($this->notifiable);
 
         $data = $message->toArray();
 
-        $this->pusher->shouldReceive('notify')->with('interest_name', $data, true)->andReturn(['status' => 202]);
+        $this->pusher->shouldReceive('notify')->with(['interest_name'], $data, true)->andReturn(['status' => 202]);
 
         $this->channel->send($this->notifiable, $this->notification);
     }
@@ -53,7 +46,7 @@ public function it_fires_failure_event_on_failure()
 
         $data = $message->toArray();
 
-        $this->pusher->shouldReceive('notify')->with('interest_name', $data, true)->andReturn(['status' => 500]);
+        $this->pusher->shouldReceive('notify')->with(['interest_name'], $data, true)->andReturn(['status' => 500]);
 
         $this->events->shouldReceive('fire')->with(Mockery::type(NotificationFailed::class));
 

tests/MessageTest.php

@@ -3,16 +3,16 @@
 namespace NotificationChannels\PusherPushNotifications\Test;
 
 use Illuminate\Support\Arr;
-use PHPUnit_Framework_TestCase;
-use NotificationChannels\PusherPushNotifications\PusherMessage;
+use Mockery\Adapter\Phpunit\MockeryTestCase;
 use NotificationChannels\PusherPushNotifications\Exceptions\CouldNotCreateMessage;
+use NotificationChannels\PusherPushNotifications\PusherMessage;
 
-class MessageTest extends PHPUnit_Framework_TestCase
+class MessageTest extends MockeryTestCase
 {
     /** @var \NotificationChannels\PusherPushNotifications\PusherMessage */
     protected $message;
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 
@@ -111,7 +111,7 @@ public function it_can_set_the_icon()
     /** @test */
     public function it_will_throw_an_exception_when_an_unsupported_platform_is_used()
     {
-        $this->setExpectedException(CouldNotCreateMessage::class);
+        $this->expectException(CouldNotCreateMessage::class);
 
         $this->message->platform('bla bla');
     }