[Console] Fix testing multiline question

MatTheCat · MatTheCat · commit 9270395481a6 · 2025-08-22T12:03:04.000+02:00
diff --git a/src/Symfony/Component/Console/Helper/QuestionHelper.php b/src/Symfony/Component/Console/Helper/QuestionHelper.php
@@ -527,12 +527,16 @@ private function readInput($inputStream, Question $question): string|false
         $ret = '';
         $cp = $this->setIOCodepage();
         while (false !== ($char = fgetc($multiLineStreamReader))) {
-            if (\PHP_EOL === "{$ret}{$char}") {
+            if ("\x4" === $char || \PHP_EOL === "{$ret}{$char}") {
                 break;
             }
             $ret .= $char;
         }
 
+        if (stream_get_meta_data($inputStream)['seekable']) {
+            fseek($inputStream, ftell($multiLineStreamReader));
+        }
+
         return $this->resetIOCodepage($cp, $ret);
     }
 
diff --git a/src/Symfony/Component/Console/Tester/TesterTrait.php b/src/Symfony/Component/Console/Tester/TesterTrait.php
@@ -169,6 +169,10 @@ private static function createStream(array $inputs)
 
         foreach ($inputs as $input) {
             fwrite($stream, $input.\PHP_EOL);
+
+            if (str_contains($input, \PHP_EOL)) {
+                fwrite($stream, "\x4");
+            }
         }
 
         rewind($stream);

Original file line number	Diff line number	Diff line change
`@@ -527,12 +527,16 @@ private function readInput($inputStream, Question $question): string\|false`
`527`	`527`	`$ret = '';`
`528`	`528`	`$cp = $this->setIOCodepage();`
`529`	`529`	`while (false !== ($char = fgetc($multiLineStreamReader))) {`
`530`		`- if (\PHP_EOL === "{$ret}{$char}") {`
	`530`	`+ if ("\x4" === $char \|\| \PHP_EOL === "{$ret}{$char}") {`
`531`	`531`	`break;`
`532`	`532`	`}`
`533`	`533`	`$ret .= $char;`
`534`	`534`	`}`
`535`	`535`
	`536`	`+ if (stream_get_meta_data($inputStream)['seekable']) {`
	`537`	`+ fseek($inputStream, ftell($multiLineStreamReader));`
	`538`	`+ }`
	`539`	`+`
`536`	`540`	`return $this->resetIOCodepage($cp, $ret);`
`537`	`541`	`}`
`538`	`542`
Original file line number	Diff line number	Diff line change
`@@ -169,6 +169,10 @@ private static function createStream(array $inputs)`
`169`	`169`
`170`	`170`	`foreach ($inputs as $input) {`
`171`	`171`	`fwrite($stream, $input.\PHP_EOL);`
	`172`	`+`
	`173`	`+ if (str_contains($input, \PHP_EOL)) {`
	`174`	`+ fwrite($stream, "\x4");`
	`175`	`+ }`
`172`	`176`	`}`
`173`	`177`
`174`	`178`	`rewind($stream);`