From 9130c48be81858b83b63427c057af0318a56d382 Mon Sep 17 00:00:00 2001
From: Ben Thomson <git@alfreido.com>
Date: Fri, 19 Sep 2025 06:55:05 +0000
Subject: [PATCH] Limiting scope of signal handling based on environment

- Do not handle Linux signals if the PCNTL extension is unavailable. Artisan commands can still function without this extension - they just simply cannot handle termination signals.
- Prevent multiple registrations of the Windows signal handler if the  method is called multiple times.
- Remove specific checks for Windows signals - the handler only accepts two types of signals (CTRL+C or CTRL+BREAK) and both are termination signals.
---
 src/Console/Traits/HandlesCleanup.php | 31 ++++++++++++++++-----------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/src/Console/Traits/HandlesCleanup.php b/src/Console/Traits/HandlesCleanup.php
index d322f737a..4dad8f491 100644
--- a/src/Console/Traits/HandlesCleanup.php
+++ b/src/Console/Traits/HandlesCleanup.php
@@ -1,4 +1,6 @@
-<?php namespace Winter\Storm\Console\Traits;
+<?php
+
+namespace Winter\Storm\Console\Traits;
 
 /**
  * Console Command Trait that injects cross-platform signal handling to trigger
@@ -12,6 +14,8 @@
  */
 trait HandlesCleanup
 {
+    protected $windowsSignalHandlerRegistered = false;
+
     /**
      * Returns the process signals this command listens to
      * @see https://www.php.net/manual/en/pcntl.constants.php
@@ -20,15 +24,18 @@ trait HandlesCleanup
     public function getSubscribedSignals(): array
     {
         $signals = [];
+
         if (method_exists($this, 'handleCleanup')) {
             // Handle Windows OS
             if (PHP_OS_FAMILY === 'Windows') {
                 // Attach to Windows Ctrl+C & Ctrl+Break events
-                if (function_exists('sapi_windows_set_ctrl_handler')) {
-                    sapi_windows_set_ctrl_handler([$this, 'handleWindowsSignal'], true);
+                if (function_exists('sapi_windows_set_ctrl_handler') && !$this->windowsSignalHandlerRegistered) {
+                    if (sapi_windows_set_ctrl_handler([$this, 'handleWindowsSignal'], true)) {
+                        $this->windowsSignalHandlerRegistered = true;
+                    }
                 }
             // Handle Unix-like OS
-            } else {
+            } elseif (function_exists('pcntl_signal')) {
                 $signals = [SIGINT, SIGTERM, SIGQUIT];
             }
         }
@@ -51,7 +58,7 @@ public function handleSignal(int $signal, /* int|false $previousExitCode = 0 */)
         }
 
         // Exit cleanly at this point if this was a user termination
-        if (in_array($signal, [SIGINT, SIGQUIT])) {
+        if (function_exists('pcntl_signal') && in_array($signal, [SIGINT, SIGQUIT])) {
             return 0;
         }
 
@@ -64,16 +71,14 @@ public function handleSignal(int $signal, /* int|false $previousExitCode = 0 */)
     public function handleWindowsSignal(int $event): void
     {
         // Remove the handler
-        sapi_windows_set_ctrl_handler([$this, 'handleWindowsSignal'], false);
+        if ($this->windowsSignalHandlerRegistered) {
+            if (sapi_windows_set_ctrl_handler([$this, 'handleWindowsSignal'], false)) {
+                $this->windowsSignalHandlerRegistered = false;
+            }
+        }
 
         // Handle the signal
-        if (
-            method_exists($this, 'handleCleanup')
-            && (
-                $event === PHP_WINDOWS_EVENT_CTRL_C
-                || $event === PHP_WINDOWS_EVENT_CTRL_BREAK
-            )
-        ) {
+        if (method_exists($this, 'handleCleanup')) {
             $this->handleCleanup();
 
             // Exit cleanly at this point if this was a user termination