feature symfony#25629 [Process] Make PhpExecutableFinder look for the PHP_BINARY env var (nicolas-grekas)

fabpot · fabpot · commit 88ed829a1ff7 · 2017-12-31T04:36:46.000+01:00
This PR was merged into the 4.1-dev branch. Discussion ---------- [Process] Make `PhpExecutableFinder` look for the `PHP_BINARY` env var | Q | A | ------------- | --- | Branch? | master | Bug fix? | no | New feature? | yes | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | symfony#22101 | License | MIT | Doc PR | - I think this is enough to fix the linked issue and thus replace symfony#23721. ping @tomasfejfar FYI Commits ------- 4bd01f2 [Process] Make `PhpExecutableFinder` look for the `PHP_BINARY` env var
diff --git a/src/Symfony/Component/Process/CHANGELOG.md b/src/Symfony/Component/Process/CHANGELOG.md
@@ -5,6 +5,7 @@ CHANGELOG
 -----
 
  * added the `Process::isTtySupported()` method that allows to check for TTY support
+ * made `PhpExecutableFinder` look for the `PHP_BINARY` env var when searching the php binary
 
 4.0.0
 -----
diff --git a/src/Symfony/Component/Process/PhpExecutableFinder.php b/src/Symfony/Component/Process/PhpExecutableFinder.php
@@ -35,6 +35,14 @@ public function __construct()
      */
     public function find($includeArgs = true)
     {
+        if ($php = getenv('PHP_BINARY')) {
+            if (!is_executable($php)) {
+                return false;
+            }
+
+            return $php;
+        }
+
         $args = $this->findArguments();
         $args = $includeArgs && $args ? ' '.implode(' ', $args) : '';
 
