Do not modify UOW on PersistentCollection::clear() when owner has DEFFERED_EXPLICIT change tracking policy

paxal · paxal · commit 82bb914fbcd7 · 2019-06-26T16:56:31.000+02:00
diff --git a/lib/Doctrine/ORM/PersistentCollection.php b/lib/Doctrine/ORM/PersistentCollection.php
@@ -564,7 +564,9 @@ public function clear()
         if ($this->association->isOwningSide() && $this->owner) {
             $this->changed();
 
-            $uow->scheduleCollectionDeletion($this);
+            if ($this->em->getClassMetadata(get_class($this->owner))->changeTrackingPolicy !== ChangeTrackingPolicy::DEFERRED_EXPLICIT) {
+                $uow->scheduleCollectionDeletion($this);
+            }
 
             $this->takeSnapshot();
         }
diff --git a/tests/Doctrine/Tests/ORM/PersistentCollectionTest.php b/tests/Doctrine/Tests/ORM/PersistentCollectionTest.php
@@ -5,6 +5,7 @@
 namespace Doctrine\Tests\ORM;
 
 use Doctrine\Common\Collections\ArrayCollection;
+use Doctrine\ORM\Mapping\ChangeTrackingPolicy;
 use Doctrine\ORM\PersistentCollection;
 use Doctrine\ORM\UnitOfWork;
 use Doctrine\Tests\Mocks\ConnectionMock;
@@ -269,4 +270,25 @@ public function testWillNotMarkCollectionAsDirtyAfterInitializationIfNoElementsW
         self::assertTrue($this->collection->isInitialized());
         self::assertFalse($this->collection->isDirty());
     }
+
+    public function testModifyUOWForDeferredImplicitOwnerOnClear() : void
+    {
+        $unitOfWork = $this->createMock(UnitOfWork::class);
+        $unitOfWork->expects(self::once())->method('scheduleCollectionDeletion');
+        $this->emMock->setUnitOfWork($unitOfWork);
+
+        $this->collection->clear();
+    }
+
+    public function testDoNotModifyUOWForDeferredExplicitOwnerOnClear() : void
+    {
+        $unitOfWork = $this->createMock(UnitOfWork::class);
+        $unitOfWork->expects(self::never())->method('scheduleCollectionDeletion');
+        $this->emMock->setUnitOfWork($unitOfWork);
+
+        $classMetaData = $this->emMock->getClassMetadata(ECommerceCart::class);
+        $classMetaData->setChangeTrackingPolicy(ChangeTrackingPolicy::DEFERRED_EXPLICIT);
+
+        $this->collection->clear();
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -564,7 +564,9 @@ public function clear()`
`564`	`564`	`if ($this->association->isOwningSide() && $this->owner) {`
`565`	`565`	`$this->changed();`
`566`	`566`
`567`		`- $uow->scheduleCollectionDeletion($this);`
	`567`	`+ if ($this->em->getClassMetadata(get_class($this->owner))->changeTrackingPolicy !== ChangeTrackingPolicy::DEFERRED_EXPLICIT) {`
	`568`	`+ $uow->scheduleCollectionDeletion($this);`
	`569`	`+ }`
`568`	`570`
`569`	`571`	`$this->takeSnapshot();`
`570`	`572`	`}`