diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merged branch lsmith77/form_helper_csrf_off (PR #3174)

Browse Source 
Commits
-------

cc31a15 tweaked the exception message
3a1699a handle disaled csrf protection in the Twig FormExtension
2a998e0 handle disabled csrf protection in the PHP templating form helper

Discussion
----------

handle disabled csrf protection in the PHP templating form helper

Bug fix: yes
Feature addition: no
Backwards compatibility break: no
Symfony2 tests pass: ![Build Status](https://secure.travis-ci.org/lsmith77/symfony.png?branch=form_helper_csrf_off)
Fixes the following tickets: -

---------------------------------------------------------------------------

by fabpot at 2012-01-23T17:00:31Z

The same should be done for Twig, no?

---------------------------------------------------------------------------

by lsmith77 at 2012-01-23T17:04:24Z

hmm i guess so .. will apply the change there too .. once someone tells me how to format that ``instanceof`` check :)

---------------------------------------------------------------------------

by lsmith77 at 2012-01-23T17:07:11Z

updated the ``FormExtension`` too

---------------------------------------------------------------------------

by lsmith77 at 2012-01-23T21:28:52Z

hopefully all ready to go now ..

---------------------------------------------------------------------------

by lsmith77 at 2012-01-24T08:12:38Z

@fabpot: don't want to rush you .. but if this could be merged soon, it would make my life easier :)
This commit is contained in:
Fabien Potencier 2012-01-24 09:19:06 +01:00
commit d8541abf71
4 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Symfony/Bridge/Twig/Extension/FormExtension.php
View File

@ -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 @@ class FormExtension extends \Twig_Extension
*/
public function getCsrfToken($intention)
{
if (!$this->csrfProvider instanceof CsrfProviderInterface) {
throw new \BadMethodCallException('CSRF token can only be generated if a CsrfProviderInterface is injected in the constructor.');
}
return $this->csrfProvider->generateCsrfToken($intention);
}

2
src/Symfony/Bundle/FrameworkBundle/Resources/config/templating_php.xml
View File

@ -97,7 +97,7 @@
<service id="templating.helper.form" class="%templating.helper.form.class%">
<tag name="templating.helper" alias="form" />
<argument type="service" id="templating.engine.php" />
<argument type="service" id="form.csrf_provider" />
<argument type="service" id="form.csrf_provider" on-invalid="null" />
<argument>%templating.helper.form.resources%</argument>
</service>

6
src/Symfony/Bundle/FrameworkBundle/Templating/Helper/FormHelper.php
View File

@ -47,7 +47,7 @@ class FormHelper extends Helper
* @param CsrfProviderInterface $csrfProvider The CSRF provider
* @param array $resources An array of theme names
*/
public function __construct(EngineInterface $engine, CsrfProviderInterface $csrfProvider, array $resources)
public function __construct(EngineInterface $engine, CsrfProviderInterface $csrfProvider = null, array $resources = array())
{
$this->engine = $engine;
$this->csrfProvider = $csrfProvider;
@ -202,6 +202,10 @@ class FormHelper extends Helper
*/
public function csrfToken($intention)
{
if (!$this->csrfProvider instanceof CsrfProviderInterface) {
throw new \BadMethodCallException('CSRF token can only be generated if a CsrfProviderInterface is injected in the constructor.');
}
return $this->csrfProvider->generateCsrfToken($intention);
}

2
src/Symfony/Bundle/TwigBundle/Resources/config/twig.xml
View File

@ -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>