From 2df55f5fe4c9a3f811c1c4523a461baac1e0d6fe Mon Sep 17 00:00:00 2001
From: Doug Wright <github@dougweb.org>
Date: Sun, 13 Aug 2017 16:54:02 +0100
Subject: [PATCH] Try running HHVM through docker

---
 .travis.yml | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index b7602953..482ce66c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,6 +4,9 @@ sudo: false
 matrix:
   include:
     - php: hhvm
+      sudo: required
+      services:
+       - docker
     - php: 5.4
       env: lowest=1
     - php: 5.5
@@ -18,15 +21,24 @@ cache:
 
 install:
   - |
-    if [ "$TRAVIS_PHP_VERSION" != "hhvm" ]; then
+    if [ "$TRAVIS_PHP_VERSION" = "hhvm" ]; then
+      docker pull hhvm/hhvm:latest;
+      docker run hhvm/hhvm:latest hhvm --version;
+      docker run --name hhvmapt hhvm/hhvm:latest bash -c "apt update -y; apt install -y dialog apt-utils wget curl git";
+      docker commit hhvmapt dvdoug/hhvm:apt;
+      docker run --name hhvmcomposer dvdoug/hhvm:apt bash -c "/usr/bin/curl https://getcomposer.org/installer | hhvm -d hhvm.php7.all=1 --php -- /dev/stdin --install-dir=/usr/local/bin --filename=composer";
+      docker commit hhvmcomposer dvdoug/hhvm:composer;
+    else
       phpenv config-rm xdebug.ini || true;
     fi;
 
   - |
-    if [ "$lowest" = "1" ]; then
+    if [ "$TRAVIS_PHP_VERSION" = "hhvm" ]; then
+      docker run -v $(pwd):/var/source dvdoug/hhvm:composer hhvm -d hhvm.php7.all=1 /usr/local/bin/composer update --working-dir /var/source;
+    elif [ "$lowest" = "1" ]; then
       composer update --prefer-lowest --prefer-stable;
     else
-      composer install;
+      composer update;
     fi;
 
 before_script:
@@ -37,7 +49,9 @@ before_script:
 
 script:
   - |
-    if [ "$TRAVIS_PHP_VERSION" != "hhvm" ] && [ "$TRAVIS_PHP_VERSION" != "5.4" ] && [ "$TRAVIS_PHP_VERSION" != "5.5" ] && [ "$TRAVIS_PHP_VERSION" != "5.6" ]; then
+    if [ "$TRAVIS_PHP_VERSION" = "hhvm" ]; then
+      docker run -v $(pwd):/var/source dvdoug/hhvm:composer hhvm /var/source/vendor/bin/phpunit /var/source/tests;
+    elif [ "$TRAVIS_PHP_VERSION" != "hhvm" ] && [ "$TRAVIS_PHP_VERSION" != "5.4" ] && [ "$TRAVIS_PHP_VERSION" != "5.5" ] && [ "$TRAVIS_PHP_VERSION" != "5.6" ]; then
       phpdbg -qrr vendor/bin/phpunit --coverage-text --coverage-clover=coverage.clover tests;
     else
       php vendor/bin/phpunit;