From 9b78100378725ae9f58a997020ab2da070544d06 Mon Sep 17 00:00:00 2001
From: Jan Kramer <j.kramer@pronettix.nl>
Date: Sun, 25 Nov 2012 19:06:35 +0100
Subject: [PATCH 1/2] [DDC-2074] Added test for PersistentCollection#clear.

---
 .../ORM/Functional/Ticket/DDC2074Test.php     | 29 +++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2074Test.php

diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2074Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2074Test.php
new file mode 100644
index 000000000..5538ee3d4
--- /dev/null
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2074Test.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace Doctrine\Tests\ORM\Functional\Ticket;
+
+use Doctrine\Common\Collections\ArrayCollection;
+use Doctrine\ORM\PersistentCollection;
+use Doctrine\Tests\Models\ECommerce\ECommerceCategory;
+use Doctrine\Tests\Models\ECommerce\ECommerceProduct;
+
+/**
+ * @group DDC-2074
+ */
+class DDC2074Test extends \Doctrine\Tests\OrmFunctionalTestCase
+{
+    public function testShouldNotScheduleDeletionOnClonedInstances()
+    {
+        $class = $this->_em->getClassMetadata('Doctrine\Tests\Models\ECommerce\ECommerceProduct');
+        $product = new ECommerceProduct();
+        $category = new ECommerceCategory();
+        $collection = new PersistentCollection($this->_em, $class, new ArrayCollection(array($category)));
+        $collection->setOwner($product, $class->associationMappings['categories']);
+
+        $uow = $this->_em->getUnitOfWork();
+        $clonedCollection = clone $collection;
+        $clonedCollection->clear();
+
+        $this->assertEquals(0, count($uow->getScheduledCollectionDeletions()));
+    }
+}
\ No newline at end of file

From 5b3f54429aa01d4647e12c6a2f1010698f70844f Mon Sep 17 00:00:00 2001
From: Jan Kramer <j.kramer@pronettix.nl>
Date: Sun, 25 Nov 2012 19:13:32 +0100
Subject: [PATCH 2/2] [DDC-2074] Fixed bug regarding clearing PC's without
 owner

When calling clear on a PC that has no owner (e.g. because it was
cloned), it can't be deleted as there is no metadata available.
In these cases, it shouldn't be scheduled for deletion.
---
 lib/Doctrine/ORM/PersistentCollection.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Doctrine/ORM/PersistentCollection.php b/lib/Doctrine/ORM/PersistentCollection.php
index ec973408d..8c306f4ab 100644
--- a/lib/Doctrine/ORM/PersistentCollection.php
+++ b/lib/Doctrine/ORM/PersistentCollection.php
@@ -655,7 +655,7 @@ final class PersistentCollection implements Collection, Selectable
 
         $this->initialized = true; // direct call, {@link initialize()} is too expensive
 
-        if ($this->association['isOwningSide']) {
+        if ($this->association['isOwningSide'] && $this->owner) {
             $this->changed();
 
             $uow->scheduleCollectionDeletion($this);