doctrine · moroine · Jul 15, 2015 · Nov 27, 2015 · Nov 27, 2015 · Nov 27, 2015
diff --git a/lib/Doctrine/ORM/UnitOfWork.php b/lib/Doctrine/ORM/UnitOfWork.php
@@ -1896,9 +1896,39 @@ private function doMerge($entity, array &$visited, $prevManagedCopy = null, $ass
 
         $this->cascadeMerge($entity, $managedCopy, $visited);
 
+        // Restore previous state (where the given entity was previously managed)
+        if ($managedCopy !== $entity) {
+            $this->forgetEntity($entity);
+        }
+
         return $managedCopy;
     }
 
+    /**
+     * Remove UOW reference to this entity.
+     *
+     * WARNING: could cause some issue, created to fix MergeSplHashConflict
+     *
+     * @param object $entity
+     */
+    private function forgetEntity($entity)
+    {
+        $oid = spl_object_hash($entity);
+
+        if ($this->isInIdentityMap($entity)) {
+            $this->removeFromIdentityMap($entity);
+        }
+
+        unset(
+            $this->entityInsertions[$oid],
+            $this->entityUpdates[$oid],
+            $this->entityDeletions[$oid],
+            $this->entityIdentifiers[$oid],
+            $this->entityStates[$oid],
+            $this->originalEntityData[$oid]
+        );
+    }
+
     /**
      * Tests if an entity is loaded - must either be a loaded proxy or not a proxy
      *

diff --git a/tests/Doctrine/Tests/ORM/Functional/MergeSplHashConflictTest.php b/tests/Doctrine/Tests/ORM/Functional/MergeSplHashConflictTest.php
@@ -0,0 +1,78 @@
+<?php
+
+namespace Doctrine\Tests\ORM\Functional;
+
+use Doctrine\ORM\Query;
+use Doctrine\Tests\Models\CMS\CmsUser;
+use Doctrine\Tests\OrmFunctionalTestCase;
+
+class MergeSplHashConflictTest extends OrmFunctionalTestCase
+{
+    protected function setUp()
+    {
+        $this->useModelSet('cms');
+        parent::setUp();
+    }
+
+
+    /**
+     * @test
+     * @covers Doctrine\ORM\UnitOfWork::forgetEntity
+     */
+    public function testForgetEntity()
+    {
+        $user = new CmsUser;
+        $user->username = 'bilouwan';
+        $user->name = 'moroine';
+        $hash = spl_object_hash($user);
+        $this->_em->persist($user);
+        $this->_em->flush();
+
+        $uow = $this->_em->getUnitOfWork();
+        $reflexion = new \ReflectionClass(get_class($uow));
+        $method = $reflexion->getMethod('forgetEntity');
+        $method->setAccessible(true);
+        $method->invoke($uow, $user);
+
+        $propertyNames = [
+            'entityInsertions',
+            'entityUpdates',
+            'entityDeletions',
+            'entityIdentifiers',
+            'entityStates',
+            'originalEntityData',
+        ];
+
+        foreach ($propertyNames as $propertyName) {
+            $property = $reflexion->getProperty($propertyName);
+            $property->setAccessible(true);
+            $originalEntityData = $property->getValue($uow);
+
+            // As $user is unset, $hash could be reused by spl_object_hash
+            $this->assertArrayNotHasKey($hash, $originalEntityData);
+        }
+    }
+
+    /**
+     * @test
+     * @covers Doctrine\ORM\UnitOfWork::merge
+     */
+    public function testMergeSplHashConflict()
+    {
+        // Create
+        $user = new CmsUser;
+        $hash = spl_object_hash($user);
+
+        $mergedUser = $this->_em->merge($user);
+        unset($user);
+
+        $uow = $this->_em->getUnitOfWork();
+        $reflexion = new \ReflectionClass(get_class($uow));
+        $property = $reflexion->getProperty('originalEntityData');
+        $property->setAccessible(true);
+        $originalEntityData = $property->getValue($uow);
+
+        // As $user is unset, $hash could be reused by spl_object_hash
+        $this->assertArrayNotHasKey($hash, $originalEntityData);
+    }
+}