Merge branch '3.3' into 3.4

fabpot · fabpot · commit 82f571ad6aa4 · 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/Tests/Extension/FormExtensionDivLayoutTest.php b/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())

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())`