Extract dispatching console signal handling and include subscribers

GwendolenLynch · GwendolenLynch · commit f8385fdd911f · 2022-02-07T10:56:25.000+01:00
diff --git a/src/Symfony/Component/Console/Application.php b/src/Symfony/Component/Console/Application.php
@@ -989,26 +989,13 @@ protected function doRunCommand(Command $command, InputInterface $input, OutputI
                 }
             }
 
-            if ($this->dispatcher) {
-                foreach ($this->signalsToDispatchEvent as $signal) {
-                    $event = new ConsoleSignalEvent($command, $input, $output, $signal);
-
-                    $this->signalRegistry->register($signal, function ($signal, $hasNext) use ($event) {
-                        $this->dispatcher->dispatch($event, ConsoleEvents::SIGNAL);
-
-                        // No more handlers, we try to simulate PHP default behavior
-                        if (!$hasNext) {
-                            if (!\in_array($signal, [\SIGUSR1, \SIGUSR2], true)) {
-                                exit(0);
-                            }
-                        }
-                    });
-                }
-            }
+            $this->dispatchSignalEvents($command, $input, $output);
 
             foreach ($command->getSubscribedSignals() as $signal) {
                 $this->signalRegistry->register($signal, [$command, 'handleSignal']);
             }
+        } elseif ($this->dispatcher && $this->dispatcher->getListeners(ConsoleEvents::SIGNAL)) {
+            $this->dispatchSignalEvents($command, $input, $output);
         }
 
         if (null === $this->dispatcher) {
@@ -1107,6 +1094,28 @@ protected function getDefaultHelperSet()
         ]);
     }
 
+    private function dispatchSignalEvents(Command $command, InputInterface $input, OutputInterface $output)
+    {
+        if (!$this->dispatcher) {
+            return;
+        }
+
+        foreach ($this->signalsToDispatchEvent as $signal) {
+            $event = new ConsoleSignalEvent($command, $input, $output, $signal);
+
+            $this->signalRegistry->register($signal, function ($signal, $hasNext) use ($event) {
+                $this->dispatcher->dispatch($event, ConsoleEvents::SIGNAL);
+
+                // No more handlers, we try to simulate PHP default behavior
+                if (!$hasNext) {
+                    if (!\in_array($signal, [\SIGUSR1, \SIGUSR2], true)) {
+                        exit(0);
+                    }
+                }
+            });
+        }
+    }
+
     /**
      * Returns abbreviated suggestions in string format.
      */
