2 files changed, 21 insertions, 34 deletions
diff --git a/travis/setup-phpbb.sh b/travis/setup-phpbb.sh
index f9fd9522ca..be9eb703d5 100755
--- a/travis/setup-phpbb.sh
+++ b/travis/setup-phpbb.sh
@@ -26,7 +26,7 @@ then
 	travis/setup-mariadb.sh
 fi
 
-if [ "$NOTESTS" != '1' -a "$TRAVIS_PHP_VERSION" != "hhvm" ]
+if [ "$NOTESTS" != '1' ]
 then
 	travis/setup-php-extensions.sh
 fi
diff --git a/travis/setup-webserver.sh b/travis/setup-webserver.sh
index 3369d740fe..7fb67e0454 100755
--- a/travis/setup-webserver.sh
+++ b/travis/setup-webserver.sh
@@ -22,39 +22,26 @@ PHPBB_ROOT_PATH=$(realpath "$DIR/../phpBB")
 NGINX_CONF="/etc/nginx/sites-enabled/default"
 APP_SOCK=$(realpath "$DIR")/php-app.sock
 
-if [ "$TRAVIS_PHP_VERSION" = 'hhvm' ]
-then
-	HHVM_LOG=$(realpath "$DIR")/hhvm.log
-
-    sudo service hhvm stop
-	sudo hhvm \
-		--mode daemon \
-		--user "$USER" \
-		-vServer.Type=fastcgi \
-		-vServer.FileSocket="$APP_SOCK" \
-		-vLog.File="$HHVM_LOG"
-else
-	# php-fpm
-	PHP_FPM_BIN="$HOME/.phpenv/versions/$TRAVIS_PHP_VERSION/sbin/php-fpm"
-	PHP_FPM_CONF="$DIR/php-fpm.conf"
-
-	echo "
-		[global]
-
-		[travis]
-		user = $USER
-		group = $USER
-		listen = $APP_SOCK
-		listen.mode = 0666
-		pm = static
-		pm.max_children = 2
-
-		php_admin_value[memory_limit] = 128M
-	" > $PHP_FPM_CONF
-
-	sudo $PHP_FPM_BIN \
-		--fpm-config "$DIR/php-fpm.conf"
-fi
+# php-fpm
+PHP_FPM_BIN="$HOME/.phpenv/versions/$TRAVIS_PHP_VERSION/sbin/php-fpm"
+PHP_FPM_CONF="$DIR/php-fpm.conf"
+
+echo "
+	[global]
+
+	[travis]
+	user = $USER
+	group = $USER
+	listen = $APP_SOCK
+	listen.mode = 0666
+	pm = static
+	pm.max_children = 2
+
+	php_admin_value[memory_limit] = 128M
+" > $PHP_FPM_CONF
+
+sudo $PHP_FPM_BIN \
+	--fpm-config "$DIR/php-fpm.conf"
 
 # nginx
 cat $DIR/../phpBB/docs/nginx.sample.conf \