[Console] Fix Application::getSignalRegistry() retval

chalasr · chalasr · commit 119af3cef47f · 2020-10-16T14:39:30.000+02:00
diff --git a/src/Symfony/Component/Console/Application.php b/src/Symfony/Component/Console/Application.php
@@ -108,7 +108,7 @@ public function setCommandLoader(CommandLoaderInterface $commandLoader)
         $this->commandLoader = $commandLoader;
     }
 
-    public function getSignalRegistry(): SignalRegistry
+    public function getSignalRegistry(): ?SignalRegistry
     {
         return $this->signalRegistry;
     }
@@ -282,7 +282,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 +954,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
`@@ -108,7 +108,7 @@ public function setCommandLoader(CommandLoaderInterface $commandLoader)`
`108`	`108`	`$this->commandLoader = $commandLoader;`
`109`	`109`	`}`
`110`	`110`
`111`		`- public function getSignalRegistry(): SignalRegistry`
	`111`	`+ public function getSignalRegistry(): ?SignalRegistry`
`112`	`112`	`{`
`113`	`113`	`return $this->signalRegistry;`
`114`	`114`	`}`
`@@ -282,7 +282,7 @@ public function doRun(InputInterface $input, OutputInterface $output)`
`282`	`282`	`$command = $this->find($alternative);`
`283`	`283`	`}`
`284`	`284`
`285`		`- if ($this->dispatcher) {`
	`285`	`+ if ($this->dispatcher && $this->signalRegistry) {`
`286`	`286`	`foreach ($this->signalsToDispatchEvent as $signal) {`
`287`	`287`	`$event = new ConsoleSignalEvent($command, $input, $output, $signal);`
`288`	`288`
`@@ -954,7 +954,7 @@ protected function doRunCommand(Command $command, InputInterface $input, OutputI`
`954`	`954`	`}`
`955`	`955`
`956`	`956`	`if ($command instanceof SignalableCommandInterface) {`
`957`		`- if (!$this->signalsToDispatchEvent) {`
	`957`	`+ if (!$this->signalRegistry) {`
`958`	`958`	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`	`959`	`}`
`960`	`960`	`foreach ($command->getSubscribedSignals() as $signal) {`