From d05a0355a0ef3c9f8d12a7520dc19d89249e21c3 Mon Sep 17 00:00:00 2001 From: adlawson Date: Wed, 22 Jul 2015 09:48:09 +0100 Subject: [PATCH] Update travis configuration --- .travis.install.sh | 9 --------- .travis.yml | 14 ++++---------- composer.json | 2 +- 3 files changed, 5 insertions(+), 20 deletions(-) delete mode 100755 .travis.install.sh diff --git a/.travis.install.sh b/.travis.install.sh deleted file mode 100755 index 3c6e699..0000000 --- a/.travis.install.sh +++ /dev/null @@ -1,9 +0,0 @@ -set -x -if [ "$TRAVIS_PHP_VERSION" = 'hhvm' ] || [ "$TRAVIS_PHP_VERSION" = 'hhvm-nightly' ]; then - curl -sS https://getcomposer.org/installer > composer-installer.php - hhvm composer-installer.php - hhvm -v ResourceLimit.SocketDefaultTimeout=30 -v Http.SlowQueryThreshold=30000 composer.phar install --prefer-source -else - composer self-update - composer install --prefer-source -fi diff --git a/.travis.yml b/.travis.yml index 54854f9..3241ad5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,17 +3,11 @@ language: php php: - 5.5 - 5.6 - - 7 + - 7.0 - hhvm - - hhvm-nightly -matrix: - fast_finish: true - allow_failures: - - php: hhvm-nightly - -before_script: - - ./.travis.install.sh +install: + - travis_retry composer install --no-interaction --ignore-platform-reqs script: - - ./vendor/bin/phpunit + - composer test diff --git a/composer.json b/composer.json index ba8756c..4714181 100644 --- a/composer.json +++ b/composer.json @@ -33,7 +33,7 @@ } }, "require": { - "php": "^5.5", + "php": ">=5.5", "psr/log": "^1.0" }, "require-dev": {