From 6150aaca8f7154f396bbf4857023564bb9fad3de Mon Sep 17 00:00:00 2001
From: mattab <matthieu.aubry@gmail.com>
Date: Thu, 2 Oct 2014 18:53:37 +1300
Subject: [PATCH] Refs #6224 check for HHVM first to avoid it picked up by the
isValidPhpType call @voidswitch Does this fix the issue for you?
---
core/CliMulti/CliPhp.php | 8 ++++----
1 file 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 = '';
--
GitLab