Merge branch 'fix-csrf-default-2.3' into fix-csrf-default-2.4

Conflicts:	src/Symfony/Component/Form/Extension/Csrf/Type/FormTypeCsrfExtension.php

Author: webmozart

src/Symfony/Component/Form/Extension/Csrf/Type/FormTypeCsrfExtension.php

@@ -86,7 +86,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
  ->addEventSubscriber(new CsrfValidationListener(
  $options['csrf_field_name'],
  $options['csrf_token_manager'],
- $options['csrf_token_id'] ?: $builder->getName(),
+ $options['csrf_token_id'] ?: ($builder->getName() ?: get_class($builder->getType()->getInnerType())),
  $options['csrf_message'],
  $this->translator,
  $this->translationDomain
@@ -105,7 +105,8 @@ public function finishView(FormView $view, FormInterface $form, array $options)
  {
  if ($options['csrf_protection'] && !$view->parent && $options['compound']) {
  $factory = $form->getConfig()->getFormFactory();
- $data = (string) $options['csrf_token_manager']->getToken($options['csrf_token_id'] ?: $form->getName());
+ $tokenId = $options['csrf_token_id'] ?: ($form->getName() ?: get_class($form->getConfig()->getType()->getInnerType()));
+ $data = (string) $options['csrf_token_manager']->getToken($tokenId);
 
  $csrfForm = $factory->createNamed($options['csrf_field_name'], 'hidden', $data, array(
  'mapped' => false,

src/Symfony/Component/Form/Tests/Extension/Csrf/Type/FormTypeCsrfExtensionTest.php

@@ -159,6 +159,24 @@ public function testGenerateCsrfTokenUsesFormNameAsIntentionByDefault()
  $this->assertEquals('token', $view['csrf']->vars['value']);
  }
 
+ public function testGenerateCsrfTokenUsesTypeClassAsIntentionIfEmptyFormName()
+ {
+ $this->tokenManager->expects($this->once())
+ ->method('getToken')
+ ->with('Symfony\Component\Form\Extension\Core\Type\FormType')
+ ->will($this->returnValue('token'));
+
+ $view = $this->factory
+ ->createNamed('', 'form', null, array(
+ 'csrf_field_name' => 'csrf',
+ 'csrf_token_manager' => $this->tokenManager,
+ 'compound' => true,
+ ))
+ ->createView();
+
+ $this->assertEquals('token', $view['csrf']->vars['value']);
+ }
+
  public function provideBoolean()
  {
  return array(
@@ -202,7 +220,7 @@ public function testValidateTokenOnSubmitIfRootAndCompound($valid)
  /**
  * @dataProvider provideBoolean
  */
- public function testValidateTokenOnBindIfRootAndCompoundUsesFormNameAsIntentionByDefault($valid)
+ public function testValidateTokenOnSubmitIfRootAndCompoundUsesFormNameAsIntentionByDefault($valid)
  {
  $this->tokenManager->expects($this->once())
  ->method('isTokenValid')
@@ -230,6 +248,37 @@ public function testValidateTokenOnBindIfRootAndCompoundUsesFormNameAsIntentionB
  $this->assertSame($valid, $form->isValid());
  }
 
+ /**
+ * @dataProvider provideBoolean
+ */
+ public function testValidateTokenOnSubmitIfRootAndCompoundUsesTypeClassAsIntentionIfEmptyFormName($valid)
+ {
+ $this->tokenManager->expects($this->once())
+ ->method('isTokenValid')
+ ->with(new CsrfToken('Symfony\Component\Form\Extension\Core\Type\FormType', 'token'))
+ ->will($this->returnValue($valid));
+
+ $form = $this->factory
+ ->createNamedBuilder('', 'form', null, array(
+ 'csrf_field_name' => 'csrf',
+ 'csrf_token_manager' => $this->tokenManager,
+ 'compound' => true,
+ ))
+ ->add('child', 'text')
+ ->getForm();
+
+ $form->submit(array(
+ 'child' => 'foobar',
+ 'csrf' => 'token',
+ ));
+
+ // Remove token from data
+ $this->assertSame(array('child' => 'foobar'), $form->getData());
+
+ // Validate accordingly
+ $this->assertSame($valid, $form->isValid());
+ }
+
  public function testFailIfRootAndCompoundAndTokenMissing()
  {
  $this->tokenManager->expects($this->never())