Merge branch '7.4' into 8.0

nicolas-grekas · nicolas-grekas · commit c445bcfab3be · 2026-03-06T14:17:40.000+01:00
* 7.4:
  [HttpFoundation] Fix session cookie_lifetime not applied in mock session storage
  [Validator] Fix test
  [Serializer] Fix denormalization of magic `__set` properties
  [Config] Fix NodeDefinition template to be covariant
  Add 'sms' to hostless schemes
  [Validator] Fix required options check when extending a constraint with a simplified constructor
  [Validator] Skip ExpressionLanguage requirement in When constraint for closure expressions
  [Cache] Add timeout and slot eviction to LockRegistry stampede prevention
  [Console] Fix OUTPUT_RAW corrupting binary content on Windows
  [Form] Fix session data contamination by non-serializable objects in form flow
  [Mime] Use shell_exec() instead of passthru() in FileBinaryMimeTypeGuesser
  [HttpClient] Fix streaming from CachingHttpClient
  [DoctrineBridge] Rename `_schema_subscriber_check` table to `schema_subscriber_check_` for Oracle compatibility
  [HttpClient] Fix CachingHttpClient compatibility with decorator clients on 304 responses
  [FrameworkBundle] Fix stale container after reboot in KernelTestCase
  [Form] Fix duplicate validation errors when ValidatorExtension is instantiated multiple times
diff --git a/Output/ConsoleOutput.php b/Output/ConsoleOutput.php
@@ -130,24 +130,54 @@ private function isRunningOS400(): bool
      */
     private function openOutputStream()
     {
+        static $stdout;
+
+        if ($stdout) {
+            return $stdout;
+        }
+
         if (!$this->hasStdoutSupport()) {
-            return fopen('php://output', 'w');
+            return $stdout = fopen('php://output', 'w');
         }
 
         // Use STDOUT when possible to prevent from opening too many file descriptors
-        return \defined('STDOUT') ? \STDOUT : (@fopen('php://stdout', 'w') ?: fopen('php://output', 'w'));
+        if (!\defined('STDOUT')) {
+            return $stdout = @fopen('php://stdout', 'w') ?: fopen('php://output', 'w');
+        }
+
+        // On Windows, STDOUT is opened in text mode; reopen in binary mode to prevent \n to \r\n conversion
+        if ('\\' === \DIRECTORY_SEPARATOR) {
+            return $stdout = @fopen('php://stdout', 'w') ?: \STDOUT;
+        }
+
+        return $stdout = \STDOUT;
     }
 
     /**
      * @return resource
      */
     private function openErrorStream()
     {
+        static $stderr;
+
+        if ($stderr) {
+            return $stderr;
+        }
+
         if (!$this->hasStderrSupport()) {
-            return fopen('php://output', 'w');
+            return $stderr = fopen('php://output', 'w');
         }
 
         // Use STDERR when possible to prevent from opening too many file descriptors
-        return \defined('STDERR') ? \STDERR : (@fopen('php://stderr', 'w') ?: fopen('php://output', 'w'));
+        if (!\defined('STDERR')) {
+            return $stderr = @fopen('php://stderr', 'w') ?: fopen('php://output', 'w');
+        }
+
+        // On Windows, STDERR is opened in text mode; reopen in binary mode to prevent \n → \r\n conversion
+        if ('\\' === \DIRECTORY_SEPARATOR) {
+            return $stderr = @fopen('php://stderr', 'w') ?: \STDERR;
+        }
+
+        return $stderr ??= \STDERR;
     }
 }
diff --git a/Tests/Fixtures/binary_output.php b/Tests/Fixtures/binary_output.php
@@ -0,0 +1,13 @@
+<?php
+
+$vendor = __DIR__;
+while (!file_exists($vendor.'/vendor')) {
+    $vendor = \dirname($vendor);
+}
+require $vendor.'/vendor/autoload.php';
+
+use Symfony\Component\Console\Output\ConsoleOutput;
+use Symfony\Component\Console\Output\OutputInterface;
+
+$output = new ConsoleOutput();
+$output->write("HELLO\nWORLD", false, OutputInterface::OUTPUT_RAW);
diff --git a/Tests/Output/StreamOutputTest.php b/Tests/Output/StreamOutputTest.php
@@ -14,6 +14,7 @@
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Console\Output\Output;
 use Symfony\Component\Console\Output\StreamOutput;
+use Symfony\Component\Process\Process;
 
 class StreamOutputTest extends TestCase
 {
@@ -65,4 +66,12 @@ public function testDoWriteOnFailure()
         rewind($output->getStream());
         $this->assertEquals('', stream_get_contents($output->getStream()));
     }
+
+    public function testRawOutputPreservesNewlinesInContent()
+    {
+        $process = new Process(['php', __DIR__.'/../Fixtures/binary_output.php']);
+        $process->run();
+
+        $this->assertSame("HELLO\nWORLD", $process->getOutput(), 'Raw output must not convert LF in binary content');
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@`
`14`	`14`	`use PHPUnit\Framework\TestCase;`
`15`	`15`	`use Symfony\Component\Console\Output\Output;`
`16`	`16`	`use Symfony\Component\Console\Output\StreamOutput;`
	`17`	`+use Symfony\Component\Process\Process;`
`17`	`18`
`18`	`19`	`class StreamOutputTest extends TestCase`
`19`	`20`	`{`
`@@ -65,4 +66,12 @@ public function testDoWriteOnFailure()`
`65`	`66`	`rewind($output->getStream());`
`66`	`67`	`$this->assertEquals('', stream_get_contents($output->getStream()));`
`67`	`68`	`}`
	`69`	`+`
	`70`	`+ public function testRawOutputPreservesNewlinesInContent()`
	`71`	`+ {`
	`72`	`+ $process = new Process(['php', __DIR__.'/../Fixtures/binary_output.php']);`
	`73`	`+ $process->run();`
	`74`	`+`
	`75`	`+ $this->assertSame("HELLO\nWORLD", $process->getOutput(), 'Raw output must not convert LF in binary content');`
	`76`	`+ }`
`68`	`77`	`}`