1 files changed, 27 insertions, 8 deletions

diff --git a/.travis.yml b/.travis.yml
index 69b4f919..65e7e304 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -23,8 +23,8 @@ php:
     - 5.5
     - 5.6
     - 7.0
+    - 7.1
     - nightly
-    - hhvm
 
 node_js:
     - "5"
@@ -37,15 +37,32 @@ env:
 matrix:
     fast_finish: true
     include:
+        # driver for PostgreSQL currently unsupported by HHVM, requires 3rd party dependency
+        - php: hhvm-3.12
+          sudo: required
+          dist: trusty
+          group: edge
+          env: DB=mysql
+          addons:
+            apt:
+                packages:
+                    - mysql-server-5.6
+                    - mysql-client-core-5.6
+                    - mysql-client-5.6
+          services:
+            - mysql
+        - php: hhvm-3.12
+          sudo: required
+          dist: trusty
+          group: edge
+          env: DB=sqlite
         - php: 7.0
           env: CS_FIXER=run VALIDATE_TRANSLATION_FILE=run DB=sqlite ASSETS=nobuild
         - php: 7.0
           env: DB=sqlite ASSETS=build
-    exclude:
-        - php: hhvm
-          env: DB=pgsql  # driver for PostgreSQL currently unsupported by HHVM, requires 3rd party dependency
     allow_failures:
-        - php: hhvm
+        - php: hhvm-3.12
+        - php: nightly
 
 # exclude v1 branches
 branches:
@@ -53,9 +70,11 @@ branches:
         - legacy
 
 before_script:
-    - if [[ $TRAVIS_PHP_VERSION != hhvm ]]; then echo "memory_limit=-1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini; fi;
-    - if [[ $TRAVIS_PHP_VERSION != hhvm ]]; then phpenv config-rm xdebug.ini; fi;
-    - if [ "$TRAVIS_PHP_VERSION" = "5.5" ]; then composer require "phpunit/phpunit:4.*" --no-update; fi;
+    - PHP=$TRAVIS_PHP_VERSION
+    - if [[ ! $PHP = hhvm* ]]; then echo "memory_limit=-1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini; fi;
+    # xdebug isn't enable for PHP 7.1
+    - if [[ ! $PHP = hhvm* ]]; then phpenv config-rm xdebug.ini || echo "xdebug not available"; fi
+    - if [[ $PHP = 5.5 ]]; then composer require "phpunit/phpunit:4.*" --no-update; fi;
     - composer self-update --no-progress
     - if [[ "$DB" = "pgsql" ]]; then psql -c 'create database wallabag_test;' -U postgres; fi;