Merge pull request #11 from kylestev/feature/add-laravel-5.5-support

Add support for Laravel 5.5

Author: mpociot

composer.json

@@ -13,14 +13,14 @@
     "require": {
         "php": ">=5.6.4",
         "guzzlehttp/guzzle": "~6.0",
-        "illuminate/notifications": "5.3.*|5.4.*",
-        "illuminate/support": "5.1.*|5.2.*|5.3.*|5.4.*"
+        "illuminate/notifications": "5.3.*|5.4.*|5.5.*",
+        "illuminate/support": "5.1.*|5.2.*|5.3.*|5.4.*|5.5.*"
     },
     "require-dev": {
         "mockery/mockery": "^0.9.5",
-        "phpunit/phpunit": "4.*",
-        "orchestra/testbench": "3.3.x-dev",
-        "orchestra/database": "3.3.x-dev"
+        "phpunit/phpunit": "4.*|~6.0",
+        "orchestra/testbench": "3.3.x-dev|^3.5.0",
+        "orchestra/database": "3.3.x-dev|^3.5.0"
     },
     "autoload": {
         "psr-4": {

tests/ChannelTest.php

@@ -2,14 +2,13 @@
 
 namespace NotificationChannels\Webhook\Test;
 
+use Mockery;
 use GuzzleHttp\Client;
 use GuzzleHttp\Psr7\Response;
+use Orchestra\Testbench\TestCase;
 use Illuminate\Notifications\Notification;
-use Mockery;
-use NotificationChannels\Webhook\Exceptions\CouldNotSendNotification;
 use NotificationChannels\Webhook\WebhookChannel;
 use NotificationChannels\Webhook\WebhookMessage;
-use Orchestra\Testbench\TestCase;
 
 class ChannelTest extends TestCase
 {
@@ -33,6 +32,7 @@ public function it_can_send_a_notification()
         $channel = new WebhookChannel($client);
         $channel->send(new TestNotifiable(), new TestNotification());
     }
+
     /** @test */
     public function it_can_send_a_notification_with_2xx_status()
     {
@@ -54,11 +54,12 @@ public function it_can_send_a_notification_with_2xx_status()
         $channel->send(new TestNotifiable(), new TestNotification());
     }
 
-    /** @test */
+    /**
+     * @expectedException NotificationChannels\Webhook\Exceptions\CouldNotSendNotification
+     * @test
+     */
     public function it_throws_an_exception_when_it_could_not_send_the_notification()
     {
-        $this->setExpectedException(CouldNotSendNotification::class);
-
         $response = new Response(500);
         $client = Mockery::mock(Client::class);
         $client->shouldReceive('post')
@@ -82,7 +83,6 @@ public function routeNotificationForWebhook()
     }
 }
 
-
 class TestNotification extends Notification
 {
     public function toWebhook($notifiable)

tests/MessageTest.php

@@ -3,9 +3,10 @@
 namespace NotificationChannels\Webhook\Test;
 
 use Illuminate\Support\Arr;
+use Orchestra\Testbench\TestCase;
 use NotificationChannels\Webhook\WebhookMessage;
 
-class MessageTest extends \PHPUnit_Framework_TestCase
+class MessageTest extends TestCase
 {
     /** @var \NotificationChannels\Webhook\WebhookMessage */
     protected $message;