cascade detach should detach lazy collections too

doctrine · Nov 15, 2024 · 75fa53c · 75fa53c
1 parent 486e406
commit 75fa53c
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 7 deletions.
diff --git a/src/UnitOfWork.php b/src/UnitOfWork.php
@@ -2548,11 +2548,7 @@ static function ($assoc) {
             $relatedEntities = $class->reflFields[$assoc['fieldName']]->getValue($entity);
 
             switch (true) {
-                case $relatedEntities instanceof PersistentCollection:
-                    // Unwrap so that foreach() does not initialize
-                    $relatedEntities = $relatedEntities->unwrap();
-                    // break; is commented intentionally!
-
+                // in order to detach the entities in the collection, initialization is needed (no unwrap)
                 case $relatedEntities instanceof Collection:
                 case is_array($relatedEntities):
                     foreach ($relatedEntities as $relatedEntity) {

diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/LazyEagerCollectionTest.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/LazyEagerCollectionTest.php
@@ -56,6 +56,36 @@ public function testRefreshRefreshesBothLazyAndEagerCollections(): void
         self::assertSame('12345', $ph->data);
         self::assertSame('6789', $ad->data);
     }
+
+    public function testCascadeDetachBothLazyAndEagerCollections(): void
+    {
+        $user       = new LazyEagerCollectionUser();
+        $user->data = 'Guilherme';
+
+        $ph       = new LazyEagerCollectionPhone();
+        $ph->data = '12345';
+        $user->addPhone($ph);
+
+        $ad       = new LazyEagerCollectionAddress();
+        $ad->data = '6789';
+        $user->addAddress($ad);
+
+        $this->_em->persist($user);
+        $this->_em->persist($ad);
+        $this->_em->persist($ph);
+        $this->_em->flush();
+        $this->_em->clear();
+
+        $user = $this->_em->find(LazyEagerCollectionUser::class, $user->id);
+        $this->_em->detach($user);
+
+        $ph = $user->phones[0];
+        $ad = $user->addresses[0];
+
+        self::assertFalse($this->_em->contains($user));
+        self::assertFalse($this->_em->contains($ph));
+        self::assertFalse($this->_em->contains($ad));
+    }
 }
 
 /**
@@ -78,14 +108,14 @@ class LazyEagerCollectionUser
     public $data;
 
     /**
-     * @ORM\OneToMany(targetEntity="LazyEagerCollectionPhone", cascade={"refresh"}, fetch="EAGER", mappedBy="user")
+     * @ORM\OneToMany(targetEntity="LazyEagerCollectionPhone", cascade={"refresh", "detach"}, fetch="EAGER", mappedBy="user")
      *
      * @var LazyEagerCollectionPhone[]
      */
     public $phones;
 
     /**
-     * @ORM\OneToMany(targetEntity="LazyEagerCollectionAddress", cascade={"refresh"}, mappedBy="user")
+     * @ORM\OneToMany(targetEntity="LazyEagerCollectionAddress", cascade={"refresh", "detach"}, mappedBy="user")
      *
      * @var LazyEagerCollectionAddress[]
      */