#25187 Lookup php binary in PHP_BINDIR first

Deltachaos · Deltachaos · commit 36fb2b22869c · 2017-11-28T12:14:30.000+01:00
diff --git a/src/Symfony/Component/Process/ExecutableFinder.php b/src/Symfony/Component/Process/ExecutableFinder.php
@@ -23,6 +23,8 @@ class ExecutableFinder
 
     /**
      * Replaces default suffixes of executable.
+     *
+     * @param array $suffixes
      */
     public function setSuffixes(array $suffixes)
     {
@@ -40,15 +42,40 @@ public function addSuffix($suffix)
     }
 
     /**
-     * Finds an executable by name.
+     * Finds an executable by name in given directories.
      *
      * @param string $name      The executable name (without the extension)
+     * @param array  $dirs      Dirs to check into
      * @param string $default   The default to return if no executable is found
-     * @param array  $extraDirs Additional dirs to check into
      *
      * @return string The executable path or default value
      */
-    public function find($name, $default = null, array $extraDirs = array())
+    public function findIn($name, array $dirs = array(), $default = null)
+    {
+        $suffixes = array('');
+        if ('\\' === DIRECTORY_SEPARATOR) {
+            $pathExt = getenv('PATHEXT');
+            $suffixes = array_merge($suffixes, $pathExt ? explode(PATH_SEPARATOR, $pathExt) : $this->suffixes);
+        }
+        foreach ($suffixes as $suffix) {
+            foreach ($dirs as $dir) {
+                if (@is_file($file = $dir.DIRECTORY_SEPARATOR.$name.$suffix) && ('\\' === DIRECTORY_SEPARATOR || is_executable($file))) {
+                    return $file;
+                }
+            }
+        }
+
+        return $default;
+    }
+
+    /**
+     * Returns the search path directories from environment
+     *
+     * @param array $extraDirs Additional dirs to check into
+     *
+     * @return string[] The search paths
+     */
+    public function path(array $extraDirs = array())
     {
         if (ini_get('open_basedir')) {
             $searchPath = explode(PATH_SEPARATOR, ini_get('open_basedir'));
@@ -70,19 +97,24 @@ public function find($name, $default = null, array $extraDirs = array())
             );
         }
 
-        $suffixes = array('');
-        if ('\\' === DIRECTORY_SEPARATOR) {
-            $pathExt = getenv('PATHEXT');
-            $suffixes = array_merge($suffixes, $pathExt ? explode(PATH_SEPARATOR, $pathExt) : $this->suffixes);
-        }
-        foreach ($suffixes as $suffix) {
-            foreach ($dirs as $dir) {
-                if (@is_file($file = $dir.DIRECTORY_SEPARATOR.$name.$suffix) && ('\\' === DIRECTORY_SEPARATOR || is_executable($file))) {
-                    return $file;
-                }
-            }
-        }
+        return $dirs;
+    }
 
-        return $default;
+    /**
+     * Finds an executable by name.
+     *
+     * @param string $name      The executable name (without the extension)
+     * @param string $default   The default to return if no executable is found
+     * @param array  $extraDirs Additional dirs to check into
+     *
+     * @return string The executable path or default value
+     */
+    public function find($name, $default = null, array $extraDirs = array())
+    {
+        return $this->findIn(
+            $name,
+            $this->path($extraDirs),
+            $default
+        );
     }
 }
diff --git a/src/Symfony/Component/Process/PhpExecutableFinder.php b/src/Symfony/Component/Process/PhpExecutableFinder.php
@@ -62,7 +62,12 @@ public function find($includeArgs = true)
             }
         }
 
-        $dirs = array(PHP_BINDIR);
+        $php = $this->executableFinder->findIn('php', array(PHP_BINDIR));
+        if ($php !== null) {
+            return $php;
+        }
+
+        $dirs = array();
         if ('\\' === DIRECTORY_SEPARATOR) {
             $dirs[] = 'C:\xampp\php\\';
         }

Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,12 @@ public function find($includeArgs = true)`
`62`	`62`	`}`
`63`	`63`	`}`
`64`	`64`
`65`		`- $dirs = array(PHP_BINDIR);`
	`65`	`+ $php = $this->executableFinder->findIn('php', array(PHP_BINDIR));`
	`66`	`+ if ($php !== null) {`
	`67`	`+ return $php;`
	`68`	`+ }`
	`69`	`+`
	`70`	`+ $dirs = array();`
`66`	`71`	`if ('\\' === DIRECTORY_SEPARATOR) {`
`67`	`72`	`$dirs[] = 'C:\xampp\php\\';`
`68`	`73`	`}`