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

symfony · May 5, 2020 · 0ec319e · 0ec319e
1 parent 2732dda
commit 0ec319e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
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'));
     }