added global variables access in a form theme (closes #3058)

src/Symfony/Bridge/Twig/CHANGELOG.md

@@ -4,6 +4,7 @@ CHANGELOG
 2.1.0
 -----
 
+ * added global variables access in a form theme
  * added TwigEngine
  * added TwigExtractor
  * added a csrf_token function

src/Symfony/Bridge/Twig/Extension/FormExtension.php

@@ -259,9 +259,11 @@ class FormExtension extends \Twig_Extension
             if (isset($blocks[$types[$typeIndex]])) {
                 $this->varStack[$rendering]['typeIndex'] = $typeIndex;
 
+                $context = $this->environment->mergeGlobals($this->varStack[$rendering]['variables']);
+
                 // we do not call renderBlock here to avoid too many nested level calls (XDebug limits the level to 100 by default)
                 ob_start();
-                $this->template->displayBlock($types[$typeIndex], $this->varStack[$rendering]['variables'], $blocks);
+                $this->template->displayBlock($types[$typeIndex], $context, $blocks);
                 $html = ob_get_clean();
 
                 if ($mainTemplate) {

src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionDivLayoutTest.php

@@ -52,9 +52,10 @@ class FormExtensionDivLayoutTest extends AbstractDivLayoutTest
             'custom_widgets.html.twig',
         ));
 
-        $environment = new \Twig_Environment($loader);
+        $environment = new \Twig_Environment($loader, array('strict_variables' => true));
         $environment->addExtension($this->extension);
         $environment->addExtension(new TranslationExtension(new StubTranslator()));
+        $environment->addGlobal('global', '');
 
         $this->extension->initRuntime($environment);
     }

src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionTableLayoutTest.php

@@ -52,9 +52,10 @@ class FormExtensionTableLayoutTest extends AbstractTableLayoutTest
             'custom_widgets.html.twig',
         ));
 
-        $environment = new \Twig_Environment($loader);
+        $environment = new \Twig_Environment($loader, array('strict_variables' => true));
         $environment->addExtension($this->extension);
         $environment->addExtension(new TranslationExtension(new StubTranslator()));
+        $environment->addGlobal('global', '');
 
         $this->extension->initRuntime($environment);
     }

src/Symfony/Bridge/Twig/Tests/Extension/child_label.html.twig

@@ -1,3 +1,3 @@
 {% block form_label %}
-    <label>child</label>
+    <label>{{ global }}child</label>
 {% endblock form_label %}

src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/FormHelperDivLayoutTest.php

@@ -33,6 +33,7 @@ class FormHelperDivLayoutTest extends AbstractDivLayoutTest
         $templateNameParser = new StubTemplateNameParser($root, $rootTheme);
         $loader = new FilesystemLoader(array());
         $engine = new PhpEngine($templateNameParser, $loader);
+        $engine->addGlobal('global', '');
 
         $this->helper = new FormHelper($engine, $this->getMock('Symfony\Component\Form\Extension\Csrf\CsrfProvider\CsrfProviderInterface'), array('FrameworkBundle:Form'));
 

src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/FormHelperTableLayoutTest.php

@@ -33,6 +33,7 @@ class FormHelperTableLayoutTest extends AbstractTableLayoutTest
         $templateNameParser = new StubTemplateNameParser($root, $rootTheme);
         $loader = new FilesystemLoader(array());
         $engine = new PhpEngine($templateNameParser, $loader);
+        $engine->addGlobal('global', '');
 
         $this->helper = new FormHelper($engine, $this->getMock('Symfony\Component\Form\Extension\Csrf\CsrfProvider\CsrfProviderInterface'), array(
             'FrameworkBundle:Form',

src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/Resources/Child/form_label.html.php

@@ -1 +1 @@
-<label>child</label>
+<label><?php echo $global ?>child</label>