From e81b8d90d3fa98d155c0e050f3d56b32affbcae7 Mon Sep 17 00:00:00 2001 From: terrafrost Date: Sat, 24 Sep 2016 11:57:59 -0500 Subject: [PATCH] Travis: PHP 7.1 tweaks --- .travis.yml | 2 +- travis/run-phpunit.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index faf3dce1..c3f3ce7b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,7 +28,7 @@ install: - cd .. - eval `ssh-agent -s` - travis/setup-secure-shell.sh - - sh -c "if [ '$TRAVIS_PHP_VERSION' != 'hhvm' -a '$TRAVIS_PHP_VERSION' != '7.0' -a '$TRAVIS_PHP_VERSION' != '7.1' ]; then travis/install-php-extensions.sh; fi" + - sh -c "if [ '$TRAVIS_PHP_VERSION' != 'hhvm' -a `php -r "echo (int) version_compare(PHP_VERSION, '7.0', '<');"` = "1" ]; then travis/install-php-extensions.sh; fi" - travis/setup-composer.sh script: diff --git a/travis/run-phpunit.sh b/travis/run-phpunit.sh index 5ee69d66..ce393a77 100755 --- a/travis/run-phpunit.sh +++ b/travis/run-phpunit.sh @@ -20,7 +20,7 @@ then PHPUNIT_ARGS="$PHPUNIT_ARGS -d zend.enable_gc=0" fi -if [ "$TRAVIS_PHP_VERSION" = 'hhvm' -o "$TRAVIS_PHP_VERSION" = '7.0' ] +if [ "$TRAVIS_PHP_VERSION" = 'hhvm' -o `php -r "echo (int) version_compare(PHP_VERSION, '7.0', '>=');"` = "1" ] then find tests -type f -name "*Test.php" | \ parallel --gnu --keep-order \