#25187 Lookup php binary in PHP_BINDIR first

Deltachaos · Deltachaos · commit 11ccd92831bb · 2017-12-05T16:42:53.000+01:00
diff --git a/src/Symfony/Component/Process/PhpExecutableFinder.php b/src/Symfony/Component/Process/PhpExecutableFinder.php
@@ -62,11 +62,19 @@ public function find($includeArgs = true)
             }
         }
 
-        $dirs = array(PHP_BINDIR);
+        $dirs = array();
         if ('\\' === DIRECTORY_SEPARATOR) {
             $dirs[] = 'C:\xampp\php\\';
         }
 
+        $name = 'php';
+        foreach (array('', '.exe', '.bat', '.cmd', '.com') as $suffix) {
+            if (@is_file($file = PHP_BINDIR.DIRECTORY_SEPARATOR.$name.$suffix) &&
+                ('\\' === DIRECTORY_SEPARATOR || is_executable($file))) {
+                return $file;
+            }
+        }
+
         return $this->executableFinder->find('php', false, $dirs);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -62,11 +62,19 @@ public function find($includeArgs = true)`
`62`	`62`	`}`
`63`	`63`	`}`
`64`	`64`
`65`		`- $dirs = array(PHP_BINDIR);`
	`65`	`+ $dirs = array();`
`66`	`66`	`if ('\\' === DIRECTORY_SEPARATOR) {`
`67`	`67`	`$dirs[] = 'C:\xampp\php\\';`
`68`	`68`	`}`
`69`	`69`
	`70`	`+ $name = 'php';`
	`71`	`+ foreach (array('', '.exe', '.bat', '.cmd', '.com') as $suffix) {`
	`72`	`+ if (@is_file($file = PHP_BINDIR.DIRECTORY_SEPARATOR.$name.$suffix) &&`
	`73`	`+ ('\\' === DIRECTORY_SEPARATOR \|\| is_executable($file))) {`
	`74`	`+ return $file;`
	`75`	`+ }`
	`76`	`+ }`
	`77`	`+`
`70`	`78`	`return $this->executableFinder->find('php', false, $dirs);`
`71`	`79`	`}`
`72`	`80`