Change platforms tested on Travis

diff --git a/.travis.yml b/.travis.yml
index 559dd10..38878b6 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,12 +6,9 @@ php:
   - 5.5
   - 5.6
   - 7.0
   - 5.5
   - 5.6
   - 7.0

-  - hhvm
-
-matrix:
-    # current versions of hhvm do fail one test... see https://github.com/facebook/hhvm/issues/4837
-    allow_failures:
-        - php: hhvm
+  - 7.1
+  # hhvm is not available any more on default travis images
+  #- hhvm

 
 before_install:
   # This is mandatory or the 'apt-get install' calls following will fail
 
 before_install:
   # This is mandatory or the 'apt-get install' calls following will fail

diff --git a/tests/ci/travis/setup_php_fpm.sh b/tests/ci/travis/setup_php_fpm.sh
index 7788fdc..dd462b2 100755 (executable)
--- a/tests/ci/travis/setup_php_fpm.sh
+++ b/tests/ci/travis/setup_php_fpm.sh
@@ -6,6 +6,9 @@ sudo cp ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.conf.default ~/.ph
 if [ "$TRAVIS_PHP_VERSION" = "7.0" -a -n "$(ls -A ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.d)" ]; then
   sudo cp ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.d/www.conf.default ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.d/www.conf
 fi
 if [ "$TRAVIS_PHP_VERSION" = "7.0" -a -n "$(ls -A ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.d)" ]; then
   sudo cp ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.d/www.conf.default ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.d/www.conf
 fi

+if [ "$TRAVIS_PHP_VERSION" = "7.1" -a -n "$(ls -A ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.d)" ]; then
+  sudo cp ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.d/www.conf.default ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.d/www.conf
+fi

 echo "cgi.fix_pathinfo = 1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
 echo "always_populate_raw_post_data = -1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
 ~/.phpenv/versions/$(phpenv version-name)/sbin/php-fpm
 echo "cgi.fix_pathinfo = 1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
 echo "always_populate_raw_post_data = -1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
 ~/.phpenv/versions/$(phpenv version-name)/sbin/php-fpm