Merge branch '5.4' into 6.0

* 5.4:
  [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

src/Symfony/Component/Console/Application.php

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

src/Symfony/Component/Console/Command/DumpCompletionCommand.php

@@ -93,8 +93,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;
         }

src/Symfony/Component/Console/Tests/ApplicationTest.php

@@ -1975,6 +1975,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
      */
@@ -2073,6 +2088,7 @@ public function isEnabled(): bool
 class BaseSignableCommand extends Command
 {
     public $signaled = false;
+    public $signalHandlers = [];
     public $loop = 1000;
     private $emitsSignal;
 
@@ -2113,6 +2129,7 @@ public function getSubscribedSignals(): array
     public function handleSignal(int $signal): void
     {
         $this->signaled = true;
+        $this->signalHandlers[] = __CLASS__;
     }
 }
 
@@ -2124,6 +2141,7 @@ public function onSignal(ConsoleSignalEvent $event): void
     {
         $this->signaled = true;
         $event->getCommand()->signaled = true;
+        $event->getCommand()->signalHandlers[] = __CLASS__;
     }
 
     public static function getSubscribedEvents(): array

src/Symfony/Component/PropertyInfo/Tests/Fixtures/Dummy.php

@@ -84,7 +84,7 @@ class Dummy extends ParentDummy
     public $h;
 
     /**
-     * @var ?string|int
+     * @var string|int|null
      */
     public $i;
 

src/Symfony/Component/Translation/Bridge/Lokalise/LokaliseProvider.php

@@ -151,6 +151,7 @@ private function exportFiles(array $locales, array $domains): array
                 'filter_langs' => array_values($locales),
                 'filter_filenames' => array_map([$this, 'getLokaliseFilenameFromDomain'], $domains),
                 'export_empty_as' => 'skip',
+                'replace_breaks' => false,
             ],
         ]);
 

src/Symfony/Component/Translation/Bridge/Lokalise/Tests/LokaliseProviderTest.php

@@ -562,6 +562,7 @@ public function testReadForOneLocaleAndOneDomain(string $locale, string $domain,
                 'filter_langs' => [$locale],
                 'filter_filenames' => [$domain.'.xliff'],
                 'export_empty_as' => 'skip',
+                'replace_breaks' => false,
             ]);
 
             $this->assertSame('POST', $method);