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

Merge remote branch 'pborreli/windows-fix-process'

Browse Source 
* pborreli/windows-fix-process:
  [Process] Better guess of php bin executable path
  [Process] Removed useless getenv
This commit is contained in:
Fabien Potencier 2011-03-27 22:28:26 +02:00
commit 33456e63dc
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Symfony/Component/Process/PhpProcess.php
View File

@ -78,8 +78,8 @@ class PhpProcess extends Process
*/ */
private function getPhpBinary() private function getPhpBinary()
{ {
if (getenv('PHP_PATH')) { if ($php = getenv('PHP_PATH')) {
if (!is_executable($php = getenv('PHP_PATH'))) { if (!is_executable($php)) {
throw new \RuntimeException('The defined PHP_PATH environment variable is not a valid PHP executable.'); 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.'); throw new \RuntimeException('Unable to find the PHP executable.');
} }
} }