Laravel 5.6 only

In a hurry, no time to mess with version constraints

Author: codyphobe

README.md

@@ -1,4 +1,4 @@
-# Discord notification channel for Laravel 5.1 to 5.6
+# Discord notification channel for Laravel 5.6
 
 [![Latest Version on Packagist](https://img.shields.io/packagist/v/laravel-notification-channels/discord.svg?style=flat-square)](https://packagist.org/packages/laravel-notification-channels/discord)
 [![Software License](https://img.shields.io/badge/license-MIT-brightgreen.svg?style=flat-square)](LICENSE.md)

composer.json

@@ -18,19 +18,19 @@
         }
     ],
     "require": {
-        "php": ">=5.6.4",
+        "php": ">=7.1.2",
         "guzzlehttp/guzzle": "~6.0",
-        "illuminate/notifications": "5.3.*|5.4.*|5.5.*|5.6.*",
-        "illuminate/support": "5.1.*|5.2.*|5.3.*|5.4.*|5.5.*|5.6.*",
-        "illuminate/queue": "5.1.*|5.2.*|5.3.*|5.4.*|5.5.*|5.6.*",
-        "illuminate/console": "5.1.*|5.2.*|5.3.*|5.4.*|5.5.*|5.6.*",
+        "illuminate/notifications": "5.6.*",
+        "illuminate/support": "5.6.*",
+        "illuminate/queue": "5.6.*",
+        "illuminate/console": "5.6.*",
         "textalk/websocket": "1.0.*"
     },
     "require-dev": {
-        "mockery/mockery": "^0.9.5",
-        "orchestra/testbench": "3.1.*|3.2.*|3.3.*|3.4.*|3.5.*|3.6.*|3.6.x-dev",
-        "laravel/framework": "5.1.*|5.2.*|5.3.*|5.4.*|5.5.*|5.6.*",
-        "phpunit/phpunit": "4.*|6.*|7.*",
+        "mockery/mockery": "^1.0",
+        "orchestra/testbench": "3.6.*|3.6.x-dev",
+        "laravel/framework": "5.6.*",
+        "phpunit/phpunit": "7.*",
         "orchestra/database": "3.6.x-dev"
     },
     "autoload": {

tests/BaseTest.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace NotificationChannels\Discord\Tests;
+
+use Mockery;
+
+abstract class BaseTest extends \PHPUnit\Framework\TestCase
+{
+    public function tearDown()
+    {
+        parent::tearDown();
+
+        if ($container = Mockery::getContainer()) {
+            $this->addToAssertionCount($container->mockery_getExpectationCount());
+        }
+
+        Mockery::close();
+    }
+}

tests/DiscordChannelTest.php

@@ -9,7 +9,7 @@
 use NotificationChannels\Discord\DiscordChannel;
 use NotificationChannels\Discord\DiscordMessage;
 
-class DiscordChannelTest extends \PHPUnit_Framework_TestCase
+class DiscordChannelTest extends BaseTest
 {
     /** @test */
     public function it_can_send_a_notification()

tests/DiscordMessageTest.php

@@ -4,7 +4,7 @@
 
 use NotificationChannels\Discord\DiscordMessage;
 
-class DiscordMessageTest extends \PHPUnit_Framework_TestCase
+class DiscordMessageTest extends BaseTest
 {
     /** @test */
     public function it_accepts_the_message_body_during_initialization()

tests/DiscordServiceProviderTest.php

@@ -9,7 +9,7 @@
 use NotificationChannels\Discord\Commands\SetupCommand;
 use NotificationChannels\Discord\DiscordServiceProvider;
 
-class DiscordServiceProviderTest extends \PHPUnit_Framework_TestCase
+class DiscordServiceProviderTest extends BaseTest
 {
     /** @test */
     public function it_loads_the_setup_command_and_provides_the_discord_token()

tests/DiscordTest.php

@@ -11,7 +11,7 @@
 use GuzzleHttp\Exception\RequestException;
 use NotificationChannels\Discord\Exceptions\CouldNotSendNotification;
 
-class DiscordTest extends \PHPUnit_Framework_TestCase
+class DiscordTest extends BaseTest
 {
     /** @test */
     public function it_can_get_a_private_channel_for_a_user()
@@ -35,7 +35,8 @@ public function it_can_get_a_private_channel_for_a_user()
     /** @test */
     public function it_throws_an_exception_when_it_receives_an_http_error()
     {
-        $this->setExpectedException(CouldNotSendNotification::class, 'Discord responded with an HTTP error: 404: Not found');
+        $this->expectException(CouldNotSendNotification::class);
+        $this->expectExceptionMessage('Discord responded with an HTTP error: 404: Not found');
 
         $http = Mockery::mock(HttpClient::class);
         $http->shouldReceive('request')
@@ -56,7 +57,8 @@ public function it_throws_an_exception_when_it_receives_an_http_error()
     /** @test */
     public function it_throws_an_exception_when_it_could_not_talk_to_discord()
     {
-        $this->setExpectedException(CouldNotSendNotification::class, 'Communication with Discord failed');
+        $this->expectException(CouldNotSendNotification::class);
+        $this->expectExceptionMessage('Communication with Discord failed');
 
         $http = Mockery::mock(HttpClient::class);
         $http->shouldReceive('request')
@@ -77,7 +79,8 @@ public function it_throws_an_exception_when_it_could_not_talk_to_discord()
     /** @test */
     public function it_wraps_and_rethrows_a_caught_exception()
     {
-        $this->setExpectedException(CouldNotSendNotification::class, 'Communication with Discord failed');
+        $this->expectException(CouldNotSendNotification::class);
+        $this->expectExceptionMessage('Communication with Discord failed');
 
         $http = Mockery::mock(HttpClient::class);
         $http->shouldReceive('request')
@@ -98,7 +101,8 @@ public function it_wraps_and_rethrows_a_caught_exception()
     /** @test */
     public function it_throws_an_exception_if_the_api_responds_with_an_error()
     {
-        $this->setExpectedException(CouldNotSendNotification::class, 'Discord responded with an API error: 10003: Unknown channel');
+        $this->expectException(CouldNotSendNotification::class);
+        $this->expectExceptionMessage('Discord responded with an API error: 10003: Unknown channel');
 
         $http = Mockery::mock(HttpClient::class);
         $http->shouldReceive('request')