Merge branch '3.3' into 3.4

fabpot · fabpot · commit 24be059ff42a · 2017-12-04T11:02:15.000-08:00
* 3.3:
  fixed typo
  [FrameworkBundle] Fix a bug where a color tag will be shown when passing an antislash
diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionDivLayoutTest.php b/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionDivLayoutTest.php
@@ -162,7 +162,7 @@ public function isRootFormProvider()
      */
     public function testIsRootForm($expected, FormView $formView)
     {
-        $this->assertSame($expected, twig_is_root_form($formView));
+        $this->assertSame($expected, \Symfony\Bridge\Twig\Extension\twig_is_root_form($formView));
     }
 
     protected function renderForm(FormView $view, array $vars = array())
diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/TextDescriptor.php b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/TextDescriptor.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Bundle\FrameworkBundle\Console\Descriptor;
 
+use Symfony\Component\Console\Formatter\OutputFormatter;
 use Symfony\Component\Console\Helper\Table;
 use Symfony\Component\Console\Style\SymfonyStyle;
 use Symfony\Component\DependencyInjection\Alias;
@@ -226,7 +227,8 @@ protected function describeContainerServices(ContainerBuilder $builder, array $o
         $rawOutput = isset($options['raw_text']) && $options['raw_text'];
         foreach ($this->sortServiceIds($serviceIds) as $serviceId) {
             $definition = $this->resolveServiceDefinition($builder, $serviceId);
-            $styledServiceId = $rawOutput ? $serviceId : sprintf('<fg=cyan>%s</fg=cyan>', $serviceId);
+
+            $styledServiceId = $rawOutput ? $serviceId : sprintf('<fg=cyan>%s</fg=cyan>', OutputFormatter::escape($serviceId));
             if ($definition instanceof Definition) {
                 if ($showTag) {
                     foreach ($definition->getTag($showTag) as $key => $tag) {

Original file line number	Diff line number	Diff line change
`@@ -162,7 +162,7 @@ public function isRootFormProvider()`
`162`	`162`	`*/`
`163`	`163`	`public function testIsRootForm($expected, FormView $formView)`
`164`	`164`	`{`
`165`		`- $this->assertSame($expected, twig_is_root_form($formView));`
	`165`	`+ $this->assertSame($expected, \Symfony\Bridge\Twig\Extension\twig_is_root_form($formView));`
`166`	`166`	`}`
`167`	`167`
`168`	`168`	`protected function renderForm(FormView $view, array $vars = array())`