From 6cab1790c5b2c1dc71560d3a455627f1f9a73b23 Mon Sep 17 00:00:00 2001 From: Andreas Heigl Date: Sun, 6 Dec 2015 00:14:41 +0100 Subject: [PATCH] Fixes Travis-Build This adds a check for PHP7 to the HHVM-Check. Therefore on PHP7 the PECL-GeoIP-Extension shouldn't be loaded. Instead the geoip/geoip-package is required on PHP7. It could also be required for HHVM, but I'm not sure that works... --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index ea426814c..c4cd39b92 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,9 +25,10 @@ matrix: env: deps="low" before_script: - - if [ "$TRAVIS_PHP_VERSION" != "hhvm" ]; then pecl install geoip; fi + - if [ "$TRAVIS_PHP_VERSION" != "hhvm" && "$TRAVIS_PHP_VERSION" != "7.0" ]; then pecl install geoip; fi - composer self-update - if [ "$deps" = "low" ]; then composer update --prefer-dist --prefer-lowest; fi - if [ "$deps" = "" ]; then composer install --prefer-dist --no-interaction; fi + - if [ "$TRAVIS_PHP_VERSION" == "7.0" ]; then composer require "geoip/geoip"; fi script: phpunit --coverage-text