feat: support laravel 7 (#83)

atymic · web-flow · commit 1027423775e2 · 2020-03-07T12:22:31.000+11:00
- drop old version support (laravel/php)
- fix tests for supported phpunit version
- update docs
diff --git a/.travis.yml b/.travis.yml
@@ -1,10 +1,9 @@
 language: php
 
 php:
-    - 5.6
-    - 7.0
-    - 7.1
     - 7.2
+    - 7.3
+    - 7.4
 
 env:
     matrix:
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# Twilio notifications channel for Laravel 5.3+
+# Twilio notifications channel for Laravel
 
 [![Latest Version on Packagist](https://img.shields.io/packagist/v/laravel-notification-channels/twilio.svg?style=flat-square)](https://packagist.org/packages/laravel-notification-channels/twilio)
 [![Software License](https://img.shields.io/badge/license-MIT-brightgreen.svg?style=flat-square)](LICENSE.md)
@@ -8,7 +8,7 @@
 [![Code Coverage](https://img.shields.io/scrutinizer/coverage/g/laravel-notification-channels/twilio/master.svg?style=flat-square)](https://scrutinizer-ci.com/g/laravel-notification-channels/twilio/?branch=master)
 [![Total Downloads](https://img.shields.io/packagist/dt/laravel-notification-channels/twilio.svg?style=flat-square)](https://packagist.org/packages/laravel-notification-channels/twilio)
 
-This package makes it easy to send [Twilio notifications](https://documentation.twilio.com/docs) with Laravel 5.3.
+This package makes it easy to send [Twilio notifications](https://documentation.twilio.com/docs) with Laravel 5.5+, 6.x and 7.x
 
 ## Contents
 
@@ -31,16 +31,6 @@ You can install the package via composer:
 composer require laravel-notification-channels/twilio
 ```
 
-Add the service provider (only required on Laravel 5.4 or lower):
-
-```php
-// config/app.php
-'providers' => [
-    ...
-    NotificationChannels\Twilio\TwilioProvider::class,
-],
-```
-
 ### Setting up your Twilio account
 
 Add your Twilio Account SID, Auth Token, and From Number (optional) to your `config/services.php`:
diff --git a/composer.json b/composer.json
@@ -16,16 +16,16 @@
         }
     ],
     "require": {
-        "php": ">=5.5.9",
+        "php": ">=7.2",
         "twilio/sdk": "~5.16",
-        "illuminate/notifications": "^5.1 || ^6.0",
-        "illuminate/support": "^5.1 || ^6.0",
-        "illuminate/events": "^5.1 || ^6.0",
-        "illuminate/queue": "^5.1 || ^6.0"
+        "illuminate/notifications": "^5.5 || ^6.0 || ^7.0",
+        "illuminate/support": "^5.5 || ^6.0 || ^7.0",
+        "illuminate/events": "^5.5 || ^6.0 || ^7.0",
+        "illuminate/queue": "^5.5 || ^6.0 || ^7.0"
     },
     "require-dev": {
-        "mockery/mockery": "^0.9.5",
-        "phpunit/phpunit": "5.*"
+        "mockery/mockery": "^1.3",
+        "phpunit/phpunit": "^8.5"
     },
     "autoload": {
         "psr-4": {
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -19,10 +19,11 @@
             <directory suffix=".php">src/</directory>
         </whitelist>
     </filter>
+
     <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>
diff --git a/tests/IntegrationTest.php b/tests/IntegrationTest.php
@@ -2,18 +2,18 @@
 
 namespace NotificationChannels\Twilio\Test;
 
-use Mockery;
-use NotificationChannels\Twilio\Twilio;
-use Twilio\Rest\Client as TwilioService;
-use Illuminate\Notifications\Notification;
 use Illuminate\Contracts\Events\Dispatcher;
-use Twilio\Rest\Api\V2010\Account\CallList;
+use Illuminate\Notifications\Notification;
+use Mockery;
 use Mockery\Adapter\Phpunit\MockeryTestCase;
-use NotificationChannels\Twilio\TwilioConfig;
+use NotificationChannels\Twilio\Twilio;
+use NotificationChannels\Twilio\TwilioCallMessage;
 use NotificationChannels\Twilio\TwilioChannel;
-use Twilio\Rest\Api\V2010\Account\MessageList;
+use NotificationChannels\Twilio\TwilioConfig;
 use NotificationChannels\Twilio\TwilioSmsMessage;
-use NotificationChannels\Twilio\TwilioCallMessage;
+use Twilio\Rest\Api\V2010\Account\CallList;
+use Twilio\Rest\Api\V2010\Account\MessageList;
+use Twilio\Rest\Client as TwilioService;
 
 class IntegrationTest extends MockeryTestCase
 {
@@ -26,7 +26,7 @@ class IntegrationTest extends MockeryTestCase
     /** @var Dispatcher */
     protected $events;
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 
diff --git a/tests/TwilioCallMessageTest.php b/tests/TwilioCallMessageTest.php
@@ -9,7 +9,7 @@ class TwilioCallMessageTest extends TwilioMessageTest
     /** @var TwilioCallMessage */
     protected $message;
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 
diff --git a/tests/TwilioChannelTest.php b/tests/TwilioChannelTest.php
@@ -2,15 +2,15 @@
 
 namespace NotificationChannels\Twilio\Test;
 
-use Mockery;
-use NotificationChannels\Twilio\Twilio;
-use Illuminate\Notifications\Notification;
 use Illuminate\Contracts\Events\Dispatcher;
+use Illuminate\Notifications\Events\NotificationFailed;
+use Illuminate\Notifications\Notification;
+use Mockery;
 use Mockery\Adapter\Phpunit\MockeryTestCase;
+use NotificationChannels\Twilio\Twilio;
+use NotificationChannels\Twilio\TwilioCallMessage;
 use NotificationChannels\Twilio\TwilioChannel;
 use NotificationChannels\Twilio\TwilioSmsMessage;
-use NotificationChannels\Twilio\TwilioCallMessage;
-use Illuminate\Notifications\Events\NotificationFailed;
 
 class TwilioChannelTest extends MockeryTestCase
 {
@@ -23,7 +23,7 @@ class TwilioChannelTest extends MockeryTestCase
     /** @var Dispatcher */
     protected $dispatcher;
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 
diff --git a/tests/TwilioMmsMessageTest.php b/tests/TwilioMmsMessageTest.php
@@ -6,7 +6,7 @@
 
 class TwilioMmsMessageTest extends TwilioMessageTest
 {
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 
diff --git a/tests/TwilioProviderTest.php b/tests/TwilioProviderTest.php
@@ -2,15 +2,15 @@
 
 namespace NotificationChannels\Twilio\Test;
 
-use Mockery;
 use ArrayAccess;
-use NotificationChannels\Twilio\Twilio;
-use Twilio\Rest\Client as TwilioService;
+use Illuminate\Contracts\Foundation\Application;
+use Mockery;
 use Mockery\Adapter\Phpunit\MockeryTestCase;
-use NotificationChannels\Twilio\TwilioConfig;
+use NotificationChannels\Twilio\Twilio;
 use NotificationChannels\Twilio\TwilioChannel;
+use NotificationChannels\Twilio\TwilioConfig;
 use NotificationChannels\Twilio\TwilioProvider;
-use Illuminate\Contracts\Foundation\Application;
+use Twilio\Rest\Client as TwilioService;
 
 class TwilioProviderTest extends MockeryTestCase
 {
@@ -20,7 +20,7 @@ class TwilioProviderTest extends MockeryTestCase
     /** @var App */
     protected $app;
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 
diff --git a/tests/TwilioSmsMessageTest.php b/tests/TwilioSmsMessageTest.php
@@ -6,7 +6,7 @@
 
 class TwilioSmsMessageTest extends TwilioMessageTest
 {
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 
diff --git a/tests/TwilioTest.php b/tests/TwilioTest.php
@@ -2,19 +2,19 @@
 
 namespace NotificationChannels\Twilio\Test;
 
-use Mockery;
-use Services_Twilio_Rest_Calls;
-use Services_Twilio_Rest_Messages;
-use NotificationChannels\Twilio\Twilio;
-use Twilio\Rest\Client as TwilioService;
 use Illuminate\Contracts\Events\Dispatcher;
+use Mockery;
 use Mockery\Adapter\Phpunit\MockeryTestCase;
+use NotificationChannels\Twilio\Exceptions\CouldNotSendNotification;
+use NotificationChannels\Twilio\Twilio;
+use NotificationChannels\Twilio\TwilioCallMessage;
 use NotificationChannels\Twilio\TwilioConfig;
 use NotificationChannels\Twilio\TwilioMessage;
 use NotificationChannels\Twilio\TwilioMmsMessage;
 use NotificationChannels\Twilio\TwilioSmsMessage;
-use NotificationChannels\Twilio\TwilioCallMessage;
-use NotificationChannels\Twilio\Exceptions\CouldNotSendNotification;
+use Services_Twilio_Rest_Calls;
+use Services_Twilio_Rest_Messages;
+use Twilio\Rest\Client as TwilioService;
 
 class TwilioTest extends MockeryTestCase
 {
@@ -32,7 +32,7 @@ class TwilioTest extends MockeryTestCase
      */
     protected $config;
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 
@@ -202,10 +202,8 @@ public function it_can_send_a_call_to_twilio()
     /** @test */
     public function it_will_throw_an_exception_in_case_of_a_missing_from_number()
     {
-        $this->setExpectedException(
-            CouldNotSendNotification::class,
-            'Notification was not sent. Missing `from` number.'
-        );
+        $this->expectException(CouldNotSendNotification::class);
+        $this->expectExceptionMessage('Notification was not sent. Missing `from` number.');
 
         $smsMessage = new TwilioSmsMessage('Message text');
 
@@ -223,10 +221,8 @@ public function it_will_throw_an_exception_in_case_of_a_missing_from_number()
     /** @test */
     public function it_will_throw_an_exception_in_case_of_an_unrecognized_message_object()
     {
-        $this->setExpectedException(
-            CouldNotSendNotification::class,
-            'Notification was not sent. Message object class'
-        );
+        $this->expectException(CouldNotSendNotification::class);
+        $this->expectExceptionMessage('Notification was not sent. Message object class');
 
         $this->twilio->sendMessage(new InvalidMessage(), null);
     }

-Original file line number
+Diff line change
@@ @@ -1,10 +1,9 @@ @@
 language: php
 php:
 -    - 5.6
 -    - 7.0
 -    - 7.1
     - 7.2
 +    - 7.3
 +    - 7.4
 env:
     matrix:
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ class TwilioCallMessageTest extends TwilioMessageTest`
`9`	`9`	`/** @var TwilioCallMessage */`
`10`	`10`	`protected $message;`
`11`	`11`
`12`		`- public function setUp()`
	`12`	`+ public function setUp(): void`
`13`	`13`	`{`
`14`	`14`	`parent::setUp();`
`15`	`15`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`
`7`	`7`	`class TwilioMmsMessageTest extends TwilioMessageTest`
`8`	`8`	`{`
`9`		`- public function setUp()`
	`9`	`+ public function setUp(): void`
`10`	`10`	`{`
`11`	`11`	`parent::setUp();`
`12`	`12`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`
`7`	`7`	`class TwilioSmsMessageTest extends TwilioMessageTest`
`8`	`8`	`{`
`9`		`- public function setUp()`
	`9`	`+ public function setUp(): void`
`10`	`10`	`{`
`11`	`11`	`parent::setUp();`
`12`	`12`