Merge branch '5.2' into 5.3

nicolas-grekas · nicolas-grekas · commit dca646db971a · 2021-06-03T15:39:28.000+02:00
* 5.2:
  [Console] Escape synopsis output
  [SecurityBundle] Link UserProviderListener to correct firewall dispatcher
  [FrameworkBundle] fix KernelBrowser::loginUser with a stateless firewall
  Document null support in NumberToLocalizedStringTransformer
  Update loader’s directory when calling ContainerConfigurator::withPath
diff --git a/Application.php b/Application.php
@@ -798,7 +798,7 @@ public function renderThrowable(\Throwable $e, OutputInterface $output): void
         $this->doRenderThrowable($e, $output);
 
         if (null !== $this->runningCommand) {
-            $output->writeln(sprintf('<info>%s</info>', sprintf($this->runningCommand->getSynopsis(), $this->getName())), OutputInterface::VERBOSITY_QUIET);
+            $output->writeln(sprintf('<info>%s</info>', OutputFormatter::escape(sprintf($this->runningCommand->getSynopsis(), $this->getName()))), OutputInterface::VERBOSITY_QUIET);
             $output->writeln('', OutputInterface::VERBOSITY_QUIET);
         }
     }
diff --git a/Tests/ApplicationTest.php b/Tests/ApplicationTest.php
@@ -927,6 +927,23 @@ public function testRenderExceptionStackTraceContainsRootException()
         $this->assertStringContainsString('Dummy type "class@anonymous" is invalid.', $tester->getDisplay(true));
     }
 
+    public function testRenderExceptionEscapesLinesOfSynopsis()
+    {
+        $application = new Application();
+        $application->setAutoExit(false);
+        $application
+            ->register('foo')
+            ->setCode(function () {
+                throw new \Exception('some exception');
+            })
+            ->addArgument('info')
+        ;
+        $tester = new ApplicationTester($application);
+
+        $tester->run(['command' => 'foo'], ['decorated' => false]);
+        $this->assertStringMatchesFormatFile(self::$fixturesPath.'/application_rendersynopsis_escapesline.txt', $tester->getDisplay(true), '->renderException() escapes lines containing formatting of synopsis');
+    }
+
     public function testRun()
     {
         $application = new Application();
diff --git a/Tests/Command/CommandTest.php b/Tests/Command/CommandTest.php
@@ -186,7 +186,8 @@ public function testGetSynopsis()
         $command = new \TestCommand();
         $command->addOption('foo');
         $command->addArgument('bar');
-        $this->assertEquals('namespace:name [--foo] [--] [<bar>]', $command->getSynopsis(), '->getSynopsis() returns the synopsis');
+        $command->addArgument('info');
+        $this->assertEquals('namespace:name [--foo] [--] [<bar> [<info>]]', $command->getSynopsis(), '->getSynopsis() returns the synopsis');
     }
 
     public function testAddGetUsages()
diff --git a/Tests/Fixtures/application_rendersynopsis_escapesline.txt b/Tests/Fixtures/application_rendersynopsis_escapesline.txt
@@ -0,0 +1,7 @@
+
+In ApplicationTest.php line %d:
+                  
+  some exception  
+                  
+
+foo [<info>]

Original file line number	Diff line number	Diff line change
`@@ -798,7 +798,7 @@ public function renderThrowable(\Throwable $e, OutputInterface $output): void`
`798`	`798`	`$this->doRenderThrowable($e, $output);`
`799`	`799`
`800`	`800`	`if (null !== $this->runningCommand) {`
`801`		`- $output->writeln(sprintf('<info>%s</info>', sprintf($this->runningCommand->getSynopsis(), $this->getName())), OutputInterface::VERBOSITY_QUIET);`
	`801`	`+ $output->writeln(sprintf('<info>%s</info>', OutputFormatter::escape(sprintf($this->runningCommand->getSynopsis(), $this->getName()))), OutputInterface::VERBOSITY_QUIET);`
`802`	`802`	`$output->writeln('', OutputInterface::VERBOSITY_QUIET);`
`803`	`803`	`}`
`804`	`804`	`}`
Original file line number	Diff line number	Diff line change
`@@ -186,7 +186,8 @@ public function testGetSynopsis()`
`186`	`186`	`$command = new \TestCommand();`
`187`	`187`	`$command->addOption('foo');`
`188`	`188`	`$command->addArgument('bar');`
`189`		`- $this->assertEquals('namespace:name [--foo] [--] [<bar>]', $command->getSynopsis(), '->getSynopsis() returns the synopsis');`
	`189`	`+ $command->addArgument('info');`
	`190`	`+ $this->assertEquals('namespace:name [--foo] [--] [<bar> [<info>]]', $command->getSynopsis(), '->getSynopsis() returns the synopsis');`
`190`	`191`	`}`
`191`	`192`
`192`	`193`	`public function testAddGetUsages()`