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

chalasr · chalasr · commit 06b0ddd5e671 · 2016-12-17T13:06:13.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) {
diff --git a/src/Symfony/Component/Console/Tests/Helper/SymfonyQuestionHelperTest.php b/src/Symfony/Component/Console/Tests/Helper/SymfonyQuestionHelperTest.php
@@ -79,7 +79,9 @@ public function testAskReturnsNullIfValidatorAllowsIt()
         $questionHelper = new SymfonyQuestionHelper();
         $questionHelper->setInputStream($this->getInputStream("\n"));
         $question = new Question('What is your favorite superhero?');
-        $question->setValidator(function ($value) { return $value; });
+        $question->setValidator(function ($value) {
+            return $value;
+        });
         $this->assertNull($questionHelper->ask($this->createInputInterfaceMock(), $this->createOutputInterface(), $question));
     }
 
@@ -101,6 +103,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) {`