minor #53661 [Console] Remove needless state from QuestionHelper (nicolas-grekas)

nicolas-grekas · nicolas-grekas · commit 3cbadd8b165b · 2024-01-29T11:47:23.000+01:00
This PR was merged into the 7.1 branch. Discussion ---------- [Console] Remove needless state from `QuestionHelper` | Q | A | ------------- | --- | Branch? | 7.1 | Bug fix? | no | New feature? | no | Deprecations? | no | Issues | - | License | MIT Commits ------- d41a685 [Console] Remove needless state from QuestionHelper
diff --git a/src/Symfony/Component/Console/Helper/QuestionHelper.php b/src/Symfony/Component/Console/Helper/QuestionHelper.php
@@ -34,11 +34,6 @@
  */
 class QuestionHelper extends Helper
 {
-    /**
-     * @var resource|null
-     */
-    private $inputStream;
-
     private static bool $stty = true;
     private static bool $stdinIsInteractive;
 
@@ -59,16 +54,15 @@ public function ask(InputInterface $input, OutputInterface $output, Question $qu
             return $this->getDefaultAnswer($question);
         }
 
-        if ($input instanceof StreamableInputInterface && $stream = $input->getStream()) {
-            $this->inputStream = $stream;
-        }
+        $inputStream = $input instanceof StreamableInputInterface ? $input->getStream() : null;
+        $inputStream ??= STDIN;
 
         try {
             if (!$question->getValidator()) {
-                return $this->doAsk($output, $question);
+                return $this->doAsk($inputStream, $output, $question);
             }
 
-            $interviewer = fn () => $this->doAsk($output, $question);
+            $interviewer = fn () => $this->doAsk($inputStream, $output, $question);
 
             return $this->validateAttempts($interviewer, $output, $question);
         } catch (MissingInputException $exception) {
@@ -98,13 +92,14 @@ public static function disableStty(): void
     /**
      * Asks the question to the user.
      *
+     * @param resource $inputStream
+     *
      * @throws RuntimeException In case the fallback is deactivated and the response cannot be hidden
      */
-    private function doAsk(OutputInterface $output, Question $question): mixed
+    private function doAsk($inputStream, OutputInterface $output, Question $question): mixed
     {
         $this->writePrompt($output, $question);
 
-        $inputStream = $this->inputStream ?: \STDIN;
         $autocomplete = $question->getAutocompleterCallback();
 
         if (null === $autocomplete || !self::$stty || !Terminal::hasSttyAvailable()) {
