Skip to content

Commit fe36ebd

Browse files
committed
Merge branch '2.0'
2 parents 7902875 + 0afab7f commit fe36ebd

File tree

3 files changed

+9
-6
lines changed

3 files changed

+9
-6
lines changed

.travis.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,18 @@ php:
1010
env:
1111
matrix:
1212
- LARAVEL=5.8.*
13-
- LARAVEL=dev-master
13+
- LARAVEL=^6.0
14+
- LARAVEL=^7.0
1415

1516
matrix:
1617
fast_finish: true
1718
exclude:
1819
- php: 7.1
19-
env: LARAVEL=dev-master
20+
env: LARAVEL=^6.0
21+
- php: 7.1
22+
env: LARAVEL=^7.0
2023
allow_failures:
21-
- env: LARAVEL=dev-master
24+
- env: LARAVEL=^7.0
2225

2326
before_install:
2427
- phpenv config-rm xdebug.ini || true

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@
1111
],
1212
"require": {
1313
"php": "^7.1.3",
14-
"illuminate/notifications": "~5.8.0|^6.0",
14+
"illuminate/notifications": "~5.8.0|^6.0|^7.0",
1515
"nexmo/client": "^1.0"
1616
},
1717
"require-dev": {
1818
"mockery/mockery": "^1.0",
19-
"phpunit/phpunit": "^7.0"
19+
"phpunit/phpunit": "^7.0|^8.0"
2020
},
2121
"autoload": {
2222
"psr-4": {

tests/NotificationNexmoChannelTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
class NotificationNexmoChannelTest extends TestCase
1414
{
15-
public function tearDown()
15+
protected function tearDown(): void
1616
{
1717
m::close();
1818
}

0 commit comments

Comments
 (0)