feat: support laravel 6 (#3)

feat: support laravel 6

Author: atymic

.gitignore

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

.styleci.yml

@@ -1,3 +1 @@
 preset: laravel
-
-linting: true

.travis.yml

@@ -1,9 +1,8 @@
 language: php
 
 php:
-  - 5.6
-  - 7.0
-  - 7.1
+  - 7.2
+  - 7.3
 
 env:
   matrix:

README.md

@@ -1,4 +1,4 @@
-# PagerDuty Event notifications channel for Laravel 5.3
+# PagerDuty Event notifications channel for Laravel
 
 [![Latest Version on Packagist](https://img.shields.io/packagist/v/laravel-notification-channels/pagerduty.svg?style=flat-square)](https://packagist.org/packages/laravel-notification-channels/pagerduty)
 [![Software License](https://img.shields.io/badge/license-MIT-brightgreen.svg?style=flat-square)](LICENSE.md)
@@ -9,7 +9,7 @@
 [![Code Coverage](https://img.shields.io/scrutinizer/coverage/g/laravel-notification-channels/pagerduty/master.svg?style=flat-square)](https://scrutinizer-ci.com/g/laravel-notification-channels/pagerduty/?branch=master)
 [![Total Downloads](https://img.shields.io/packagist/dt/laravel-notification-channels/pagerduty.svg?style=flat-square)](https://packagist.org/packages/laravel-notification-channels/pagerduty)
 
-This package makes it easy to send notification events to [PagerDuty](https://www.pagerduty.com) with Laravel 5.3.
+This package makes it easy to send notification events to [PagerDuty](https://www.pagerduty.com) with Laravel 5.5+ & 6.x.
 
 ## Contents
 

composer.json

@@ -13,15 +13,15 @@
         }
     ],
     "require": {
-        "php": ">=5.6.4",
+        "php": ">=7.1",
         "guzzlehttp/guzzle": "~6.0",
-        "illuminate/notifications": "^5.3",
-        "illuminate/support": "^5.1|^5.2|^5.3"
+        "illuminate/notifications": "~5.5 || ~6.0",
+        "illuminate/support": "~5.5 || ~6.0"
     },
     "require-dev": {
-        "illuminate/queue": "^5.1|^5.2|^5.3",
-        "mockery/mockery": "^0.9.9",
-        "phpunit/phpunit": "^5.7"
+        "illuminate/queue": "~5.5 || ~6.0",
+        "mockery/mockery": "^1.2",
+        "phpunit/phpunit": "^8.0"
     },
     "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/PagerDutyChannelTest.php

@@ -2,18 +2,21 @@
 
 namespace NotificationChannels\PagerDuty\Test;
 
-use Mockery;
 use GuzzleHttp\Client;
 use GuzzleHttp\Psr7\Response;
-use PHPUnit\Framework\TestCase;
 use Illuminate\Notifications\Notification;
+use Mockery;
 use NotificationChannels\PagerDuty\PagerDutyChannel;
 use NotificationChannels\PagerDuty\PagerDutyMessage;
+use PHPUnit\Framework\TestCase;
 
 class ChannelTest extends TestCase
 {
-    public function tearDown()
+    public function tearDown(): void
     {
+        $this->addToAssertionCount(
+            \Mockery::getContainer()->mockery_getExpectationCount()
+        );
         Mockery::close();
     }
 
@@ -44,11 +47,12 @@ public function it_skips_when_not_routable()
 
     /**
      * @test
-     * @expectedException \NotificationChannels\PagerDuty\Exceptions\ApiError
-     * @expectedExceptionMessage PagerDuty returned 400 Bad Request: Event object is invalid - Length of 'routing_key' is incorrect (should be 32 characters)
      */
     public function it_throws_an_exception_when_400_bad_request()
     {
+        $this->expectException('\NotificationChannels\PagerDuty\Exceptions\ApiError');
+        $this->expectExceptionMessage('PagerDuty returned 400 Bad Request: Event object is invalid - Length of \'routing_key\' is incorrect (should be 32 characters)');
+
         $responseBody = '{
   "status": "invalid event",
   "message": "Event object is invalid",
@@ -68,11 +72,12 @@ public function it_throws_an_exception_when_400_bad_request()
 
     /**
      * @test
-     * @expectedException \NotificationChannels\PagerDuty\Exceptions\ApiError
-     * @expectedExceptionMessage PagerDuty returned 400 Bad Request:  -
      */
     public function it_throws_the_expected_exception_if_error_response_doesnt_contain_expected_body_on_error()
     {
+        $this->expectException('\NotificationChannels\PagerDuty\Exceptions\ApiError');
+        $this->expectExceptionMessage('PagerDuty returned 400 Bad Request:  -');
+
         $response = new Response(400, [], '', '1.1', 'Bad Request');
         $client = Mockery::mock(Client::class);
         $client->shouldReceive('post')
@@ -84,11 +89,12 @@ public function it_throws_the_expected_exception_if_error_response_doesnt_contai
 
     /**
      * @test
-     * @expectedException \NotificationChannels\PagerDuty\Exceptions\ApiError
-     * @expectedExceptionMessage PagerDuty returned 429 Too Many Requests
      */
     public function it_throws_exception_on_rate_limit()
     {
+        $this->expectException('\NotificationChannels\PagerDuty\Exceptions\ApiError');
+        $this->expectExceptionMessage('PagerDuty returned 429 Too Many Requests');
+
         $response = new Response(429, [], '', '1.1', 'Too Many Requests');
         $client = Mockery::mock(Client::class);
         $client->shouldReceive('post')
@@ -100,11 +106,12 @@ public function it_throws_exception_on_rate_limit()
 
     /**
      * @test
-     * @expectedException \NotificationChannels\PagerDuty\Exceptions\ApiError
-     * @expectedExceptionMessage PagerDuty responded with an unexpected HTTP Status: 503
      */
     public function it_throws_exception_on_unexpected_code()
     {
+        $this->expectException('\NotificationChannels\PagerDuty\Exceptions\ApiError');
+        $this->expectExceptionMessage('PagerDuty responded with an unexpected HTTP Status: 503');
+
         $response = new Response(503, [], '', '1.1', 'Service Unavailable');
         $client = Mockery::mock(Client::class);
         $client->shouldReceive('post')
@@ -116,11 +123,11 @@ public function it_throws_exception_on_unexpected_code()
 
     /**
      * @test
-     * @expectedException \NotificationChannels\PagerDuty\Exceptions\CouldNotSendNotification
-     * @expectedExceptionMessage Cannot send message to PagerDuty: Test Exception
      */
     public function it_rethrows_exception_on_client_exception()
     {
+        $this->expectException('\NotificationChannels\PagerDuty\Exceptions\CouldNotSendNotification');
+        $this->expectExceptionMessage('Cannot send message to PagerDuty: Test Exception');
         $e = new \Exception('Test Exception');
 
         $client = Mockery::mock(Client::class);