Skip to content

Commit 0b39e31

Browse files
authored
Merge pull request #3 from mikemand/laravel-6
Add Laravel 6 compatibility
2 parents ad93335 + da4e496 commit 0b39e31

File tree

3 files changed

+18
-18
lines changed

3 files changed

+18
-18
lines changed

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
build
22
composer.lock
33
vendor
4-
run.php
4+
run.php
5+
.phpunit.result.cache

.travis.yml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,22 @@
11
language: php
22

33
php:
4-
- 7.0
54
- 7.1
5+
- 7.2
6+
- 7.3
67

78
env:
89
matrix:
910
- COMPOSER_FLAGS="--prefer-lowest"
1011
- COMPOSER_FLAGS=""
1112

1213
before_script:
13-
- travis_retry composer self-update
14-
- travis_retry composer update ${COMPOSER_FLAGS} --no-interaction --prefer-source
14+
- travis_retry composer self-update
15+
- travis_retry composer update ${COMPOSER_FLAGS} --no-interaction --prefer-source
1516

1617
script:
17-
- vendor/bin/phpunit --coverage-clover build/logs/clover.xml
18+
- vendor/bin/phpunit --coverage-clover build/logs/clover.xml
1819

1920
after_script:
20-
- wget https://scrutinizer-ci.com/ocular.phar
21-
- php ocular.phar code-coverage:upload --format=php-clover build/logs/clover.xml
21+
- wget https://scrutinizer-ci.com/ocular.phar
22+
- php ocular.phar code-coverage:upload --format=php-clover build/logs/clover.xml

composer.json

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,26 +15,24 @@
1515
"email": "[email protected]"
1616
}
1717
],
18-
"autoload":{
19-
"psr-4":{
20-
"LVR\\State\\":"src/"
18+
"autoload": {
19+
"psr-4": {
20+
"LVR\\State\\": "src/"
2121
}
2222
},
2323
"autoload-dev": {
2424
"psr-4": {
2525
"LVR\\State\\Tests\\": "tests/"
2626
}
2727
},
28-
"minimum-stability": "stable",
28+
"minimum-stability": "stable",
2929
"require": {
30-
"illuminate/contracts": "^5.5",
31-
"illuminate/support": "^5.5",
32-
"php": "^7.0"
30+
"illuminate/contracts": "^5.5|^6.0",
31+
"illuminate/support": "^5.5|^6.0"
3332
},
3433
"require-dev": {
35-
"phpunit/phpunit": "^6.3",
36-
"orchestra/testbench": "^3.5"
34+
"phpunit/phpunit": "^7.0|^8.0",
35+
"orchestra/testbench": "^3.5|^4.0"
3736
},
38-
"suggest": {
39-
}
37+
"suggest": {}
4038
}

0 commit comments

Comments
 (0)