handle disaled csrf protection in the Twig FormExtension

Author: lsmith77

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);
  }
 

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');
  }
 

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>