From fa09a95023022da5f833afe7e640b016884e3785 Mon Sep 17 00:00:00 2001
From: Steevan BARBOYON <steevan.barboyon@gmail.com>
Date: Mon, 31 Oct 2016 12:03:19 +0100
Subject: [PATCH 1/3] Clear $this->collection even when empty, to reset indexes

---
 lib/Doctrine/ORM/PersistentCollection.php     |  2 ++
 .../Tests/ORM/PersistentCollectionTest.php    | 25 +++++++++++++++++++
 2 files changed, 27 insertions(+)

diff --git a/lib/Doctrine/ORM/PersistentCollection.php b/lib/Doctrine/ORM/PersistentCollection.php
index c1f3cf1b6..000729754 100644
--- a/lib/Doctrine/ORM/PersistentCollection.php
+++ b/lib/Doctrine/ORM/PersistentCollection.php
@@ -542,6 +542,8 @@ final class PersistentCollection extends AbstractLazyCollection implements Selec
     public function clear()
     {
         if ($this->initialized && $this->isEmpty()) {
+            $this->collection->clear();
+            
             return;
         }
 
diff --git a/tests/Doctrine/Tests/ORM/PersistentCollectionTest.php b/tests/Doctrine/Tests/ORM/PersistentCollectionTest.php
index 4956e5648..41ce2959c 100644
--- a/tests/Doctrine/Tests/ORM/PersistentCollectionTest.php
+++ b/tests/Doctrine/Tests/ORM/PersistentCollectionTest.php
@@ -107,4 +107,29 @@ class PersistentCollectionTest extends OrmTestCase
         $this->assertSame("dummy", $this->collection->get(2));
         $this->assertSame(null, $this->collection->get(3));
     }
+
+    /**
+     * Test that PersistentCollection::clear() clear elements, and reset keys
+     */
+    public function testClear()
+    {
+        $this->setUpPersistentCollection();
+
+        $this->collection->add('dummy');
+        $this->assertEquals([0], array_keys($this->collection->toArray()));
+
+        $this->collection->removeElement('dummy');
+        $this->assertEquals([], array_keys($this->collection->toArray()));
+
+        $this->collection->add('dummy');
+        $this->collection->clear();
+        $this->assertEquals([], array_keys($this->collection->toArray()));
+
+        // test fix clear doesn't reset collection keys when collection is empty
+        $this->collection->add('dummy');
+        $this->collection->removeElement('dummy');
+        $this->collection->clear();
+        $this->collection->add('dummy');
+        $this->assertEquals([0], array_keys($this->collection->toArray()));
+    }
 }

From 9acf1702921afbebdd9e825b42364557b92460bd Mon Sep 17 00:00:00 2001
From: Marco Pivetta <ocramius@gmail.com>
Date: Sat, 26 Nov 2016 06:02:16 +0100
Subject: [PATCH 2/3] #6110 split test into multiple sub-scenarios involving
 `PersistentCollection` key checking

---
 .../Tests/ORM/PersistentCollectionTest.php    | 21 ++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/tests/Doctrine/Tests/ORM/PersistentCollectionTest.php b/tests/Doctrine/Tests/ORM/PersistentCollectionTest.php
index 41ce2959c..df1a16867 100644
--- a/tests/Doctrine/Tests/ORM/PersistentCollectionTest.php
+++ b/tests/Doctrine/Tests/ORM/PersistentCollectionTest.php
@@ -109,9 +109,9 @@ class PersistentCollectionTest extends OrmTestCase
     }
 
     /**
-     * Test that PersistentCollection::clear() clear elements, and reset keys
+     * @group 6110
      */
-    public function testClear()
+    public function testRemovingElementsAlsoRemovesKeys()
     {
         $this->setUpPersistentCollection();
 
@@ -120,12 +120,27 @@ class PersistentCollectionTest extends OrmTestCase
 
         $this->collection->removeElement('dummy');
         $this->assertEquals([], array_keys($this->collection->toArray()));
+    }
+
+    /**
+     * @group 6110
+     */
+    public function testClearWillAlsoClearKeys()
+    {
+        $this->setUpPersistentCollection();
 
         $this->collection->add('dummy');
         $this->collection->clear();
         $this->assertEquals([], array_keys($this->collection->toArray()));
+    }
+
+    /**
+     * @group 6110
+     */
+    public function testClearWillAlsoResetKeyPositions()
+    {
+        $this->setUpPersistentCollection();
 
-        // test fix clear doesn't reset collection keys when collection is empty
         $this->collection->add('dummy');
         $this->collection->removeElement('dummy');
         $this->collection->clear();

From 20190605a0af6122b1d89484298387294b6c08c8 Mon Sep 17 00:00:00 2001
From: Marco Pivetta <ocramius@gmail.com>
Date: Sat, 26 Nov 2016 06:06:49 +0100
Subject: [PATCH 3/3] #6110 CS (whitespace removal)

---
 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 000729754..b5948149a 100644
--- a/lib/Doctrine/ORM/PersistentCollection.php
+++ b/lib/Doctrine/ORM/PersistentCollection.php
@@ -543,7 +543,7 @@ final class PersistentCollection extends AbstractLazyCollection implements Selec
     {
         if ($this->initialized && $this->isEmpty()) {
             $this->collection->clear();
-            
+
             return;
         }