Cleaning up

src/mako/application/cli/Application.php

@@ -155,11 +155,15 @@ protected function startReactor(): void
 
 		$this->container->registerInstance(SignalHandler::class, $signalHandler);
 
-		// Ensure that the cursor is restored in case of a SIGINT call
+		// Ensure that the cursor and stty are restored in case of a SIGINT call
 
 		if ($signalHandler->canHandleSignals()) {
 			$signalHandler->addHandler(SIGINT, function ($signal, $isLast) use ($output): void {
 				$output->getCursor()->restore();
+				$output->getEnvironment()->restoreStty();
+
+				// If we're the last handler then we exit with status code 130 (SIGINT)
+
 				if ($isLast) {
 					exit(130);
 				}

src/mako/cli/Environment.php

@@ -32,6 +32,70 @@ class Environment
 	 */
 	protected null|bool $hasAnsiSupport = null;
 
+	/**
+	 * Do we have stty support?
+	 */
+	protected null|bool $hasStty = null;
+
+	/**
+	 * Stty settings.
+	 */
+	protected ?string $sttySettings = null;
+
+	/**
+	 * Constructor.
+	 */
+	public function __construct()
+	{
+		if ($this->hasStty()) {
+			$this->sttySettings = shell_exec('stty -g');
+		}
+	}
+
+	/**
+	 * Destructor.
+	 */
+	public function __destruct()
+	{
+		$this->restoreStty();
+	}
+
+	/**
+	 * Do we have ANSI support?
+	 */
+	public function hasAnsiSupport(): bool
+	{
+		if ($this->hasAnsiSupport === null) {
+			$this->hasAnsiSupport = PHP_OS_FAMILY !== 'Windows' || (env('ANSICON') !== null || env('ConEmuANSI') === 'ON');
+		}
+
+		return $this->hasAnsiSupport;
+	}
+
+	/**
+	 * Do we have stty support?
+	 */
+	public function hasStty(): bool
+	{
+		if ($this->hasStty === null) {
+			exec('stty 2>&1', $output, $status);
+
+			$this->hasStty = $status === 0;
+		}
+
+		return $this->hasStty;
+	}
+
+	/**
+	 * Restores the stty settings.
+	 */
+	public function restoreStty(): void
+	{
+		if ($this->sttySettings !== null) {
+			exec("stty {$this->sttySettings}");
+		}
+	}
+
 	/**
 	 * Attempts to get dimensions for Windows.
 	 */
@@ -93,16 +157,4 @@ public function getHeight(): int
 	{
 		return $this->getDimensions()['height'];
 	}
-
-	/**
-	 * Do we have ANSI support?
-	 */
-	public function hasAnsiSupport(): bool
-	{
-		if ($this->hasAnsiSupport === null) {
-			$this->hasAnsiSupport = PHP_OS_FAMILY !== 'Windows' || (env('ANSICON') !== null || env('ConEmuANSI') === 'ON');
-		}
-
-		return $this->hasAnsiSupport;
-	}
 }

src/mako/cli/input/helpers/Secret.php

@@ -19,31 +19,12 @@
  */
 class Secret extends Question
 {
-	/**
-	 * Do we have stty support?
-	 */
-	protected static null|bool $hasStty = null;
-
-	/**
-	 * Do we have stty support?
-	 */
-	protected function hasStty(): bool
-	{
-		if (static::$hasStty === null) {
-			exec('stty 2>&1', $output, $status);
-
-			static::$hasStty = $status === 0;
-		}
-
-		return static::$hasStty;
-	}
-
 	/**
 	 * Writes question to output and returns hidden user input.
 	 */
 	public function ask(string $question, mixed $default = null, bool $fallback = false): mixed
 	{
-		if (PHP_OS_FAMILY === 'Windows' || $this->hasStty()) {
+		if (PHP_OS_FAMILY === 'Windows' || $this->output->getEnvironment()->hasStty()) {
 			$this->output->write(trim($question) . ' ');
 
 			if (PHP_OS_FAMILY === 'Windows') {