symfony
diff --git a/‎src/Symfony/Component/Console/Application.php‎
Lines changed: 1 addition & 0 deletions b/‎src/Symfony/Component/Console/Application.php‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎src/Symfony/Component/Console/Helper/QuestionHelper.php‎
Lines changed: 11 additions & 6 deletions b/‎src/Symfony/Component/Console/Helper/QuestionHelper.php‎
Lines changed: 11 additions & 6 deletions
diff --git a/‎src/Symfony/Component/Console/Terminal.php‎
Lines changed: 37 additions & 0 deletions b/‎src/Symfony/Component/Console/Terminal.php‎
Lines changed: 37 additions & 0 deletions
@@ -957,6 +957,7 @@ protected function doRunCommand(Command $command, InputInterface $input, OutputI
                     $event = new ConsoleSignalEvent($command, $input, $output, $signal);
 
                     $this->signalRegistry->register($signal, function ($signal, $hasNext) use ($event) {
+                        Terminal::restoreSttyMode();
                         $this->dispatcher->dispatch($event, ConsoleEvents::SIGNAL);
 
                         // No more handlers, we try to simulate PHP default behavior
 
@@ -247,7 +247,7 @@ private function autocomplete(OutputInterface $output, Question $question, $inpu
         $matches = $autocomplete($ret);
         $numMatches = \count($matches);
 
-        $sttyMode = shell_exec('stty -g');
+        $sttyMode = Terminal::backupSttyMode();
 
         // Disable icanon (so we can fread each keypress) and echo (we'll do echoing here instead)
         shell_exec('stty -icanon -echo');
@@ -257,11 +257,17 @@ private function autocomplete(OutputInterface $output, Question $question, $inpu
 
         // Read a keypress
         while (!feof($inputStream)) {
+            do {
+                // Give signal handlers a chance to run
+                $r = [$inputStream];
+                $w = [];
+            } while (0 === @stream_select($r, $w, $w, 0, 100));
+
             $c = fread($inputStream, 1);
 
             // as opposed to fgets(), fread() returns an empty string when the stream content is empty, not false.
             if (false === $c || ('' === $ret && '' === $c && null === $question->getDefault())) {
-                shell_exec(sprintf('stty %s', $sttyMode));
+                Terminal::restoreSttyMode($sttyMode);
                 throw new MissingInputException('Aborted.');
             } elseif ("\177" === $c) { // Backspace Character
                 if (0 === $numMatches && 0 !== $i) {
@@ -365,8 +371,7 @@ function ($match) use ($ret) {
             }
         }
 
-        // Reset stty so it behaves normally again
-        shell_exec(sprintf('stty %s', $sttyMode));
+        Terminal::restoreSttyMode($sttyMode);
 
         return $fullChoice;
     }
@@ -418,7 +423,7 @@ private function getHiddenResponse(OutputInterface $output, $inputStream, bool $
         }
 
         if (self::$stty && Terminal::hasSttyAvailable()) {
-            $sttyMode = shell_exec('stty -g');
+            $sttyMode = Terminal::backupSttyMode();
             shell_exec('stty -echo');
         } elseif ($this->isInteractiveInput($inputStream)) {
             throw new RuntimeException('Unable to hide the response.');
@@ -427,7 +432,7 @@ private function getHiddenResponse(OutputInterface $output, $inputStream, bool $
         $value = fgets($inputStream, 4096);
 
         if (self::$stty && Terminal::hasSttyAvailable()) {
-            shell_exec(sprintf('stty %s', $sttyMode));
+            Terminal::restoreSttyMode($sttyMode);
         }
 
         if (false === $value) {
 
@@ -16,6 +16,8 @@ class Terminal
     private static $width;
     private static $height;
     private static $stty;
+    private static $sttyMode;
+    private static $sttyLevel = 0;
 
     /**
      * Gets the terminal width.
@@ -76,6 +78,41 @@ public static function hasSttyAvailable()
         return self::$stty = 0 === $exitcode;
     }
 
+    /**
+     * @internal
+     */
+    public static function backupSttyMode(): string
+    {
+        $sttyMode = shell_exec('stty -g');
+
+        if (!self::$sttyLevel++) {
+            self::$sttyMode = $sttyMode;
+        }
+
+        return $sttyMode;
+    }
+
+    /**
+     * @internal
+     */
+    public static function restoreSttymode(string $sttyMode = null): void
+    {
+        if (null === $sttyMode) {
+            $sttyMode = self::$sttyMode;
+            self::$sttyLevel = 0;
+        } elseif (0 < self::$sttyLevel) {
+            --self::$sttyLevel;
+        }
+
+        if (!self::$sttyLevel) {
+            self::$sttyMode = null;
+        }
+
+        if (null !== $sttyMode) {
+            shell_exec('stty '.$sttyMode);
+        }
+    }
+
     private static function initDimensions()
     {
         if ('\\' === \DIRECTORY_SEPARATOR) {