Merge branch '6.4' into 7.2

nicolas-grekas · nicolas-grekas · commit 87b7c93e57df · 2025-03-13T13:21:46.000+01:00
* 6.4:
  [VarExporter] Fix support for hooks and asymmetric visibility
  fix(process): use a pipe for stderr in pty mode to avoid mixed output between stdout and stderr
  [Cache] fix data collector
diff --git a/Pipes/UnixPipes.php b/Pipes/UnixPipes.php
@@ -70,7 +70,7 @@ public function getDescriptors(): array
             return [
                 ['pty'],
                 ['pty'],
-                ['pty'],
+                ['pipe', 'w'], // stderr needs to be in a pipe to correctly split error and output, since PHP will use the same stream for both
             ];
         }
 
diff --git a/Tests/ProcessTest.php b/Tests/ProcessTest.php
@@ -559,6 +559,20 @@ public function testExitCodeTextIsNullWhenExitCodeIsNull()
         $this->assertNull($process->getExitCodeText());
     }
 
+    public function testStderrNotMixedWithStdout()
+    {
+        if (!Process::isPtySupported()) {
+            $this->markTestSkipped('PTY is not supported on this operating system.');
+        }
+
+        $process = $this->getProcess('echo "foo" && echo "bar" >&2');
+        $process->setPty(true);
+        $process->run();
+
+        $this->assertSame("foo\r\n", $process->getOutput());
+        $this->assertSame("bar\n", $process->getErrorOutput());
+    }
+
     public function testPTYCommand()
     {
         if (!Process::isPtySupported()) {

Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ public function getDescriptors(): array`
`70`	`70`	`return [`
`71`	`71`	`['pty'],`
`72`	`72`	`['pty'],`
`73`		`- ['pty'],`
	`73`	`+ ['pipe', 'w'], // stderr needs to be in a pipe to correctly split error and output, since PHP will use the same stream for both`
`74`	`74`	`];`
`75`	`75`	`}`
`76`	`76`