handle disaled csrf protection in the Twig FormExtension

symfony · Jan 23, 2012 · 3a1699a · 3a1699a
1 parent 2a998e0
commit 3a1699a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/src/Symfony/Bridge/Twig/Extension/FormExtension.php b/src/Symfony/Bridge/Twig/Extension/FormExtension.php
@@ -33,7 +33,7 @@ class FormExtension extends \Twig_Extension
     protected $varStack;
     protected $template;
 
-    public function __construct(CsrfProviderInterface $csrfProvider, array $resources = array())
+    public function __construct(CsrfProviderInterface $csrfProvider = null, array $resources = array())
     {
         $this->csrfProvider = $csrfProvider;
         $this->themes = new \SplObjectStorage();
@@ -298,6 +298,10 @@ protected function render(FormView $view, $section, array $variables = array())
      */
     public function getCsrfToken($intention)
     {
+        if (!$this->csrfProvider instanceof CsrfProviderInterface) {
+            throw new \BadMethodCallException('CSRF token can only be generated if the "form.csrf_provider" service is available');
+        }
+
         return $this->csrfProvider->generateCsrfToken($intention);
     }
 

diff --git a/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/FormHelper.php b/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/FormHelper.php
@@ -202,7 +202,7 @@ public function rest(FormView $view, array $variables = array())
      */
     public function csrfToken($intention)
     {
-        if (! $this->csrfProvider instanceof CsrfProviderInterface) {
+        if (!$this->csrfProvider instanceof CsrfProviderInterface) {
             throw new \BadMethodCallException('CSRF token can only be generated if the "form.csrf_provider" service is available');
         }
 

diff --git a/src/Symfony/Bundle/TwigBundle/Resources/config/twig.xml b/src/Symfony/Bundle/TwigBundle/Resources/config/twig.xml
@@ -75,7 +75,7 @@
 
         <service id="twig.extension.form" class="%twig.extension.form.class%" public="false">
             <tag name="twig.extension" />
-            <argument type="service" id="form.csrf_provider" />
+            <argument type="service" id="form.csrf_provider" on-invalid="null" />
             <argument>%twig.form.resources%</argument>
         </service>