[Console] fix "data lost during stream conversion" with QuestionHelper

nicolas-grekas · nicolas-grekas · commit 0ec319e50e89 · 2020-05-05T13:07:12.000+02:00
diff --git a/src/Symfony/Component/Console/Helper/QuestionHelper.php b/src/Symfony/Component/Console/Helper/QuestionHelper.php
@@ -462,10 +462,6 @@ private function validateAttempts(callable $interviewer, OutputInterface $output
         $error = null;
         $attempts = $question->getMaxAttempts();
 
-        if (null === $attempts && !$this->isTty()) {
-            $attempts = 1;
-        }
-
         while (null === $attempts || $attempts--) {
             if (null !== $error) {
                 $this->writeError($output, $error);
@@ -477,6 +473,8 @@ private function validateAttempts(callable $interviewer, OutputInterface $output
                 throw $e;
             } catch (\Exception $error) {
             }
+
+            $attempts = $attempts ?? -(int) $this->isTty();
         }
 
         throw $error;
@@ -517,7 +515,7 @@ private function isTty(): bool
             return stream_isatty($inputStream);
         }
 
-        if (!\function_exists('posix_isatty')) {
+        if (\function_exists('posix_isatty')) {
             return posix_isatty($inputStream);
         }
 
diff --git a/src/Symfony/Component/Console/Tests/Helper/QuestionHelperTest.php b/src/Symfony/Component/Console/Tests/Helper/QuestionHelperTest.php
@@ -446,7 +446,7 @@ public function testAskConfirmation($question, $expected, $default = true)
     {
         $dialog = new QuestionHelper();
 
-        $inputStream = $this->getInputStream($question."\n");
+        $inputStream = $this->getInputStream($question."\n".$question."\n");
         $question = new ConfirmationQuestion('Do you like French fries?', $default);
         $this->assertEquals($expected, $dialog->ask($this->createStreamableInputInterfaceMock($inputStream), $this->createOutputInterface(), $question), 'confirmation question should '.($expected ? 'pass' : 'cancel'));
     }

Original file line number	Diff line number	Diff line change
`@@ -462,10 +462,6 @@ private function validateAttempts(callable $interviewer, OutputInterface $output`
`462`	`462`	`$error = null;`
`463`	`463`	`$attempts = $question->getMaxAttempts();`
`464`	`464`
`465`		`- if (null === $attempts && !$this->isTty()) {`
`466`		`- $attempts = 1;`
`467`		`- }`
`468`		`-`
`469`	`465`	`while (null === $attempts \|\| $attempts--) {`
`470`	`466`	`if (null !== $error) {`
`471`	`467`	`$this->writeError($output, $error);`
`@@ -477,6 +473,8 @@ private function validateAttempts(callable $interviewer, OutputInterface $output`
`477`	`473`	`throw $e;`
`478`	`474`	`} catch (\Exception $error) {`
`479`	`475`	`}`
	`476`	`+`
	`477`	`+ $attempts = $attempts ?? -(int) $this->isTty();`
`480`	`478`	`}`
`481`	`479`
`482`	`480`	`throw $error;`
`@@ -517,7 +515,7 @@ private function isTty(): bool`
`517`	`515`	`return stream_isatty($inputStream);`
`518`	`516`	`}`
`519`	`517`
`520`		`- if (!\function_exists('posix_isatty')) {`
	`518`	`+ if (\function_exists('posix_isatty')) {`
`521`	`519`	`return posix_isatty($inputStream);`
`522`	`520`	`}`
`523`	`521`
Original file line number	Diff line number	Diff line change
`@@ -446,7 +446,7 @@ public function testAskConfirmation($question, $expected, $default = true)`
`446`	`446`	`{`
`447`	`447`	`$dialog = new QuestionHelper();`
`448`	`448`
`449`		`- $inputStream = $this->getInputStream($question."\n");`
	`449`	`+ $inputStream = $this->getInputStream($question."\n".$question."\n");`
`450`	`450`	`$question = new ConfirmationQuestion('Do you like French fries?', $default);`
`451`	`451`	`$this->assertEquals($expected, $dialog->ask($this->createStreamableInputInterfaceMock($inputStream), $this->createOutputInterface(), $question), 'confirmation question should '.($expected ? 'pass' : 'cancel'));`
`452`	`452`	`}`