diff --git a/ExecutableFinder.php b/ExecutableFinder.php
index a4747707..ceb7a558 100644
--- a/ExecutableFinder.php
+++ b/ExecutableFinder.php
@@ -68,7 +68,7 @@ public function find(string $name, ?string $default = null, array $extraDirs = [
}
}
- $command = '\\' === \DIRECTORY_SEPARATOR ? 'where' : 'command -v';
+ $command = '\\' === \DIRECTORY_SEPARATOR ? 'where' : 'command -v --';
if (\function_exists('exec') && ($executablePath = strtok(@exec($command.' '.escapeshellarg($name)), \PHP_EOL)) && @is_executable($executablePath)) {
return $executablePath;
}
diff --git a/Process.php b/Process.php
index ed0507ec..1aaf730d 100644
--- a/Process.php
+++ b/Process.php
@@ -80,6 +80,7 @@ class Process implements \IteratorAggregate
private WindowsPipes|UnixPipes $processPipes;
private ?int $latestSignal = null;
+ private ?int $cachedExitCode = null;
private static ?bool $sigchild = null;
@@ -1280,6 +1281,19 @@ protected function updateStatus(bool $blocking): void
$this->processInformation = proc_get_status($this->process);
$running = $this->processInformation['running'];
+ // In PHP < 8.3, "proc_get_status" only returns the correct exit status on the first call.
+ // Subsequent calls return -1 as the process is discarded. This workaround caches the first
+ // retrieved exit status for consistent results in later calls, mimicking PHP 8.3 behavior.
+ if (\PHP_VERSION_ID < 80300) {
+ if (!isset($this->cachedExitCode) && !$running && -1 !== $this->processInformation['exitcode']) {
+ $this->cachedExitCode = $this->processInformation['exitcode'];
+ }
+
+ if (isset($this->cachedExitCode) && !$running && -1 === $this->processInformation['exitcode']) {
+ $this->processInformation['exitcode'] = $this->cachedExitCode;
+ }
+ }
+
$this->readPipes($running && $blocking, '\\' !== \DIRECTORY_SEPARATOR || !$running);
if ($this->fallbackStatus && $this->isSigchildEnabled()) {
diff --git a/Tests/ProcessTest.php b/Tests/ProcessTest.php
index cfea99cc..dbcaf862 100644
--- a/Tests/ProcessTest.php
+++ b/Tests/ProcessTest.php
@@ -1553,6 +1553,60 @@ public function testEnvCaseInsensitiveOnWindows()
}
}
+ public function testMultipleCallsToProcGetStatus()
+ {
+ $process = $this->getProcess('echo foo');
+ $process->start(static function () use ($process) {
+ return $process->isRunning();
+ });
+ while ($process->isRunning()) {
+ usleep(1000);
+ }
+ $this->assertSame(0, $process->getExitCode());
+ }
+
+ public function testFailingProcessWithMultipleCallsToProcGetStatus()
+ {
+ $process = $this->getProcess('exit 123');
+ $process->start(static function () use ($process) {
+ return $process->isRunning();
+ });
+ while ($process->isRunning()) {
+ usleep(1000);
+ }
+ $this->assertSame(123, $process->getExitCode());
+ }
+
+ /**
+ * @group slow
+ */
+ public function testLongRunningProcessWithMultipleCallsToProcGetStatus()
+ {
+ $process = $this->getProcess('sleep 1 && echo "done" && php -r "exit(0);"');
+ $process->start(static function () use ($process) {
+ return $process->isRunning();
+ });
+ while ($process->isRunning()) {
+ usleep(1000);
+ }
+ $this->assertSame(0, $process->getExitCode());
+ }
+
+ /**
+ * @group slow
+ */
+ public function testLongRunningProcessWithMultipleCallsToProcGetStatusError()
+ {
+ $process = $this->getProcess('sleep 1 && echo "failure" && php -r "exit(123);"');
+ $process->start(static function () use ($process) {
+ return $process->isRunning();
+ });
+ while ($process->isRunning()) {
+ usleep(1000);
+ }
+ $this->assertSame(123, $process->getExitCode());
+ }
+
/**
* @group transient-on-windows
*/
pFad - Phonifier reborn
Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies:
Alternative Proxy
pFad Proxy
pFad v3 Proxy
pFad v4 Proxy