bug #51296 [Process] Fix silencing wait when using a sigchild-enabled binary (nicolas-grekas)

nicolas-grekas · nicolas-grekas · commit 6d45e0a3dd55 · 2023-08-07T12:38:22.000+02:00
This PR was merged into the 5.4 branch. Discussion ---------- [Process] Fix silencing `wait` when using a sigchild-enabled binary | Q | A | ------------- | --- | Branch? | 5.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | - | License | MIT | Doc PR | - Not sure why it's not the case on the CI, but locally `testTermSignalTerminatesProcessCleanly` fails because `wait` outputs "Terminated". This fixes it. Commits ------- 3a31a93 [Process] Fix silencing `wait` when using a sigchild-enabled binary
diff --git a/src/Symfony/Component/Process/Process.php b/src/Symfony/Component/Process/Process.php
@@ -331,7 +331,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/src/Symfony/Component/Process/Tests/ProcessTest.php b/src/Symfony/Component/Process/Tests/ProcessTest.php
@@ -1524,7 +1524,7 @@ public function testWaitStoppedDeadProcess()
         $process->wait();
         $this->assertFalse($process->isRunning());
 
-        if ('\\' !== \DIRECTORY_SEPARATOR) {
+        if ('\\' !== \DIRECTORY_SEPARATOR && !\Closure::bind(function () { return $this->isSigchildEnabled(); }, $process, $process)()) {
             $this->assertSame(0, $process->getExitCode());
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -1524,7 +1524,7 @@ public function testWaitStoppedDeadProcess()`
`1524`	`1524`	`$process->wait();`
`1525`	`1525`	`$this->assertFalse($process->isRunning());`
`1526`	`1526`
`1527`		`- if ('\\' !== \DIRECTORY_SEPARATOR) {`
	`1527`	`+ if ('\\' !== \DIRECTORY_SEPARATOR && !\Closure::bind(function () { return $this->isSigchildEnabled(); }, $process, $process)()) {`
`1528`	`1528`	`$this->assertSame(0, $process->getExitCode());`
`1529`	`1529`	`}`
`1530`	`1530`	`}`