Merge branch '6.0' into 6.1

xabbuh · xabbuh · commit 023fc74aad8e · 2022-08-09T11:57:18.000+02:00
* 6.0:
  clean up legacy test
  fix dispatch signal event check for compatibility with the contract interface
  ignore missing keys when mapping DateTime objects to uninitialized arrays
diff --git a/Application.php b/Application.php
@@ -959,9 +959,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.');
                 }
@@ -981,7 +980,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
`@@ -959,9 +959,8 @@ protected function doRunCommand(Command $command, InputInterface $input, OutputI`
`959`	`959`
`960`	`960`	`if ($this->signalsToDispatchEvent) {`
`961`	`961`	`$commandSignals = $command instanceof SignalableCommandInterface ? $command->getSubscribedSignals() : [];`
`962`		`- $dispatchSignals = $this->dispatcher && $this->dispatcher->hasListeners(ConsoleEvents::SIGNAL);`
`963`	`962`
`964`		`- if ($commandSignals \|\| $dispatchSignals) {`
	`963`	`+ if ($commandSignals \|\| null !== $this->dispatcher) {`
`965`	`964`	`if (!$this->signalRegistry) {`
`966`	`965`	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.');
`967`	`966`	`}`
`@@ -981,7 +980,7 @@ protected function doRunCommand(Command $command, InputInterface $input, OutputI`
`981`	`980`	`}`
`982`	`981`	`}`
`983`	`982`
`984`		`- if ($dispatchSignals) {`
	`983`	`+ if (null !== $this->dispatcher) {`
`985`	`984`	`foreach ($this->signalsToDispatchEvent as $signal) {`
`986`	`985`	`$event = new ConsoleSignalEvent($command, $input, $output, $signal);`
`987`	`986`