Merge branch '2.2' into 2.3

fabpot · fabpot · commit 60a14f6ffe16 · 2013-10-18T17:00:23.000+02:00
* 2.2:
  [DoctrineBridge] Added type check to prevent calling clear() on arrays
  [Intl] Improved FormTypeCsrfExtension to use the type class as default intention if the form name is empty
  Fix docblock typo

Conflicts:
	src/Symfony/Component/Form/Extension/Csrf/Type/FormTypeCsrfExtension.php
diff --git a/src/Symfony/Bridge/Doctrine/Form/EventListener/MergeDoctrineCollectionListener.php b/src/Symfony/Bridge/Doctrine/Form/EventListener/MergeDoctrineCollectionListener.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Bridge\Doctrine\Form\EventListener;
 
+use Doctrine\Common\Collections\Collection;
 use Symfony\Component\Form\FormEvents;
 use Symfony\Component\Form\FormEvent;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
@@ -40,7 +41,7 @@ public function onBind(FormEvent $event)
 
         // If all items were removed, call clear which has a higher
         // performance on persistent collections
-        if ($collection && count($data) === 0) {
+        if ($collection instanceof Collection && count($data) === 0) {
             $collection->clear();
         }
     }
diff --git a/src/Symfony/Component/Form/Tests/Extension/Csrf/Type/FormTypeCsrfExtensionTest.php b/src/Symfony/Component/Form/Tests/Extension/Csrf/Type/FormTypeCsrfExtensionTest.php
@@ -278,6 +278,37 @@ public function testValidateTokenOnSubmitIfRootAndCompoundUsesTypeClassAsIntenti
         $this->assertSame($valid, $form->isValid());
     }
 
+    /**
+     * @dataProvider provideBoolean
+     */
+    public function testValidateTokenOnBindIfRootAndCompoundUsesTypeClassAsIntentionIfEmptyFormName($valid)
+    {
+        $this->csrfProvider->expects($this->once())
+            ->method('isCsrfTokenValid')
+            ->with('Symfony\Component\Form\Extension\Core\Type\FormType', 'token')
+            ->will($this->returnValue($valid));
+
+        $form = $this->factory
+            ->createNamedBuilder('', 'form', null, array(
+                'csrf_field_name' => 'csrf',
+                'csrf_provider' => $this->csrfProvider,
+                'compound' => true,
+            ))
+            ->add('child', 'text')
+            ->getForm();
+
+        $form->bind(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->csrfProvider->expects($this->never())
diff --git a/src/Symfony/Component/Security/Http/RememberMe/AbstractRememberMeServices.php b/src/Symfony/Component/Security/Http/RememberMe/AbstractRememberMeServices.php
@@ -291,7 +291,7 @@ protected function cancelCookie(Request $request)
     }
 
     /**
-     * Checks whether remember-me capabilities where requested
+     * Checks whether remember-me capabilities were requested
      *
      * @param Request $request
      *

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@`
`11`	`11`
`12`	`12`	`namespace Symfony\Bridge\Doctrine\Form\EventListener;`
`13`	`13`
	`14`	`+use Doctrine\Common\Collections\Collection;`
`14`	`15`	`use Symfony\Component\Form\FormEvents;`
`15`	`16`	`use Symfony\Component\Form\FormEvent;`
`16`	`17`	`use Symfony\Component\EventDispatcher\EventSubscriberInterface;`
`@@ -40,7 +41,7 @@ public function onBind(FormEvent $event)`
`40`	`41`
`41`	`42`	`// If all items were removed, call clear which has a higher`
`42`	`43`	`// performance on persistent collections`
`43`		`- if ($collection && count($data) === 0) {`
	`44`	`+ if ($collection instanceof Collection && count($data) === 0) {`
`44`	`45`	`$collection->clear();`
`45`	`46`	`}`
`46`	`47`	`}`
Original file line number	Diff line number	Diff line change
`@@ -291,7 +291,7 @@ protected function cancelCookie(Request $request)`
`291`	`291`	`}`
`292`	`292`
`293`	`293`	`/**`
`294`		`- * Checks whether remember-me capabilities where requested`
	`294`	`+ * Checks whether remember-me capabilities were requested`
`295`	`295`	`*`
`296`	`296`	`* @param Request $request`
`297`	`297`	`*`