Merge pull request #1782 from alanpoulain/fix/persist-only-when-needed

Persist data in Doctrine DataPersister only if needed

Author: teohhanhui

src/Bridge/Doctrine/Common/DataPersister.php

@@ -51,7 +51,10 @@ public function persist($data)
             return;
         }
 
-        $manager->persist($data);
+        if (!$manager->contains($data)) {
+            $manager->persist($data);
+        }
+
         $manager->flush();
         $manager->refresh($data);
     }

tests/Bridge/Doctrine/Common/DataPersisterTest.php

@@ -48,6 +48,7 @@ public function testPersist()
         $dummy = new Dummy();
 
         $objectManagerProphecy = $this->prophesize(ObjectManager::class);
+        $objectManagerProphecy->contains($dummy)->willReturn(false);
         $objectManagerProphecy->persist($dummy)->shouldBeCalled();
         $objectManagerProphecy->flush()->shouldBeCalled();
         $objectManagerProphecy->refresh($dummy)->shouldBeCalled();
@@ -58,6 +59,22 @@ public function testPersist()
         (new DataPersister($managerRegistryProphecy->reveal()))->persist($dummy);
     }
 
+    public function testPersistIfEntityAlreadyManaged()
+    {
+        $dummy = new Dummy();
+
+        $objectManagerProphecy = $this->prophesize(ObjectManager::class);
+        $objectManagerProphecy->contains($dummy)->willReturn(true);
+        $objectManagerProphecy->persist($dummy)->shouldNotBeCalled();
+        $objectManagerProphecy->flush()->shouldBeCalled();
+        $objectManagerProphecy->refresh($dummy)->shouldBeCalled();
+
+        $managerRegistryProphecy = $this->prophesize(ManagerRegistry::class);
+        $managerRegistryProphecy->getManagerForClass(Dummy::class)->willReturn($objectManagerProphecy->reveal())->shouldBeCalled();
+
+        (new DataPersister($managerRegistryProphecy->reveal()))->persist($dummy);
+    }
+
     public function testPersistWithNullManager()
     {
         $managerRegistryProphecy = $this->prophesize(ManagerRegistry::class);