symfony
diff --git a/‎src/Symfony/Component/Console/Helper/QuestionHelper.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Console/Helper/QuestionHelper.php
+5-3Lines changed: 5 additions & 3 deletions b/‎src/Symfony/Component/Console/Helper/QuestionHelper.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Console/Helper/QuestionHelper.php
+5-3Lines changed: 5 additions & 3 deletions
diff --git a/‎src/Symfony/Component/Console/Tests/Helper/QuestionHelperTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Console/Tests/Helper/QuestionHelperTest.php
+28-11Lines changed: 28 additions & 11 deletions b/‎src/Symfony/Component/Console/Tests/Helper/QuestionHelperTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Console/Tests/Helper/QuestionHelperTest.php
+28-11Lines changed: 28 additions & 11 deletions
@@ -509,14 +509,16 @@ private function getShell()
 
     private function isTty(): bool
     {
-        $inputStream = !$this->inputStream && \defined('STDIN') ? STDIN : $this->inputStream;
+        if (!\defined('STDIN')) {
+            return true;
+        }
 
         if (\function_exists('stream_isatty')) {
-            return stream_isatty($inputStream);
+            return stream_isatty(fopen('php://stdin', 'r'));
         }
 
         if (\function_exists('posix_isatty')) {
-            return posix_isatty($inputStream);
+            return posix_isatty(fopen('php://stdin', 'r'));
         }
 
         return true;
 
@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\Console\Tests\Helper;
 
+use Symfony\Component\Console\Application;
 use Symfony\Component\Console\Exception\InvalidArgumentException;
 use Symfony\Component\Console\Formatter\OutputFormatter;
 use Symfony\Component\Console\Helper\FormatterHelper;
@@ -21,6 +22,7 @@
 use Symfony\Component\Console\Question\ConfirmationQuestion;
 use Symfony\Component\Console\Question\Question;
 use Symfony\Component\Console\Terminal;
+use Symfony\Component\Console\Tester\ApplicationTester;
 
 /**
  * @group tty
@@ -727,21 +729,36 @@ public function testAskThrowsExceptionOnMissingInputWithValidator()
         $dialog->ask($this->createStreamableInputInterfaceMock($this->getInputStream('')), $this->createOutputInterface(), $question);
     }
 
-    public function testAskThrowsExceptionFromValidatorEarlyWhenTtyIsMissing()
+    public function testQuestionValidatorRepeatsThePrompt()
     {
-        $this->expectException('Exception');
-        $this->expectExceptionMessage('Bar, not Foo');
+        $tries = 0;
+        $application = new Application();
+        $application->setAutoExit(false);
+        $application->register('question')
+            ->setCode(function ($input, $output) use (&$tries) {
+                $question = new Question('This is a promptable question');
+                $question->setValidator(function ($value) use (&$tries) {
+                    ++$tries;
+                    if (!$value) {
+                        throw new \Exception();
+                    }
 
-        $output = $this->getMockBuilder('\Symfony\Component\Console\Output\OutputInterface')->getMock();
-        $output->expects($this->once())->method('writeln');
+                    return $value;
+                });
+
+                (new QuestionHelper())->ask($input, $output, $question);
 
-        (new QuestionHelper())->ask(
-            $this->createStreamableInputInterfaceMock($this->getInputStream('Foo'), true),
-            $output,
-            (new Question('Q?'))->setHidden(true)->setValidator(function ($input) {
-                throw new \Exception("Bar, not $input");
+                return 0;
             })
-        );
+        ;
+
+        $tester = new ApplicationTester($application);
+        $tester->setInputs(['', 'not-empty']);
+
+        $statusCode = $tester->run(['command' => 'question'], ['interactive' => true]);
+
+        $this->assertSame(2, $tries);
+        $this->assertSame($statusCode, 0);
     }
 
     public function testEmptyChoices()
Original file line number	Diff line number	Diff line change
`@@ -509,14 +509,16 @@ private function getShell()`
`509`	`509`
`510`	`510`	`private function isTty(): bool`
`511`	`511`	`{`
`512`		`- $inputStream = !$this->inputStream && \defined('STDIN') ? STDIN : $this->inputStream;`
	`512`	`+ if (!\defined('STDIN')) {`
	`513`	`+ return true;`
	`514`	`+ }`
`513`	`515`
`514`	`516`	`if (\function_exists('stream_isatty')) {`
`515`		`- return stream_isatty($inputStream);`
	`517`	`+ return stream_isatty(fopen('php://stdin', 'r'));`
`516`	`518`	`}`
`517`	`519`
`518`	`520`	`if (\function_exists('posix_isatty')) {`
`519`		`- return posix_isatty($inputStream);`
	`521`	`+ return posix_isatty(fopen('php://stdin', 'r'));`
`520`	`522`	`}`
`521`	`523`
`522`	`524`	`return true;`