[SecurityBundle] Use csrf_token_id instead of deprecated intention

jakzal · jakzal · commit b194912802cd · 2015-11-28T10:30:30.000Z
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/FormLoginFactory.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/FormLoginFactory.php
@@ -30,6 +30,7 @@ public function __construct()
         $this->addOption('password_parameter', '_password');
         $this->addOption('csrf_parameter', '_csrf_token');
         $this->addOption('intention', 'authenticate');
+        $this->addOption('csrf_token_id', 'authenticate');
         $this->addOption('post_only', true);
     }
 
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
@@ -299,7 +299,7 @@ private function createFirewall(ContainerBuilder $container, $id, $firewall, &$a
             $listener = $container->setDefinition($listenerId, new DefinitionDecorator('security.logout_listener'));
             $listener->replaceArgument(3, array(
                 'csrf_parameter' => $firewall['logout']['csrf_parameter'],
-                'intention' => $firewall['logout']['csrf_token_id'],
+                'csrf_token_id' => $firewall['logout']['csrf_token_id'],
                 'logout_path' => $firewall['logout']['path'],
             ));
             $listeners[] = new Reference($listenerId);
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/CsrfFormLoginBundle/Form/UserLoginType.php b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/CsrfFormLoginBundle/Form/UserLoginType.php
@@ -79,12 +79,13 @@ public function buildForm(FormBuilderInterface $builder, array $options)
      */
     public function configureOptions(OptionsResolver $resolver)
     {
-        /* Note: the form's intention must correspond to that for the form login
+        /* Note: the form's csrf_token_id must correspond to that for the form login
          * listener in order for the CSRF token to validate successfully.
          */
 
         $resolver->setDefaults(array(
             'intention' => 'authenticate',
+            'csrf_token_id' => 'authenticate',
         ));
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,7 @@ public function __construct()`
`30`	`30`	`$this->addOption('password_parameter', '_password');`
`31`	`31`	`$this->addOption('csrf_parameter', '_csrf_token');`
`32`	`32`	`$this->addOption('intention', 'authenticate');`
	`33`	`+ $this->addOption('csrf_token_id', 'authenticate');`
`33`	`34`	`$this->addOption('post_only', true);`
`34`	`35`	`}`
`35`	`36`
Original file line number	Diff line number	Diff line change
`@@ -79,12 +79,13 @@ public function buildForm(FormBuilderInterface $builder, array $options)`
`79`	`79`	`*/`
`80`	`80`	`public function configureOptions(OptionsResolver $resolver)`
`81`	`81`	`{`
`82`		`- /* Note: the form's intention must correspond to that for the form login`
	`82`	`+ /* Note: the form's csrf_token_id must correspond to that for the form login`
`83`	`83`	`* listener in order for the CSRF token to validate successfully.`
`84`	`84`	`*/`
`85`	`85`
`86`	`86`	`$resolver->setDefaults(array(`
`87`	`87`	`'intention' => 'authenticate',`
	`88`	`+ 'csrf_token_id' => 'authenticate',`
`88`	`89`	`));`
`89`	`90`	`}`
`90`	`91`	`}`