[TwigBridge] fixed form rendering when used in a template with dynami…

…c inheritance
symfony · fabpot · Sep 12, 2013 · Sep 12, 2013 · Sep 12, 2013 · 4c1dbc75d5256dad2de5e25174c4ddbfe544197f
commit 4c1dbc75d5256dad2de5e25174c4ddbfe544197f
diff --git a/src/Symfony/Bridge/Twig/Form/TwigRendererEngine.php b/src/Symfony/Bridge/Twig/Form/TwigRendererEngine.php
@@ -167,6 +167,8 @@ protected function loadResourcesFromTheme($cacheKey, &$theme)
         // theme is a reference and we don't want to change it.
         $currentTheme = $theme;
 
+        $context = $this->environment->mergeGlobals(array());
+
         // The do loop takes care of template inheritance.
         // Add blocks from all templates in the inheritance tree, but avoid
         // overriding blocks already set.
@@ -178,6 +180,6 @@ protected function loadResourcesFromTheme($cacheKey, &$theme)
                     $this->resources[$cacheKey][$block] = $blockData;
                 }
             }
-        } while (false !== $currentTheme = $currentTheme->getParent(array()));
+        } while (false !== $currentTheme = $currentTheme->getParent($context));
     }
 }
diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionDivLayoutTest.php b/src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionDivLayoutTest.php
@@ -64,6 +64,8 @@ protected function setUp()
         $environment = new \Twig_Environment($loader, array('strict_variables' => true));
         $environment->addExtension(new TranslationExtension(new StubTranslator()));
         $environment->addGlobal('global', '');
+        // the value can be any template that exists
+        $environment->addGlobal('dynamic_template_name', 'child_label');
         $environment->addExtension($this->extension);
 
         $this->extension->initRuntime($environment);
@@ -106,6 +108,18 @@ public function testThemeBlockInheritanceUsingExtend()
         );
     }
 
+    public function testThemeBlockInheritanceUsingDynamicExtend()
+    {
+        $view = $this->factory
+            ->createNamed('name', 'email')
+            ->createView()
+        ;
+
+        $renderer = $this->extension->renderer;
+        $renderer->setTheme($view, array('page_dynamic_extends.html.twig'));
+        $renderer->searchAndRenderBlock($view, 'row');
+    }
+
     public function isSelectedChoiceProvider()
     {
         // The commented cases should not be necessary anymore, because the

diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/page_dynamic_extends.html.twig b/src/Symfony/Bridge/Twig/Tests/Extension/page_dynamic_extends.html.twig
@@ -0,0 +1 @@
+{% extends dynamic_template_name ~ '.html.twig' %}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		{% extends dynamic_template_name ~ '.html.twig' %}