Skip to content

Commit

Permalink
Merge pull request #3 from mikemand/laravel-6
Browse files Browse the repository at this point in the history
Add Laravel 6 compatibility
  • Loading branch information
ssx authored Sep 20, 2019
2 parents ad93335 + da4e496 commit 0b39e31
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 18 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
build
composer.lock
vendor
run.php
run.php
.phpunit.result.cache
13 changes: 7 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,21 +1,22 @@
language: php

php:
- 7.0
- 7.1
- 7.2
- 7.3

env:
matrix:
- COMPOSER_FLAGS="--prefer-lowest"
- COMPOSER_FLAGS=""

before_script:
- travis_retry composer self-update
- travis_retry composer update ${COMPOSER_FLAGS} --no-interaction --prefer-source
- travis_retry composer self-update
- travis_retry composer update ${COMPOSER_FLAGS} --no-interaction --prefer-source

script:
- vendor/bin/phpunit --coverage-clover build/logs/clover.xml
- vendor/bin/phpunit --coverage-clover build/logs/clover.xml

after_script:
- wget https://scrutinizer-ci.com/ocular.phar
- php ocular.phar code-coverage:upload --format=php-clover build/logs/clover.xml
- wget https://scrutinizer-ci.com/ocular.phar
- php ocular.phar code-coverage:upload --format=php-clover build/logs/clover.xml
20 changes: 9 additions & 11 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,26 +15,24 @@
"email": "tylercd100@gmail.com"
}
],
"autoload":{
"psr-4":{
"LVR\\State\\":"src/"
"autoload": {
"psr-4": {
"LVR\\State\\": "src/"
}
},
"autoload-dev": {
"psr-4": {
"LVR\\State\\Tests\\": "tests/"
}
},
"minimum-stability": "stable",
"minimum-stability": "stable",
"require": {
"illuminate/contracts": "^5.5",
"illuminate/support": "^5.5",
"php": "^7.0"
"illuminate/contracts": "^5.5|^6.0",
"illuminate/support": "^5.5|^6.0"
},
"require-dev": {
"phpunit/phpunit": "^6.3",
"orchestra/testbench": "^3.5"
"phpunit/phpunit": "^7.0|^8.0",
"orchestra/testbench": "^3.5|^4.0"
},
"suggest": {
}
"suggest": {}
}

0 comments on commit 0b39e31

Please sign in to comment.