Merge pull request #837 from mnapoli/DDC2775

DDC-2775 Tests and fix

lib/Doctrine/ORM/UnitOfWork.php

@@ -2249,6 +2249,8 @@ class UnitOfWork implements PropertyChangedListener
             function ($assoc) { return $assoc['isCascadeRemove']; }
         );
 
+        $entitiesToCascade = array();
+
         foreach ($associationMappings as $assoc) {
             if ($entity instanceof Proxy && !$entity->__isInitialized__) {
                 $entity->__load();
@@ -2261,18 +2263,22 @@ class UnitOfWork implements PropertyChangedListener
                 case (is_array($relatedEntities)):
                     // If its a PersistentCollection initialization is intended! No unwrap!
                     foreach ($relatedEntities as $relatedEntity) {
-                        $this->doRemove($relatedEntity, $visited);
+                        $entitiesToCascade[] = $relatedEntity;
                     }
                     break;
 
                 case ($relatedEntities !== null):
-                    $this->doRemove($relatedEntities, $visited);
+                    $entitiesToCascade[] = $relatedEntities;
                     break;
 
                 default:
                     // Do nothing
             }
         }
+
+        foreach ($entitiesToCascade as $relatedEntity) {
+            $this->doRemove($relatedEntity, $visited);
+        }
     }
 
     /**

tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2775Test.php

@@ -0,0 +1,146 @@
+<?php
+
+namespace Doctrine\Tests\ORM\Functional\Ticket;
+
+use Doctrine\Tests\OrmFunctionalTestCase;
+
+/**
+ * Functional tests for cascade remove with class table inheritance.
+ *
+ * @author Matthieu Napoli <matthieu@mnapoli.fr>
+ */
+class DDC2775Test extends OrmFunctionalTestCase
+{
+    protected function setUp()
+    {
+        parent::setUp();
+
+        $this->setUpEntitySchema(array(
+            'Doctrine\Tests\ORM\Functional\Ticket\User',
+            'Doctrine\Tests\ORM\Functional\Ticket\Role',
+            'Doctrine\Tests\ORM\Functional\Ticket\AdminRole',
+            'Doctrine\Tests\ORM\Functional\Ticket\Authorization',
+        ));
+    }
+
+    /**
+     * @group DDC-2775
+     */
+    public function testIssueCascadeRemove()
+    {
+        $user = new User();
+
+        $role = new AdminRole();
+        $user->addRole($role);
+
+        $authorization = new Authorization();
+        $user->addAuthorization($authorization);
+        $role->addAuthorization($authorization);
+
+        $this->_em->persist($user);
+        $this->_em->flush();
+
+        // Need to clear so that associations are lazy-loaded
+        $this->_em->clear();
+
+        $user = $this->_em->find('Doctrine\Tests\ORM\Functional\Ticket\User', $user->id);
+
+        $this->_em->remove($user);
+        $this->_em->flush();
+
+        // With the bug, the second flush throws an error because the cascade remove didn't work correctly
+        $this->_em->flush();
+    }
+}
+
+/**
+ * @Entity
+ * @InheritanceType("JOINED")
+ * @DiscriminatorColumn(name="role_type", type="string")
+ * @DiscriminatorMap({"admin"="AdminRole"})
+ */
+abstract class Role
+{
+    /**
+     * @Id @Column(type="integer")
+     * @GeneratedValue
+     */
+    public $id;
+
+    /**
+     * @ManyToOne(targetEntity="User", inversedBy="roles")
+     */
+    public $user;
+
+    /**
+     * @OneToMany(targetEntity="Authorization", mappedBy="role", cascade={"all"}, orphanRemoval=true)
+     */
+    public $authorizations;
+
+    public function addAuthorization(Authorization $authorization)
+    {
+        $this->authorizations[] = $authorization;
+        $authorization->role = $this;
+    }
+}
+
+/** @Entity */
+class AdminRole extends Role
+{
+}
+
+/**
+ * @Entity @Table(name="authorizations")
+ */
+class Authorization
+{
+    /**
+     * @Id @Column(type="integer")
+     * @GeneratedValue
+     */
+    public $id;
+
+    /**
+     * @ManyToOne(targetEntity="User", inversedBy="authorizations")
+     */
+    public $user;
+
+    /**
+     * @ManyToOne(targetEntity="Role", inversedBy="authorizations")
+     */
+    public $role;
+}
+
+/**
+ * @Entity @Table(name="users")
+ */
+class User
+{
+    /**
+     * @Id @Column(type="integer")
+     * @GeneratedValue(strategy="AUTO")
+     */
+    public $id;
+
+    /**
+     * @OneToMany(targetEntity="Role", mappedBy="user", cascade={"all"}, orphanRemoval=true)
+     */
+    public $roles;
+
+    /**
+     * @OneToMany(targetEntity="Authorization", mappedBy="user", cascade={"all"}, orphanRemoval=true)
+     */
+    public $authorizations;
+
+    public function addRole(Role $role)
+    {
+        $this->roles[] = $role;
+        $role->user = $this;
+    }
+
+    public function addAuthorization(Authorization $authorization)
+    {
+        $this->authorizations[] = $authorization;
+        $authorization->user = $this;
+    }
+}