Merge remote branch 'symfony/master' into experimental
This commit is contained in:
commit
0fb95c18ad
@ -78,8 +78,8 @@ class PhpProcess extends Process
|
||||
*/
|
||||
private function getPhpBinary()
|
||||
{
|
||||
if (getenv('PHP_PATH')) {
|
||||
if (!is_executable($php = getenv('PHP_PATH'))) {
|
||||
if ($php = getenv('PHP_PATH')) {
|
||||
if (!is_executable($php)) {
|
||||
throw new \RuntimeException('The defined PHP_PATH environment variable is not a valid PHP executable.');
|
||||
}
|
||||
|
||||
@ -93,6 +93,12 @@ class PhpProcess extends Process
|
||||
}
|
||||
}
|
||||
|
||||
if ($php = getenv('PHP_PEAR_PHP_BIN')) {
|
||||
if (is_executable($php)) {
|
||||
return $php;
|
||||
}
|
||||
}
|
||||
|
||||
throw new \RuntimeException('Unable to find the PHP executable.');
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user