Replace shutdown handlers with destructors

src/Concerns/Events.php

@@ -30,4 +30,12 @@ public function emit(string $event, mixed ...$data): void
             $listener(...$data);
         }
     }
+
+    /**
+     * Clean the event listeners.
+     */
+    public function clearListeners(): void
+    {
+        $this->listeners = [];
+    }
 }

src/Prompt.php

@@ -74,52 +74,48 @@ abstract public function value(): mixed;
      */
     public function prompt(): mixed
     {
-        static::$interactive ??= stream_isatty(STDIN);
-
-        if (! static::$interactive) {
-            return $this->default();
-        }
+        try {
+            static::$interactive ??= stream_isatty(STDIN);
 
-        $this->capturePreviousNewLines();
+            if (! static::$interactive) {
+                return $this->default();
+            }
 
-        if (static::shouldFallback()) {
-            return $this->fallback();
-        }
+            $this->capturePreviousNewLines();
 
-        $this->checkEnvironment();
+            if (static::shouldFallback()) {
+                return $this->fallback();
+            }
 
-        try {
-            static::terminal()->setTty('-icanon -isig -echo');
-        } catch (Throwable $e) {
-            static::output()->writeln("<comment>{$e->getMessage()}</comment>");
-            static::fallbackWhen(true);
+            $this->checkEnvironment();
 
-            return $this->fallback();
-        }
+            try {
+                static::terminal()->setTty('-icanon -isig -echo');
+            } catch (Throwable $e) {
+                static::output()->writeln("<comment>{$e->getMessage()}</comment>");
+                static::fallbackWhen(true);
 
-        register_shutdown_function(function () {
-            $this->restoreCursor();
-            static::terminal()->restoreTty();
-        });
+                return $this->fallback();
+            }
 
-        $this->hideCursor();
-        $this->render();
+            $this->hideCursor();
+            $this->render();
 
-        while (($key = static::terminal()->read()) !== null) {
-            $continue = $this->handleKeyPress($key);
+            while (($key = static::terminal()->read()) !== null) {
+                $continue = $this->handleKeyPress($key);
 
-            $this->render();
+                $this->render();
 
-            if ($continue === false || $key === Key::CTRL_C) {
-                $this->restoreCursor();
-                static::terminal()->restoreTty();
+                if ($continue === false || $key === Key::CTRL_C) {
+                    if ($key === Key::CTRL_C) {
+                        static::terminal()->exit();
+                    }
 
-                if ($key === Key::CTRL_C) {
-                    static::terminal()->exit();
+                    return $this->value();
                 }
-
-                return $this->value();
             }
+        } finally {
+            $this->clearListeners();
         }
     }
 
@@ -343,4 +339,14 @@ private function checkEnvironment(): void
             throw new RuntimeException('Prompts is not currently supported on Windows. Please use WSL or configure a fallback.');
         }
     }
+
+    /**
+     * Restore the cursor and terminal state.
+     */
+    public function __destruct()
+    {
+        $this->restoreCursor();
+
+        static::terminal()->restoreTty();
+    }
 }

src/Spinner.php

@@ -22,6 +22,11 @@ class Spinner extends Prompt
      */
     public bool $static = false;
 
+    /**
+     * The process ID after forking.
+     */
+    protected int $pid;
+
     /**
      * Create a new Spinner instance.
      */
@@ -42,8 +47,6 @@ public function spin(Closure $callback): mixed
     {
         $this->capturePreviousNewLines();
 
-        register_shutdown_function(fn () => $this->restoreCursor());
-
         if (! function_exists('pcntl_fork')) {
             return $this->renderStatically($callback);
         }
@@ -56,9 +59,9 @@ public function spin(Closure $callback): mixed
             $this->hideCursor();
             $this->render();
 
-            $pid = pcntl_fork();
+            $this->pid = pcntl_fork();
 
-            if ($pid === 0) {
+            if ($this->pid === 0) {
                 while (true) { // @phpstan-ignore-line
                     $this->render();
 
@@ -67,12 +70,8 @@ public function spin(Closure $callback): mixed
                     usleep($this->interval * 1000);
                 }
             } else {
-                register_shutdown_function(fn () => posix_kill($pid, SIGHUP));
-
                 $result = $callback();
 
-                posix_kill($pid, SIGHUP);
-
                 $this->resetTerminal($originalAsync);
 
                 return $result;
@@ -93,7 +92,6 @@ protected function resetTerminal(bool $originalAsync): void
         pcntl_signal(SIGINT, SIG_DFL);
 
         $this->eraseRenderedLines();
-        $this->showCursor();
     }
 
     /**
@@ -115,7 +113,6 @@ protected function renderStatically(Closure $callback): mixed
             $result = $callback();
         } finally {
             $this->eraseRenderedLines();
-            $this->showCursor();
         }
 
         return $result;
@@ -148,4 +145,16 @@ protected function eraseRenderedLines(): void
         $this->moveCursor(-999, -count($lines) + 1);
         $this->eraseDown();
     }
+
+    /**
+     * Clean up after the spinner.
+     */
+    public function __destruct()
+    {
+        parent::__destruct();
+
+        if (! empty($this->pid)) {
+            posix_kill($this->pid, SIGHUP);
+        }
+    }
 }

src/Terminal.php

@@ -47,7 +47,7 @@ public function setTty(string $mode): void
      */
     public function restoreTty(): void
     {
-        if ($this->initialTtyMode) {
+        if (isset($this->initialTtyMode)) {
             $this->exec("stty {$this->initialTtyMode}");
 
             $this->initialTtyMode = null;