Merge branch '6.0' into 6.1

fabpot · fabpot · commit 4d3a4bf8f54a · 2022-11-19T15:35:50.000+01:00
* 6.0:
  [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
diff --git a/src/Symfony/Component/Console/Application.php b/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) {
diff --git a/src/Symfony/Component/Console/Command/DumpCompletionCommand.php b/src/Symfony/Component/Console/Command/DumpCompletionCommand.php
@@ -101,8 +101,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;
         }
diff --git a/src/Symfony/Component/Console/Tests/ApplicationTest.php b/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
      */
@@ -2074,6 +2089,7 @@ public function isEnabled(): bool
 class BaseSignableCommand extends Command
 {
     public $signaled = false;
+    public $signalHandlers = [];
     public $loop = 1000;
     private $emitsSignal;
 
@@ -2111,6 +2127,7 @@ public function getSubscribedSignals(): array
     public function handleSignal(int $signal): void
     {
         $this->signaled = true;
+        $this->signalHandlers[] = __CLASS__;
     }
 }
 
@@ -2122,6 +2139,7 @@ public function onSignal(ConsoleSignalEvent $event): void
     {
         $this->signaled = true;
         $event->getCommand()->signaled = true;
+        $event->getCommand()->signalHandlers[] = __CLASS__;
     }
 
     public static function getSubscribedEvents(): array
diff --git a/src/Symfony/Component/PropertyInfo/Tests/Fixtures/Dummy.php b/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;
 
diff --git a/src/Symfony/Component/Translation/Bridge/Lokalise/LokaliseProvider.php b/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,
             ],
         ]);
 
diff --git a/src/Symfony/Component/Translation/Bridge/Lokalise/Tests/LokaliseProviderTest.php b/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);

Original file line number	Diff line number	Diff line change
`@@ -986,10 +986,6 @@ protected function doRunCommand(Command $command, InputInterface $input, OutputI`
`986`	`986`	`});`
`987`	`987`	`}`
`988`	`988`	`}`
`989`		`-`
`990`		`- foreach ($commandSignals as $signal) {`
`991`		`- $this->signalRegistry->register($signal, [$command, 'handleSignal']);`
`992`		`- }`
`993`	`989`	`}`
`994`	`990`
`995`	`991`	`if (null !== $this->dispatcher) {`
`@@ -1008,6 +1004,10 @@ protected function doRunCommand(Command $command, InputInterface $input, OutputI`
`1008`	`1004`	`});`
`1009`	`1005`	`}`
`1010`	`1006`	`}`
	`1007`	`+`
	`1008`	`+ foreach ($commandSignals as $signal) {`
	`1009`	`+ $this->signalRegistry->register($signal, [$command, 'handleSignal']);`
	`1010`	`+ }`
`1011`	`1011`	`}`
`1012`	`1012`
`1013`	`1013`	`if (null === $this->dispatcher) {`
Original file line number	Diff line number	Diff line change
`@@ -1975,6 +1975,21 @@ public function testSignalableCommandInterfaceWithoutSignals()`
`1975`	`1975`	`$this->assertSame(0, $application->run(new ArrayInput(['signal'])));`
`1976`	`1976`	`}`
`1977`	`1977`
	`1978`	`+ public function testSignalableCommandHandlerCalledAfterEventListener()`
	`1979`	`+ {`
	`1980`	`+ $command = new SignableCommand();`
	`1981`	`+`
	`1982`	`+ $subscriber = new SignalEventSubscriber();`
	`1983`	`+`
	`1984`	`+ $dispatcher = new EventDispatcher();`
	`1985`	`+ $dispatcher->addSubscriber($subscriber);`
	`1986`	`+`
	`1987`	`+ $application = $this->createSignalableApplication($command, $dispatcher);`
	`1988`	`+ $application->setSignalsToDispatchEvent(\SIGUSR1);`
	`1989`	`+ $this->assertSame(1, $application->run(new ArrayInput(['signal'])));`
	`1990`	`+ $this->assertSame([SignalEventSubscriber::class, SignableCommand::class], $command->signalHandlers);`
	`1991`	`+ }`
	`1992`	`+`
`1978`	`1993`	`/**`
`1979`	`1994`	`* @group tty`
`1980`	`1995`	`*/`
`@@ -2074,6 +2089,7 @@ public function isEnabled(): bool`
`2074`	`2089`	`class BaseSignableCommand extends Command`
`2075`	`2090`	`{`
`2076`	`2091`	`public $signaled = false;`
	`2092`	`+ public $signalHandlers = [];`
`2077`	`2093`	`public $loop = 1000;`
`2078`	`2094`	`private $emitsSignal;`
`2079`	`2095`
`@@ -2111,6 +2127,7 @@ public function getSubscribedSignals(): array`
`2111`	`2127`	`public function handleSignal(int $signal): void`
`2112`	`2128`	`{`
`2113`	`2129`	`$this->signaled = true;`
	`2130`	`+ $this->signalHandlers[] = __CLASS__;`
`2114`	`2131`	`}`
`2115`	`2132`	`}`
`2116`	`2133`
`@@ -2122,6 +2139,7 @@ public function onSignal(ConsoleSignalEvent $event): void`
`2122`	`2139`	`{`
`2123`	`2140`	`$this->signaled = true;`
`2124`	`2141`	`$event->getCommand()->signaled = true;`
	`2142`	`+ $event->getCommand()->signalHandlers[] = __CLASS__;`
`2125`	`2143`	`}`
`2126`	`2144`
`2127`	`2145`	`public static function getSubscribedEvents(): array`