[Console] Reset question validator attempts only for actual stdin (bis)

symfony · Jun 15, 2020 · 8069160 · 8069160
1 parent 52612b1
commit 8069160
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/src/Symfony/Component/Console/Helper/QuestionHelper.php b/src/Symfony/Component/Console/Helper/QuestionHelper.php
@@ -104,7 +104,7 @@ private function doAsk(OutputInterface $output, Question $question)
     {
         $this->writePrompt($output, $question);
 
-        $inputStream = $this->inputStream ?: STDIN;
+        $inputStream = $this->inputStream ?: fopen('php://stdin', 'r');
         $autocomplete = $question->getAutocompleterCallback();
 
         if (null === $autocomplete || !self::$stty || !Terminal::hasSttyAvailable()) {
@@ -474,7 +474,7 @@ private function validateAttempts(callable $interviewer, OutputInterface $output
             } catch (\Exception $error) {
             }
 
-            $attempts = $attempts ?? -(int) $this->isTty();
+            $attempts = $attempts ?? -(int) $this->loopForever();
         }
 
         throw $error;
@@ -507,18 +507,20 @@ private function getShell()
         return self::$shell;
     }
 
-    private function isTty(): bool
+    private function loopForever(): bool
     {
-        if (!\defined('STDIN')) {
+        $inputStream = $this->inputStream ?: fopen('php://stdin', 'r');
+
+        if ('php://stdin' !== (stream_get_meta_data($inputStream)['url'] ?? null)) {
             return true;
         }
 
         if (\function_exists('stream_isatty')) {
-            return stream_isatty(fopen('php://input', 'r'));
+            return stream_isatty($inputStream);
         }
 
         if (\function_exists('posix_isatty')) {
-            return posix_isatty(fopen('php://input', 'r'));
+            return posix_isatty($inputStream);
         }
 
         return true;