Merge branch '2.3' into 2.7
* 2.3: [Process] Fix trailing space in PHP binary finder Remove tmp addition of zend-stdlib
This commit is contained in:
commit
16fb7016c8
|
@ -74,7 +74,6 @@
|
|||
"doctrine/doctrine-bundle": "~1.2",
|
||||
"monolog/monolog": "~1.11",
|
||||
"ircmaxell/password-compat": "~1.0",
|
||||
"zendframework/zend-stdlib": "~2.2",
|
||||
"ocramius/proxy-manager": "~0.4|~1.0",
|
||||
"egulias/email-validator": "~1.2"
|
||||
},
|
||||
|
|
|
@ -18,7 +18,6 @@
|
|||
"require": {
|
||||
"php": ">=5.3.9",
|
||||
"symfony/dependency-injection": "~2.3",
|
||||
"zendframework/zend-stdlib": "~2.2",
|
||||
"ocramius/proxy-manager": "~0.4|~1.0"
|
||||
},
|
||||
"require-dev": {
|
||||
|
|
|
@ -35,14 +35,17 @@ class PhpExecutableFinder
|
|||
*/
|
||||
public function find($includeArgs = true)
|
||||
{
|
||||
$args = $this->findArguments();
|
||||
$args = $includeArgs && $args ? ' '.implode(' ', $args) : '';
|
||||
|
||||
// HHVM support
|
||||
if (defined('HHVM_VERSION')) {
|
||||
return (getenv('PHP_BINARY') ?: PHP_BINARY).($includeArgs ? ' '.implode(' ', $this->findArguments()) : '');
|
||||
return (getenv('PHP_BINARY') ?: PHP_BINARY).$args;
|
||||
}
|
||||
|
||||
// PHP_BINARY return the current sapi executable
|
||||
if (defined('PHP_BINARY') && PHP_BINARY && in_array(PHP_SAPI, array('cli', 'cli-server', 'phpdbg')) && is_file(PHP_BINARY)) {
|
||||
return PHP_BINARY.($includeArgs ? ' '.implode(' ', $this->findArguments()) : '');
|
||||
return PHP_BINARY.$args;
|
||||
}
|
||||
|
||||
if ($php = getenv('PHP_PATH')) {
|
||||
|
|
Reference in New Issue