From 539de177ca71e82a21421ae2e0f81dd47e5baab8 Mon Sep 17 00:00:00 2001 From: Joel Marcey Date: Fri, 22 Nov 2013 14:02:48 -0800 Subject: [PATCH 1/2] Add support for HHVM in the getting of the PHP executable --- src/Symfony/Component/Process/PhpExecutableFinder.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/Symfony/Component/Process/PhpExecutableFinder.php b/src/Symfony/Component/Process/PhpExecutableFinder.php index 6c9b8a1149a19..7babad2f19592 100644 --- a/src/Symfony/Component/Process/PhpExecutableFinder.php +++ b/src/Symfony/Component/Process/PhpExecutableFinder.php @@ -33,6 +33,11 @@ public function __construct() */ public function find() { + // HHVM support + if (($hhvm = getenv("PHP_BINARY")) !== false) { + return $hhvm; + } + // PHP_BINARY return the current sapi executable if (defined('PHP_BINARY') && PHP_BINARY && ('cli' === PHP_SAPI) && is_file(PHP_BINARY)) { return PHP_BINARY; From 876482f1a625f03ad2470a80ef6aab900e64d10d Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Sun, 29 Dec 2013 09:12:48 +0100 Subject: [PATCH 2/2] [Process] fixed HHVM support --- src/Symfony/Component/Process/PhpExecutableFinder.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Symfony/Component/Process/PhpExecutableFinder.php b/src/Symfony/Component/Process/PhpExecutableFinder.php index 7babad2f19592..9d5307e193e85 100644 --- a/src/Symfony/Component/Process/PhpExecutableFinder.php +++ b/src/Symfony/Component/Process/PhpExecutableFinder.php @@ -34,10 +34,10 @@ public function __construct() public function find() { // HHVM support - if (($hhvm = getenv("PHP_BINARY")) !== false) { + if (defined('HHVM_VERSION') && false !== $hhvm = getenv('PHP_BINARY')) { return $hhvm; } - + // PHP_BINARY return the current sapi executable if (defined('PHP_BINARY') && PHP_BINARY && ('cli' === PHP_SAPI) && is_file(PHP_BINARY)) { return PHP_BINARY;