fix bc break and add tests

HeahDude · HeahDude · commit 28dbfe4c20a9 · 2016-03-10T13:40:13.000+01:00
diff --git a/src/Symfony/Bridge/Doctrine/Form/EventListener/MergeDoctrineCollectionListener.php b/src/Symfony/Bridge/Doctrine/Form/EventListener/MergeDoctrineCollectionListener.php
@@ -27,15 +27,31 @@
  */
 class MergeDoctrineCollectionListener implements EventSubscriberInterface
 {
+    // Keeps BC. To be removed in 4.0
+    private $bc = true;
+
     public static function getSubscribedEvents()
     {
         // Higher priority than core MergeCollectionListener so that this one
         // is called before
-        return array(FormEvents::SUBMIT => array('onSubmit', 10));
+        return array(
+            FormEvents::SUBMIT => array(
+                // BC
+                array('onBind', 10),
+                array('onSubmit', 5),
+            )
+        );
     }
 
     public function onSubmit(FormEvent $event)
     {
+        // If onBind() is overridden then logic has been executed
+        if ($this->bc) {
+            @trigger_error('The onBind() method is deprecated since version 3.1 and will be removed in 4.0. Use the onSubmit() method instead.', E_USER_DEPRECATED);
+
+            return;
+        }
+
         $collection = $event->getForm()->getData();
         $data = $event->getData();
 
@@ -52,10 +68,8 @@ public function onSubmit(FormEvent $event)
      * @deprecated since version 3.1, to be removed in 4.0.
      *             Use {@link onSubmit()} instead.
      */
-    public function onBind(FormEvent $event)
+    public function onBind()
     {
-        @trigger_error('The '.__METHOD__.' method is deprecated since version 3.1 and will be removed in 4.0. Use the onSubmit() method instead.', E_USER_DEPRECATED);
-
-        $this->onSubmit($event);
+        $this->bc = false;
     }
 }
diff --git a/src/Symfony/Bridge/Doctrine/Tests/Form/EventListener/MergeDoctrineCollectionTest.php b/src/Symfony/Bridge/Doctrine/Tests/Form/EventListener/MergeDoctrineCollectionTest.php
@@ -0,0 +1,80 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bridge\Doctrine\Tests\Form\EventListener;
+
+use Doctrine\Common\Collections\ArrayCollection;
+use Symfony\Bridge\Doctrine\Form\EventListener\MergeDoctrineCollectionListener;
+use Symfony\Component\EventDispatcher\EventDispatcher;
+use Symfony\Component\Form\FormBuilder;
+use Symfony\Component\Form\FormEvent;
+use Symfony\Component\Form\FormEvents;
+
+class MergeDoctrineCollectionTest extends \PHPUnit_Framework_TestCase
+{
+    /** @var \Doctrine\Common\Collections\ArrayCollection */
+    private $collection;
+    /** @var \Symfony\Component\EventDispatcher\EventDispatcher */
+    private $dispatcher;
+    private $factory;
+    private $form;
+
+    protected function setUp()
+    {
+        $this->collection = new ArrayCollection(array('test'));
+        $this->dispatcher = new EventDispatcher();
+        $this->factory = $this->getMock('Symfony\Component\Form\FormFactoryInterface');
+        $this->form = $this->getBuilder()
+            ->getForm();
+    }
+
+    protected function tearDown()
+    {
+        $this->collection = null;
+        $this->dispatcher = null;
+        $this->factory = null;
+        $this->form = null;
+    }
+
+    protected function getBuilder($name = 'name')
+    {
+        return new FormBuilder($name, null, $this->dispatcher, $this->factory);
+    }
+
+    protected function getForm($name = 'name')
+    {
+        return $this->getBuilder($name)
+            ->setData($this->collection)
+            ->addEventSubscriber(new MergeDoctrineCollectionListener())
+            ->getForm();
+    }
+
+    public function testOnSubmitDoNothing()
+    {
+        $submittedData = array('test');
+        $event = new FormEvent($this->getForm(), $submittedData);
+
+        $this->dispatcher->dispatch(FormEvents::SUBMIT, $event);
+
+        $this->assertTrue($this->collection->contains('test'));
+        $this->assertSame(1, $this->collection->count());
+    }
+
+    public function testOnSubmitNullClearCollection()
+    {
+        $submittedData = array();
+        $event = new FormEvent($this->getForm(), $submittedData);
+
+        $this->dispatcher->dispatch(FormEvents::SUBMIT, $event);
+
+        $this->assertTrue($this->collection->isEmpty());
+    }
+}
