symfony
diff --git a/‎src/Symfony/Bridge/Twig/Form/TwigRendererEngine.php
Lines changed: 3 additions & 1 deletion b/‎src/Symfony/Bridge/Twig/Form/TwigRendererEngine.php
Lines changed: 3 additions & 1 deletion
diff --git a/‎src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionDivLayoutTest.php
Lines changed: 14 additions & 0 deletions b/‎src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionDivLayoutTest.php
Lines changed: 14 additions & 0 deletions
diff --git a/‎src/Symfony/Bridge/Twig/Tests/Extension/page_dynamic_extends.html.twig
Lines changed: 1 addition & 0 deletions b/‎src/Symfony/Bridge/Twig/Tests/Extension/page_dynamic_extends.html.twig
Lines changed: 1 addition & 0 deletions
@@ -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));
     }
 }
@@ -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
 
@@ -0,0 +1 @@
+{% extends dynamic_template_name ~ '.html.twig' %}
Original file line number	Diff line number	Diff line change
`@@ -167,6 +167,8 @@ protected function loadResourcesFromTheme($cacheKey, &$theme)`
`167`	`167`	`// theme is a reference and we don't want to change it.`
`168`	`168`	`$currentTheme = $theme;`
`169`	`169`
	`170`	`+ $context = $this->environment->mergeGlobals(array());`
	`171`	`+`
`170`	`172`	`// The do loop takes care of template inheritance.`
`171`	`173`	`// Add blocks from all templates in the inheritance tree, but avoid`
`172`	`174`	`// overriding blocks already set.`
`@@ -178,6 +180,6 @@ protected function loadResourcesFromTheme($cacheKey, &$theme)`
`178`	`180`	`$this->resources[$cacheKey][$block] = $blockData;`
`179`	`181`	`}`
`180`	`182`	`}`
`181`		`- } while (false !== $currentTheme = $currentTheme->getParent(array()));`
	`183`	`+ } while (false !== $currentTheme = $currentTheme->getParent($context));`
`182`	`184`	`}`
`183`	`185`	`}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+{% extends dynamic_template_name ~ '.html.twig' %}`