From da4e496ca00a9aee788bdeeb2cc1f613b3d7d284 Mon Sep 17 00:00:00 2001 From: Micheal Mand Date: Sat, 14 Sep 2019 13:13:09 -0600 Subject: [PATCH] Add Laravel 6 compatibility Signed-off-by: Micheal Mand --- .gitignore | 3 ++- .travis.yml | 13 +++++++------ composer.json | 20 +++++++++----------- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/.gitignore b/.gitignore index 2f89fe5..c3b99ba 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ build composer.lock vendor -run.php \ No newline at end of file +run.php +.phpunit.result.cache diff --git a/.travis.yml b/.travis.yml index 8e1fd3c..a11ccce 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,9 @@ language: php php: - - 7.0 - 7.1 + - 7.2 + - 7.3 env: matrix: @@ -10,12 +11,12 @@ env: - 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 diff --git a/composer.json b/composer.json index 350d5e1..cfcf4e6 100644 --- a/composer.json +++ b/composer.json @@ -15,9 +15,9 @@ "email": "tylercd100@gmail.com" } ], - "autoload":{ - "psr-4":{ - "LVR\\State\\":"src/" + "autoload": { + "psr-4": { + "LVR\\State\\": "src/" } }, "autoload-dev": { @@ -25,16 +25,14 @@ "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": {} }