Commitd6b7fd8

committed

[Process] Properly deal with not-found executables on Windows

1 parentf41aa69 commitd6b7fd8Copy full SHA for d6b7fd8

File tree

+18

-8

lines changed

+18

-8

lines changed

Lines changed: 8 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -70,8 +70,14 @@ public function find(string $name, ?string $default = null, array $extraDirs = [`
`70`	`70`	`}`
`71`	`71`	`}`
`72`	`72`
`73`		`-$command ='\\' === \DIRECTORY_SEPARATOR ?'where' :'command -v --';`
`74`		`-if (\function_exists('exec') && ($executablePath =strtok(@exec($command.''.escapeshellarg($name)), \PHP_EOL)) && @is_executable($executablePath)) {`
	`73`	`+if (!\function_exists('exec') \|\|\strlen($name) !==strcspn($name,'/'.\DIRECTORY_SEPARATOR)) {`
	`74`	`+return$default;`
	`75`	`+ }`
	`76`	`+`
	`77`	`+$command ='\\' === \DIRECTORY_SEPARATOR ?'where %s 2> NUL' :'command -v -- %s';`
	`78`	`+$execResult =exec(\sprintf($command,escapeshellarg($name)));`
	`79`	`+`
	`80`	`+if (($executablePath =substr($execResult,0,strpos($execResult, \PHP_EOL) ?:null)) && @is_executable($executablePath)) {`
`75`	`81`	`return$executablePath;`
`76`	`82`	`}`
`77`	`83`

Lines changed: 10 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -35,12 +35,16 @@ public function find(bool $includeArgs = true)`
`35`	`35`	`{`
`36`	`36`	`if ($php =getenv('PHP_BINARY')) {`
`37`	`37`	`if (!is_executable($php)) {`
`38`		`-$command ='\\' === \DIRECTORY_SEPARATOR ?'where' :'command -v --';`
`39`		`-if (\function_exists('exec') &&$php =strtok(exec($command.''.escapeshellarg($php)), \PHP_EOL)) {`
`40`		`-if (!is_executable($php)) {`
`41`		`-returnfalse;`
`42`		`- }`
`43`		`- }else {`
	`38`	`+if (!\function_exists('exec') \|\|\strlen($php) !==strcspn($php,'/'.\DIRECTORY_SEPARATOR)) {`
	`39`	`+returnfalse;`
	`40`	`+ }`
	`41`	`+`
	`42`	`+$command ='\\' === \DIRECTORY_SEPARATOR ?'where %s 2> NULL' :'command -v -- %s';`
	`43`	`+$execResult =exec(\sprintf($command,escapeshellarg($php)));`
	`44`	`+if (!$php =substr($execResult,0,strpos($execResult, \PHP_EOL) ?:null)) {`
	`45`	`+returnfalse;`
	`46`	`+ }`
	`47`	`+if (!is_executable($php)) {`
`44`	`48`	`returnfalse;`
`45`	`49`	`}`
`46`	`50`	`}`

Comments

(0)