danog/parallel
1
0
Fork 0
mirror of https://github.com/danog/parallel.git synced 2025-01-22 14:01:14 +01:00
Code Issues Projects Releases Wiki Activity

Only modify binary path if null

Browse Source 
Also remove setting process options, as this is done in amphp/process anyway.
This commit is contained in:
Aaron Piotrowski 2017-12-06 16:01:11 -06:00
parent 6be72c6754
commit 11a115670c
No known key found for this signature in database
GPG Key ID: ADD1EF783EDE9EEB
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/Context/Process.php
View File

@ -47,20 +47,18 @@ class Process implements Context {
}
if ($binary === null) {
$binary = \PHP_BINARY;
}
// Locate PHP executable when running under non-cli SAPI and no custom binary path was provided.
if ($binary === \PHP_BINARY && \PHP_SAPI !== "cli") {
$binary = self::$binaryPath ?? self::locateBinary();
if (\PHP_SAPI === "cli") {
$binary = \PHP_BINARY;
} else {
$binary = self::$binaryPath ?? self::locateBinary();
}
} elseif (!\is_executable($binary)) {
throw new \Error(\sprintf("The PHP binary path '%s' was not found or is not executable", $binary));
}
$command = \escapeshellarg($binary) . " " . $this->formatOptions($options) . " " . $script;
$processOptions = \strncasecmp(\PHP_OS, "WIN", 3) === 0 ? ["bypass_shell" => true] : [];
$this->process = new BaseProcess($command, $cwd, $env, $processOptions);
$this->process = new BaseProcess($command, $cwd, $env);
}
private static function locateBinary(): string {