From defeecc184b2287f103e3a6f0a2570bf391d89d1 Mon Sep 17 00:00:00 2001 From: coffeeburrito <> Date: Wed, 13 Jun 2018 12:09:25 -0400 Subject: [PATCH] Fix Travis tests and composer requirements --- .travis.yml | 16 +++++++++------- composer.json | 8 ++++---- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index cdc78f4..2830af5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,15 +1,17 @@ language: php php: - - 5.5 - - 5.6 + - 7.0 + - 7.1 + - 7.2 -include: - - php: 5.5 - env: dependencies=lowest +matrix: + include: + - php: 7.0 + env: dependencies=lowest before_script: - composer self-update - - composer install --prefer-source --no-interaction --dev - - if [ "$dependencies" = "lowest" ]; then composer update --prefer-lowest --prefer-stable -n; fi; + - if [ -z "$dependencies" ]; then composer update --prefer-source --no-interaction; fi; + - if [ "$dependencies" = "lowest" ]; then composer update --prefer-lowest --prefer-stable --no-interaction; fi; diff --git a/composer.json b/composer.json index 2c0ad92..a40eeef 100644 --- a/composer.json +++ b/composer.json @@ -17,14 +17,14 @@ } ], "require": { - "php": ">=5.4.0", - "illuminate/database": "~4.2|^5", - "illuminate/config": "~4.2|^5", + "php": "^7", + "illuminate/database": "^5", + "illuminate/config": "^5", "nesbot/carbon": "~1.0", "elasticsearch/elasticsearch": "~6.0" }, "require-dev": { - "phpunit/phpunit": "~4.2|~5.0", + "phpunit/phpunit": "^5", "mockery/mockery": "^0.9.4" }, "autoload": {