From 808a5c69a6626191e6b2b483bfcc29ccc77691d5 Mon Sep 17 00:00:00 2001 From: Fabian Franz Date: Tue, 18 Oct 2016 11:35:05 -0700 Subject: [PATCH 1/3] Update drupal.sh --- functions/drupal.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/functions/drupal.sh b/functions/drupal.sh index 122bbd1..205ae80 100644 --- a/functions/drupal.sh +++ b/functions/drupal.sh @@ -81,6 +81,10 @@ function drupal_ti_run_server() { # Use hhvm_serve for PHP 5.3 fcgi and hhvm fcgi PHP_VERSION=$(phpenv version-name) + + # Hack: Remove me. + PHP_VERSION="hhvm" + if [ "$PHP_VERSION" = "5.3" -o "$PHP_VERSION" = "hhvm" ] then export GOPATH="$DRUPAL_TI_DIST_DIR/go" @@ -182,7 +186,8 @@ function drupal_ti_ensure_php_for_drush_webserver() { PHP_VERSION=$(phpenv version-name) if [ "$PHP_VERSION" != "5.3" -a "$PHP_VERSION" != "hhvm" ] then - return + # Hack: Remove me. + #return fi if [ "$PHP_VERSION" = "hhvm" ] then From 243c8f0d7fb6990a1040cf747f5e4240d3d3449d Mon Sep 17 00:00:00 2001 From: Fabian Franz Date: Tue, 18 Oct 2016 11:39:35 -0700 Subject: [PATCH 2/3] Update drupal.sh --- functions/drupal.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/functions/drupal.sh b/functions/drupal.sh index 205ae80..92e0289 100644 --- a/functions/drupal.sh +++ b/functions/drupal.sh @@ -188,6 +188,7 @@ function drupal_ti_ensure_php_for_drush_webserver() { then # Hack: Remove me. #return + echo "Overriding PHP version check" 1>&2 fi if [ "$PHP_VERSION" = "hhvm" ] then From 2cc6e71420a9bbea37157b30626e5d4ea5bf618a Mon Sep 17 00:00:00 2001 From: Fabian Franz Date: Tue, 18 Oct 2016 11:59:57 -0700 Subject: [PATCH 3/3] Update install.sh --- runners/phpunit-core/install.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/runners/phpunit-core/install.sh b/runners/phpunit-core/install.sh index b9c757b..cc91cac 100755 --- a/runners/phpunit-core/install.sh +++ b/runners/phpunit-core/install.sh @@ -3,6 +3,9 @@ set -e $DRUPAL_TI_DEBUG +# Ensure drush webserver can be started for PHP 5.3 / HHVM +drupal_ti_ensure_php_for_drush_webserver + # Ensure that drush is installed. drupal_ti_ensure_drush