Ensure signalHandler is kept around and unregistered

emahorvat52 · Jan 18, 2023 · 04c41c2 · 04c41c2
1 parent f805a7b
commit 04c41c2
Showing 1 changed file with 13 additions and 5 deletions.
diff --git a/src/Composer/Console/Application.php b/src/Composer/Console/Application.php
@@ -81,6 +81,9 @@ class Application extends BaseApplication
      */
     private $initialWorkingDirectory;
 
+    /** @var SignalHandler */
+    private $signalHandler;
+
     public function __construct()
     {
         static $shutdownRegistered = false;
@@ -96,13 +99,13 @@ public function __construct()
 
         $this->io = new NullIO();
 
-        if (!$shutdownRegistered) {
-            $signalHandler = SignalHandler::create([SignalHandler::SIGINT, SignalHandler::SIGTERM, SignalHandler::SIGHUP], function (string $signal, SignalHandler $handler) {
-                $this->io->writeError('Received '.$signal.', aborting', true, IOInterface::DEBUG);
+        $this->signalHandler = SignalHandler::create([SignalHandler::SIGINT, SignalHandler::SIGTERM, SignalHandler::SIGHUP], function (string $signal, SignalHandler $handler) {
+            $this->io->writeError('Received '.$signal.', aborting', true, IOInterface::DEBUG);
 
-                $handler->exitWithLastSignal();
-            });
+            $handler->exitWithLastSignal();
+        });
 
+        if (!$shutdownRegistered) {
             $shutdownRegistered = true;
 
             register_shutdown_function(static function (): void {
@@ -121,6 +124,11 @@ public function __construct()
         parent::__construct('Composer', Composer::getVersion());
     }
 
+    public function __destruct()
+    {
+        $this->signalHandler->unregister();
+    }
+
     public function run(InputInterface $input = null, OutputInterface $output = null): int
     {
         if (null === $output) {