bug #38602 [Console] Fix signal management (chalasr)

lyrixx · lyrixx · commit 6088728c5e2c · 2020-10-16T15:19:45.000+02:00
This PR was merged into the 5.x branch. Discussion ---------- [Console] Fix signal management | Q | A | ------------- | --- | Branch? | 5.2 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | - | License | MIT | Doc PR | - Missed in #38589 Commits ------- 36e41b8 [Console] Fix Application::getSignalRegistry() retval
diff --git a/src/Symfony/Component/Console/Application.php b/src/Symfony/Component/Console/Application.php
@@ -110,6 +110,10 @@ public function setCommandLoader(CommandLoaderInterface $commandLoader)
 
     public function getSignalRegistry(): SignalRegistry
     {
+        if (!$this->signalRegistry) {
+            throw new RuntimeException('Signals are not supported. Make sure that the `pcntl` extension is installed and that "pcntl_*" functions are not disabled by your php.ini\'s "disable_functions" directive.');
+        }
+
         return $this->signalRegistry;
     }
 
@@ -282,7 +286,7 @@ public function doRun(InputInterface $input, OutputInterface $output)
             $command = $this->find($alternative);
         }
 
-        if ($this->dispatcher) {
+        if ($this->dispatcher && $this->signalRegistry) {
             foreach ($this->signalsToDispatchEvent as $signal) {
                 $event = new ConsoleSignalEvent($command, $input, $output, $signal);
 
@@ -954,7 +958,7 @@ protected function doRunCommand(Command $command, InputInterface $input, OutputI
         }
 
         if ($command instanceof SignalableCommandInterface) {
-            if (!$this->signalsToDispatchEvent) {
+            if (!$this->signalRegistry) {
                 throw new RuntimeException('Unable to subscribe to signal events. Make sure that the `pcntl` extension is installed and that "pcntl_*" functions are not disabled by your php.ini\'s "disable_functions" directive.');
             }
             foreach ($command->getSubscribedSignals() as $signal) {

Original file line number	Diff line number	Diff line change
`@@ -110,6 +110,10 @@ public function setCommandLoader(CommandLoaderInterface $commandLoader)`
`110`	`110`
`111`	`111`	`public function getSignalRegistry(): SignalRegistry`
`112`	`112`	`{`
	`113`	`+ if (!$this->signalRegistry) {`
	`114`	+ throw new RuntimeException('Signals are not supported. Make sure that the `pcntl` extension is installed and that "pcntl_*" functions are not disabled by your php.ini\'s "disable_functions" directive.');
	`115`	`+ }`
	`116`	`+`
`113`	`117`	`return $this->signalRegistry;`
`114`	`118`	`}`
`115`	`119`
`@@ -282,7 +286,7 @@ public function doRun(InputInterface $input, OutputInterface $output)`
`282`	`286`	`$command = $this->find($alternative);`
`283`	`287`	`}`
`284`	`288`
`285`		`- if ($this->dispatcher) {`
	`289`	`+ if ($this->dispatcher && $this->signalRegistry) {`
`286`	`290`	`foreach ($this->signalsToDispatchEvent as $signal) {`
`287`	`291`	`$event = new ConsoleSignalEvent($command, $input, $output, $signal);`
`288`	`292`
`@@ -954,7 +958,7 @@ protected function doRunCommand(Command $command, InputInterface $input, OutputI`
`954`	`958`	`}`
`955`	`959`
`956`	`960`	`if ($command instanceof SignalableCommandInterface) {`
`957`		`- if (!$this->signalsToDispatchEvent) {`
	`961`	`+ if (!$this->signalRegistry) {`
`958`	`962`	throw new RuntimeException('Unable to subscribe to signal events. Make sure that the `pcntl` extension is installed and that "pcntl_*" functions are not disabled by your php.ini\'s "disable_functions" directive.');
`959`	`963`	`}`
`960`	`964`	`foreach ($command->getSubscribedSignals() as $signal) {`