[Console] Fix question formatting using SymfonyStyle::ask()

chalasr · chalasr · commit b52d81fc4c0b · 2016-12-17T12:44:38.000+01:00
diff --git a/src/Symfony/Component/Console/Helper/SymfonyQuestionHelper.php b/src/Symfony/Component/Console/Helper/SymfonyQuestionHelper.php
@@ -53,7 +53,7 @@ public function ask(InputInterface $input, OutputInterface $output, Question $qu
      */
     protected function writePrompt(OutputInterface $output, Question $question)
     {
-        $text = OutputFormatter::escape($question->getQuestion());
+        $text = $question->getQuestion();
         $default = $question->getDefault();
 
         switch (true) {
@@ -89,7 +89,7 @@ protected function writePrompt(OutputInterface $output, Question $question)
                 $text = sprintf(' <info>%s</info> [<comment>%s</comment>]:', $text, OutputFormatter::escape($default));
         }
 
-        $output->writeln($text);
+        $output->writeln($output->getFormatter()->format($text));
 
         if ($question instanceof ChoiceQuestion) {
             $width = max(array_map('strlen', array_keys($question->getChoices())));
diff --git a/src/Symfony/Component/Console/Tests/Helper/SymfonyQuestionHelperTest.php b/src/Symfony/Component/Console/Tests/Helper/SymfonyQuestionHelperTest.php
@@ -101,6 +101,15 @@ public function testAskEscapeLabel()
         $this->assertOutputContains('Do you want a \?', $output);
     }
 
+    public function testAskEscapeAndFormatLabel()
+    {
+        $helper = new SymfonyQuestionHelper();
+        $helper->setInputStream($this->getInputStream('Foo\\Bar'));
+        $helper->ask($this->createInputInterfaceMock(), $output = $this->createOutputInterface(), new Question('Do you want to use Foo\\Bar <comment>or</comment> Foo\\Baz\\?', 'Foo\\Baz'));
+
+        $this->assertOutputContains('Do you want to use Foo\\Bar or Foo\\Baz\\? [Foo\\Baz]:', $output);
+    }
+
     /**
      * @expectedException        \Symfony\Component\Console\Exception\RuntimeException
      * @expectedExceptionMessage Aborted

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ public function ask(InputInterface $input, OutputInterface $output, Question $qu`
`53`	`53`	`*/`
`54`	`54`	`protected function writePrompt(OutputInterface $output, Question $question)`
`55`	`55`	`{`
`56`		`- $text = OutputFormatter::escape($question->getQuestion());`
	`56`	`+ $text = $question->getQuestion();`
`57`	`57`	`$default = $question->getDefault();`
`58`	`58`
`59`	`59`	`switch (true) {`
`@@ -89,7 +89,7 @@ protected function writePrompt(OutputInterface $output, Question $question)`
`89`	`89`	`$text = sprintf(' <info>%s</info> [<comment>%s</comment>]:', $text, OutputFormatter::escape($default));`
`90`	`90`	`}`
`91`	`91`
`92`		`- $output->writeln($text);`
	`92`	`+ $output->writeln($output->getFormatter()->format($text));`
`93`	`93`
`94`	`94`	`if ($question instanceof ChoiceQuestion) {`
`95`	`95`	`$width = max(array_map('strlen', array_keys($question->getChoices())));`