Merge branch '2.0'

laravel · Aug 23, 2019 · fe36ebd · fe36ebd
2 parents 7902875 + 0afab7f
commit fe36ebd
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -10,15 +10,18 @@ php:
 env:
   matrix:
     - LARAVEL=5.8.*
-    - LARAVEL=dev-master
+    - LARAVEL=^6.0
+    - LARAVEL=^7.0
 
 matrix:
   fast_finish: true
   exclude:
     - php: 7.1
-      env: LARAVEL=dev-master
+      env: LARAVEL=^6.0
+    - php: 7.1
+      env: LARAVEL=^7.0
   allow_failures:
-    - env: LARAVEL=dev-master
+    - env: LARAVEL=^7.0
 
 before_install:
   - phpenv config-rm xdebug.ini || true

diff --git a/composer.json b/composer.json
@@ -11,12 +11,12 @@
     ],
     "require": {
         "php": "^7.1.3",
-        "illuminate/notifications": "~5.8.0|^6.0",
+        "illuminate/notifications": "~5.8.0|^6.0|^7.0",
         "nexmo/client": "^1.0"
     },
     "require-dev": {
         "mockery/mockery": "^1.0",
-        "phpunit/phpunit": "^7.0"
+        "phpunit/phpunit": "^7.0|^8.0"
     },
     "autoload": {
         "psr-4": {

diff --git a/tests/NotificationNexmoChannelTest.php b/tests/NotificationNexmoChannelTest.php
@@ -12,7 +12,7 @@
 
 class NotificationNexmoChannelTest extends TestCase
 {
-    public function tearDown()
+    protected function tearDown(): void
     {
         m::close();
     }