Refs #6224 check for HHVM first to avoid it picked up by the isValidPhpType call @voidswitch Does this fix the issue for you?

1 files changed, 4 insertions, 4 deletions

diff --git a/core/CliMulti/CliPhp.php b/core/CliMulti/CliPhp.php
index 1b164835d4..9ee5b191b1 100644
--- a/core/CliMulti/CliPhp.php
+++ b/core/CliMulti/CliPhp.php
@@ -18,13 +18,13 @@ class CliPhp
     {
         if (defined('PHP_BINARY')) {
 
-            if ($this->isValidPhpType(PHP_BINARY)) {
-                return PHP_BINARY . ' -q';
-            }
-
             if ($this->isHhvmBinary(PHP_BINARY)) {
                 return PHP_BINARY . ' --php';
             }
+
+            if ($this->isValidPhpType(PHP_BINARY)) {
+                return PHP_BINARY . ' -q';
+            }
         }
 
         $bin = '';