Merge branch '5.4' into 6.3

* 5.4: [Process] Fix silencing `wait` when using a sigchild-enabled binary
symfony · Aug 7, 2023 · 0b5c291 · 0b5c291
2 parents d62c23a + 45261e1
commit 0b5c291
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Process.php b/Process.php
@@ -328,7 +328,7 @@ public function start(callable $callback = null, array $env = [])
 
             // See https://unix.stackexchange.com/questions/71205/background-process-pipe-input
             $commandline = '{ ('.$commandline.') <&3 3<&- 3>/dev/null & } 3<&0;';
-            $commandline .= 'pid=$!; echo $pid >&3; wait $pid; code=$?; echo $code >&3; exit $code';
+            $commandline .= 'pid=$!; echo $pid >&3; wait $pid 2>/dev/null; code=$?; echo $code >&3; exit $code';
 
             // Workaround for the bug, when PTS functionality is enabled.
             // @see : https://bugs.php.net/69442

diff --git a/Tests/ProcessTest.php b/Tests/ProcessTest.php
@@ -1522,7 +1522,7 @@ public function testWaitStoppedDeadProcess()
         $process->wait();
         $this->assertFalse($process->isRunning());
 
-        if ('\\' !== \DIRECTORY_SEPARATOR) {
+        if ('\\' !== \DIRECTORY_SEPARATOR && !\Closure::bind(fn () => $this->isSigchildEnabled(), $process, $process)()) {
             $this->assertSame(0, $process->getExitCode());
         }
     }