Merge branch '6.1' into 6.2

* 6.1:
  [Translation][Lokalize] Configure `replace_breaks` to prevent issues with multilines translations
  Improve message when shell is not detected
  ensure docblock compatibility with PhpStan's docblock parser
  Fix signal handlers called after event listeners and skip exit

Author: fabpot

Application.php

@@ -992,10 +992,6 @@ protected function doRunCommand(Command $command, InputInterface $input, OutputI
                         });
                     }
                 }
-
-                foreach ($commandSignals as $signal) {
-                    $this->signalRegistry->register($signal, [$command, 'handleSignal']);
-                }
             }
 
             if (null !== $this->dispatcher) {
@@ -1014,6 +1010,10 @@ protected function doRunCommand(Command $command, InputInterface $input, OutputI
                     });
                 }
             }
+
+            foreach ($commandSignals as $signal) {
+                $this->signalRegistry->register($signal, [$command, 'handleSignal']);
+            }
         }
 
         if (null === $this->dispatcher) {

Command/DumpCompletionCommand.php

@@ -102,8 +102,14 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         if (!file_exists($completionFile)) {
             $supportedShells = $this->getSupportedShells();
 
-            ($output instanceof ConsoleOutputInterface ? $output->getErrorOutput() : $output)
-                ->writeln(sprintf('<error>Detected shell "%s", which is not supported by Symfony shell completion (supported shells: "%s").</>', $shell, implode('", "', $supportedShells)));
+            if ($output instanceof ConsoleOutputInterface) {
+                $output = $output->getErrorOutput();
+            }
+            if ($shell) {
+                $output->writeln(sprintf('<error>Detected shell "%s", which is not supported by Symfony shell completion (supported shells: "%s").</>', $shell, implode('", "', $supportedShells)));
+            } else {
+                $output->writeln(sprintf('<error>Shell not detected, Symfony shell completion only supports "%s").</>', implode('", "', $supportedShells)));
+            }
 
             return self::INVALID;
         }

Tests/ApplicationTest.php

@@ -1991,6 +1991,21 @@ public function testSignalableCommandInterfaceWithoutSignals()
         $this->assertSame(0, $application->run(new ArrayInput(['signal'])));
     }
 
+    public function testSignalableCommandHandlerCalledAfterEventListener()
+    {
+        $command = new SignableCommand();
+
+        $subscriber = new SignalEventSubscriber();
+
+        $dispatcher = new EventDispatcher();
+        $dispatcher->addSubscriber($subscriber);
+
+        $application = $this->createSignalableApplication($command, $dispatcher);
+        $application->setSignalsToDispatchEvent(\SIGUSR1);
+        $this->assertSame(1, $application->run(new ArrayInput(['signal'])));
+        $this->assertSame([SignalEventSubscriber::class, SignableCommand::class], $command->signalHandlers);
+    }
+
     /**
      * @group tty
      */
@@ -2090,6 +2105,7 @@ public function isEnabled(): bool
 class BaseSignableCommand extends Command
 {
     public $signaled = false;
+    public $signalHandlers = [];
     public $loop = 1000;
     private $emitsSignal;
 
@@ -2127,6 +2143,7 @@ public function getSubscribedSignals(): array
     public function handleSignal(int $signal): void
     {
         $this->signaled = true;
+        $this->signalHandlers[] = __CLASS__;
     }
 }
 
@@ -2138,6 +2155,7 @@ public function onSignal(ConsoleSignalEvent $event): void
     {
         $this->signaled = true;
         $event->getCommand()->signaled = true;
+        $event->getCommand()->signalHandlers[] = __CLASS__;
     }
 
     public static function getSubscribedEvents(): array