Skip to content

Commit f1b74e0

Browse files
authored
Merge pull request #11 from olssonm/dev
Compat-check for Laravel 5.8.
2 parents cb80e8a + bd55b32 commit f1b74e0

File tree

3 files changed

+9
-21
lines changed

3 files changed

+9
-21
lines changed

.travis.yml

+3-15
Original file line numberDiff line numberDiff line change
@@ -7,23 +7,11 @@ before_script:
77
- travis_retry composer require "illuminate/support:${ILLUMINATE_VERSION}"
88

99
script:
10-
- phpunit
10+
- composer test
1111

1212
matrix:
1313
include:
14-
- php: 5.6
15-
env: ILLUMINATE_VERSION=5.3.*
16-
- php: 5.6
17-
env: ILLUMINATE_VERSION=5.4.*
18-
- php: 7.0
19-
env: ILLUMINATE_VERSION=5.4.*
2014
- php: 7.1
21-
env: ILLUMINATE_VERSION=5.5.*
22-
- php: 7.1
23-
env: ILLUMINATE_VERSION=5.6.*
24-
- php: 7.2
25-
env: ILLUMINATE_VERSION=5.6.*
15+
env: ILLUMINATE_VERSION=5.8.*
2616
- php: 7.2
27-
env: ILLUMINATE_VERSION=5.7.*
28-
- php: nightly
29-
env: ILLUMINATE_VERSION=5.7.*
17+
env: ILLUMINATE_VERSION=5.8.*

composer.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@
2020
}
2121
],
2222
"require": {
23-
"php" : ">=5.6.0|>=7.0",
24-
"illuminate/support": ">=5.3.0",
25-
"bjeavons/zxcvbn-php": "0.3.0|0.4.0"
23+
"php" : ">=7.1.3",
24+
"illuminate/support": "^5.8",
25+
"bjeavons/zxcvbn-php": "0.4.0"
2626
},
2727
"require-dev": {
28-
"phpunit/phpunit" : "5.7.*|~6.0|~7.0",
29-
"orchestra/testbench": ">=3.3.0"
28+
"phpunit/phpunit" : "~7.0",
29+
"orchestra/testbench": "^3.8.0"
3030
},
3131
"autoload": {
3232
"psr-4": {

tests/ZxcvbnTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
class ZxcvbnTest extends \Orchestra\Testbench\TestCase {
88

9-
public function setUp() {
9+
public function setUp(): void {
1010
parent::setUp();
1111
}
1212

0 commit comments

Comments
 (0)