Merge pull request #1432 from alcaeus/fix-embedded-fieldname

Fix field name usage when fixing embedded document ownership

Author: alcaeus

CHANGELOG-1.0.md

@@ -23,6 +23,7 @@ All issues and pull requests in this release may be found under the
 * [#1416](https://github.com/doctrine/mongodb-odm/pull/1416) fixes name resolution when priming references contained in embedded documents.
 * [#1417](https://github.com/doctrine/mongodb-odm/pull/1417) fixes unserializing PersistentCollection objects contained in documents.
 * [#1431](https://github.com/doctrine/mongodb-odm/pull/1431) fixes potential object hash collisions with embedded documents by keeping a copy of the document in UnitOfWork.
+* [#1432](https://github.com/doctrine/mongodb-odm/pull/1432) fixes the usage of embedded document field names when fixing document ownership.
 
 1.0.5 (2016-02-16)
 ------------------

lib/Doctrine/ODM/MongoDB/UnitOfWork.php

@@ -968,8 +968,8 @@ private function computeAssociationChanges($parentDocument, array $assoc, $value
                         if ($knownParent && $knownParent !== $parentDocument) {
                             $entry = clone $entry;
                             if ($assoc['type'] === ClassMetadata::ONE) {
-                                $class->setFieldValue($parentDocument, $assoc['name'], $entry);
-                                $this->setOriginalDocumentProperty(spl_object_hash($parentDocument), $assoc['name'], $entry);
+                                $class->setFieldValue($parentDocument, $assoc['fieldName'], $entry);
+                                $this->setOriginalDocumentProperty(spl_object_hash($parentDocument), $assoc['fieldName'], $entry);
                             } else {
                                 // must use unwrapped value to not trigger orphan removal
                                 $unwrappedValue[$key] = $entry;

tests/Doctrine/ODM/MongoDB/Tests/Functional/Ticket/GH1428Test.php

@@ -0,0 +1,54 @@
+<?php
+
+namespace Doctrine\ODM\MongoDB\Tests\Functional\Ticket;
+
+use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM;
+use Doctrine\ODM\MongoDB\Tests\BaseTest;
+use PHPUnit_Framework_Error_Notice;
+
+class GH1428Test extends BaseTest
+{
+    public function testShortNameLoss_OnReplacingMiddleEmbeddedDoc_OfNestedEmbedding()
+    {
+        $owner = new GH1428Document();
+        $nestedEmbedded = new GH1428NestedEmbeddedDocument();
+        $this->dm->persist($owner);
+        $this->dm->flush();
+
+        $owner->embedded = new GH1428EmbeddedDocument();
+        $owner->embedded->nestedEmbedded = $nestedEmbedded;
+        $this->dm->flush();
+
+        $owner->embedded = new GH1428EmbeddedDocument();
+        $owner->embedded->nestedEmbedded = $nestedEmbedded;
+
+        try {
+            $this->dm->flush();
+            $this->assertTrue(true);
+        } catch (PHPUnit_Framework_Error_Notice $ex) {
+            $this->fail($ex);
+        }
+    }
+}
+
+/** @ODM\Document */
+class GH1428Document
+{
+    /** @ODM\Id */
+    public $id;
+
+    /** @ODM\EmbedOne(targetDocument="GH1428EmbeddedDocument") */
+    public $embedded;
+}
+
+/** @ODM\EmbeddedDocument */
+class GH1428EmbeddedDocument
+{
+    /** @ODM\EmbedOne(targetDocument="GH1428NestedEmbeddedDocument", name="shortNameThatDoesntExist") */
+    public $nestedEmbedded;
+}
+
+/** @ODM\EmbeddedDocument */
+class GH1428NestedEmbeddedDocument
+{
+}