Merge pull request #2108 from alcaeus/gh-2106

Fix merging of documents when not cascading references

Author: alcaeus

lib/Doctrine/ODM/MongoDB/UnitOfWork.php

@@ -1938,6 +1938,11 @@ private function doMerge($document, array &$visited, $prevManagedCopy = null, $a
                                 $targetClass = $this->dm->getClassMetadata($targetDocument);
                                 $relatedId = $targetClass->getIdentifierObject($other);
 
+                                $current = $prop->getValue($managedCopy);
+                                if ($current !== null) {
+                                    $this->removeFromIdentityMap($current);
+                                }
+
                                 if ($targetClass->subClasses) {
                                     $other = $this->dm->find($targetClass->name, $relatedId);
                                 } else {

tests/Doctrine/ODM/MongoDB/Tests/Functional/DetachedDocumentTest.php

@@ -2,6 +2,7 @@
 
 namespace Doctrine\Tests\ORM\Functional;
 
+use Documents\CmsArticle;
 use Documents\CmsUser;
 use Documents\CmsPhonenumber;
 use Documents\CmsAddress;
@@ -132,4 +133,28 @@ public function testUninitializedLazyAssociationsAreIgnoredOnMerge()
         $this->assertNotSame($managedAddress2->user, $detachedAddress2->user);
         $this->assertFalse($managedAddress2->user->__isInitialized());
     }
+
+    public function testMergeWithReference()
+    {
+        $cmsUser = new CmsUser();
+        $cmsUser->username = 'alcaeus';
+
+        $cmsArticle = new CmsArticle();
+        $cmsArticle->setAuthor($cmsUser);
+
+        $this->dm->persist($cmsUser);
+        $this->dm->persist($cmsArticle);
+        $this->dm->flush();
+        $this->dm->clear();
+
+        /** @var CmsArticle $cmsArticle */
+        $cmsArticle = $this->dm->find(CmsArticle::class, $cmsArticle->id);
+        $this->assertInstanceOf(CmsArticle::class, $cmsArticle);
+        $this->assertSame('alcaeus', $cmsArticle->user->getUsername());
+        $this->dm->clear();
+
+        $cmsArticle = $this->dm->merge($cmsArticle);
+
+        $this->assertSame('alcaeus', $cmsArticle->user->getUsername());
+    }
 }