diogo
/
symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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:
Fabien Potencier 2015-11-19 17:11:24 +01:00
parent aa82cd338a 1728dcca82
commit 16fb7016c8
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
composer.json
View File

@ -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"
},

1
src/Symfony/Bridge/ProxyManager/composer.json
View File

@ -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": {

7
src/Symfony/Component/Process/PhpExecutableFinder.php
View File

@ -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')) {