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

handle disabled csrf protection in the PHP templating form helper

Browse Source
This commit is contained in:
lsmith77 2012-01-23 17:49:28 +01:00
parent fbbea2f369
commit 2a998e01b9
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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 the "form.csrf_provider" service is available');
}
return $this->csrfProvider->generateCsrfToken($intention);
}