Merge branch '6.1' into 6.2

fabpot · fabpot · commit e9cc81a48dae · 2022-11-19T15:35:57.000+01:00
* 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
diff --git a/src/Symfony/Component/Console/Application.php b/src/Symfony/Component/Console/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) {
diff --git a/src/Symfony/Component/Console/Command/DumpCompletionCommand.php b/src/Symfony/Component/Console/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;
         }
diff --git a/src/Symfony/Component/Console/Tests/ApplicationTest.php b/src/Symfony/Component/Console/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
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
@@ -149,6 +149,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
`@@ -992,10 +992,6 @@ protected function doRunCommand(Command $command, InputInterface $input, OutputI`
`992`	`992`	`});`
`993`	`993`	`}`
`994`	`994`	`}`
`995`		`-`
`996`		`- foreach ($commandSignals as $signal) {`
`997`		`- $this->signalRegistry->register($signal, [$command, 'handleSignal']);`
`998`		`- }`
`999`	`995`	`}`
`1000`	`996`
`1001`	`997`	`if (null !== $this->dispatcher) {`
`@@ -1014,6 +1010,10 @@ protected function doRunCommand(Command $command, InputInterface $input, OutputI`
`1014`	`1010`	`});`
`1015`	`1011`	`}`
`1016`	`1012`	`}`
	`1013`	`+`
	`1014`	`+ foreach ($commandSignals as $signal) {`
	`1015`	`+ $this->signalRegistry->register($signal, [$command, 'handleSignal']);`
	`1016`	`+ }`
`1017`	`1017`	`}`
`1018`	`1018`
`1019`	`1019`	`if (null === $this->dispatcher) {`
Original file line number	Diff line number	Diff line change
`@@ -1991,6 +1991,21 @@ public function testSignalableCommandInterfaceWithoutSignals()`
`1991`	`1991`	`$this->assertSame(0, $application->run(new ArrayInput(['signal'])));`
`1992`	`1992`	`}`
`1993`	`1993`
	`1994`	`+ public function testSignalableCommandHandlerCalledAfterEventListener()`
	`1995`	`+ {`
	`1996`	`+ $command = new SignableCommand();`
	`1997`	`+`
	`1998`	`+ $subscriber = new SignalEventSubscriber();`
	`1999`	`+`
	`2000`	`+ $dispatcher = new EventDispatcher();`
	`2001`	`+ $dispatcher->addSubscriber($subscriber);`
	`2002`	`+`
	`2003`	`+ $application = $this->createSignalableApplication($command, $dispatcher);`
	`2004`	`+ $application->setSignalsToDispatchEvent(\SIGUSR1);`
	`2005`	`+ $this->assertSame(1, $application->run(new ArrayInput(['signal'])));`
	`2006`	`+ $this->assertSame([SignalEventSubscriber::class, SignableCommand::class], $command->signalHandlers);`
	`2007`	`+ }`
	`2008`	`+`
`1994`	`2009`	`/**`
`1995`	`2010`	`* @group tty`
`1996`	`2011`	`*/`
`@@ -2090,6 +2105,7 @@ public function isEnabled(): bool`
`2090`	`2105`	`class BaseSignableCommand extends Command`
`2091`	`2106`	`{`
`2092`	`2107`	`public $signaled = false;`
	`2108`	`+ public $signalHandlers = [];`
`2093`	`2109`	`public $loop = 1000;`
`2094`	`2110`	`private $emitsSignal;`
`2095`	`2111`
`@@ -2127,6 +2143,7 @@ public function getSubscribedSignals(): array`
`2127`	`2143`	`public function handleSignal(int $signal): void`
`2128`	`2144`	`{`
`2129`	`2145`	`$this->signaled = true;`
	`2146`	`+ $this->signalHandlers[] = __CLASS__;`
`2130`	`2147`	`}`
`2131`	`2148`	`}`
`2132`	`2149`
`@@ -2138,6 +2155,7 @@ public function onSignal(ConsoleSignalEvent $event): void`
`2138`	`2155`	`{`
`2139`	`2156`	`$this->signaled = true;`
`2140`	`2157`	`$event->getCommand()->signaled = true;`
	`2158`	`+ $event->getCommand()->signalHandlers[] = __CLASS__;`
`2141`	`2159`	`}`
`2142`	`2160`
`2143`	`2161`	`public static function getSubscribedEvents(): array`