bug #47218 [Console] fix dispatch signal event check for compatibility with the contract interface (xabbuh)

fabpot · fabpot · commit 458b29488afb · 2022-08-09T10:48:17.000+02:00
This PR was merged into the 5.4 branch. Discussion ---------- [Console] fix dispatch signal event check for compatibility with the contract interface | Q | A | ------------- | --- | Branch? | 5.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | Fix #45333 (comment) | License | MIT | Doc PR | Commits ------- 6b29591 fix dispatch signal event check for compatibility with the contract interface
diff --git a/src/Symfony/Component/Console/Application.php b/src/Symfony/Component/Console/Application.php
@@ -985,9 +985,8 @@ protected function doRunCommand(Command $command, InputInterface $input, OutputI
 
         if ($this->signalsToDispatchEvent) {
             $commandSignals = $command instanceof SignalableCommandInterface ? $command->getSubscribedSignals() : [];
-            $dispatchSignals = $this->dispatcher && $this->dispatcher->hasListeners(ConsoleEvents::SIGNAL);
 
-            if ($commandSignals || $dispatchSignals) {
+            if ($commandSignals || null !== $this->dispatcher) {
                 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.');
                 }
@@ -1007,7 +1006,7 @@ protected function doRunCommand(Command $command, InputInterface $input, OutputI
                 }
             }
 
-            if ($dispatchSignals) {
+            if (null !== $this->dispatcher) {
                 foreach ($this->signalsToDispatchEvent as $signal) {
                     $event = new ConsoleSignalEvent($command, $input, $output, $signal);
 

Original file line number	Diff line number	Diff line change
`@@ -985,9 +985,8 @@ protected function doRunCommand(Command $command, InputInterface $input, OutputI`
`985`	`985`
`986`	`986`	`if ($this->signalsToDispatchEvent) {`
`987`	`987`	`$commandSignals = $command instanceof SignalableCommandInterface ? $command->getSubscribedSignals() : [];`
`988`		`- $dispatchSignals = $this->dispatcher && $this->dispatcher->hasListeners(ConsoleEvents::SIGNAL);`
`989`	`988`
`990`		`- if ($commandSignals \|\| $dispatchSignals) {`
	`989`	`+ if ($commandSignals \|\| null !== $this->dispatcher) {`
`991`	`990`	`if (!$this->signalRegistry) {`
`992`	`991`	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.');
`993`	`992`	`}`
`@@ -1007,7 +1006,7 @@ protected function doRunCommand(Command $command, InputInterface $input, OutputI`
`1007`	`1006`	`}`
`1008`	`1007`	`}`
`1009`	`1008`
`1010`		`- if ($dispatchSignals) {`
	`1009`	`+ if (null !== $this->dispatcher) {`
`1011`	`1010`	`foreach ($this->signalsToDispatchEvent as $signal) {`
`1012`	`1011`	`$event = new ConsoleSignalEvent($command, $input, $output, $signal);`
`1013`	`1012`