Merge branch '6.4' into 7.0

nicolas-grekas · nicolas-grekas · commit 7ab9a442a21f · 2023-07-20T18:42:47.000+02:00
* 6.4:
  [TwigBridge] Accomodate for changes in Twig
diff --git a/src/Symfony/Bridge/Twig/Tests/Node/FormThemeTest.php b/src/Symfony/Bridge/Twig/Tests/Node/FormThemeTest.php
@@ -47,9 +47,9 @@ public function testCompile()
     {
         $form = new NameExpression('form', 0);
         $resources = new ArrayExpression([
-            new ConstantExpression(0, 0),
-            new ConstantExpression('tpl1', 0),
             new ConstantExpression(1, 0),
+            new ConstantExpression('tpl1', 0),
+            new ConstantExpression(0, 0),
             new ConstantExpression('tpl2', 0),
         ], 0);
 
@@ -62,7 +62,7 @@ public function testCompile()
 
         $this->assertEquals(
             sprintf(
-                '$this->env->getRuntime("Symfony\\\\Component\\\\Form\\\\FormRenderer")->setTheme(%s, [0 => "tpl1", 1 => "tpl2"], true);',
+                '$this->env->getRuntime("Symfony\\\\Component\\\\Form\\\\FormRenderer")->setTheme(%s, [1 => "tpl1", 0 => "tpl2"], true);',
                 $this->getVariableGetter('form')
             ),
             trim($compiler->compile($node)->getSource())
@@ -72,7 +72,7 @@ public function testCompile()
 
         $this->assertEquals(
             sprintf(
-                '$this->env->getRuntime("Symfony\\\\Component\\\\Form\\\\FormRenderer")->setTheme(%s, [0 => "tpl1", 1 => "tpl2"], false);',
+                '$this->env->getRuntime("Symfony\\\\Component\\\\Form\\\\FormRenderer")->setTheme(%s, [1 => "tpl1", 0 => "tpl2"], false);',
                 $this->getVariableGetter('form')
             ),
             trim($compiler->compile($node)->getSource())
