Browse Source

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

* pborreli/windows-fix-process:
  [Process] Better guess of php bin executable path
  [Process] Removed useless getenv
Fabien Potencier 14 years ago
parent
commit
33456e63dc
1 changed files with 8 additions and 2 deletions
  1. 8 2
      src/Symfony/Component/Process/PhpProcess.php

+ 8 - 2
src/Symfony/Component/Process/PhpProcess.php

@@ -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.');
     }
 }