Merge branch 'test-gh817' into 1.0.x

* test-gh817: Inverse side of RefOne is no longer included in change set Added failing test for #817
doctrine · Dec 23, 2015 · 790110e · 790110e
2 parents 8c7398f + 6dbaf85
commit 790110e
Show file tree

Hide file tree

Showing 3 changed files with 50 additions and 5 deletions.
diff --git a/lib/Doctrine/ODM/MongoDB/Persisters/PersistenceBuilder.php b/lib/Doctrine/ODM/MongoDB/Persisters/PersistenceBuilder.php
@@ -93,7 +93,7 @@ public function prepareInsertData($document)
                 $insertData[$mapping['name']] = Type::getType($mapping['type'])->convertToDatabaseValue($new);
 
             // @ReferenceOne
-            } elseif (isset($mapping['association']) && $mapping['association'] === ClassMetadata::REFERENCE_ONE && $mapping['isOwningSide']) {
+            } elseif (isset($mapping['association']) && $mapping['association'] === ClassMetadata::REFERENCE_ONE) {
                 $insertData[$mapping['name']] = $this->prepareReferencedDocumentValue($mapping, $new);
 
             // @EmbedOne
@@ -207,7 +207,7 @@ public function prepareUpdateData($document)
                 }
 
             // @ReferenceOne
-            } elseif (isset($mapping['association']) && $mapping['association'] === ClassMetadata::REFERENCE_ONE && $mapping['isOwningSide']) {
+            } elseif (isset($mapping['association']) && $mapping['association'] === ClassMetadata::REFERENCE_ONE) {
                 if (isset($new) || $mapping['nullable'] === true) {
                     $updateData['$set'][$mapping['name']] = (is_null($new) ? null : $this->prepareReferencedDocumentValue($mapping, $new));
                 } else {
@@ -281,7 +281,7 @@ public function prepareUpsertData($document)
                 }
 
             // @ReferenceOne
-            } elseif (isset($mapping['association']) && $mapping['association'] === ClassMetadata::REFERENCE_ONE && $mapping['isOwningSide']) {
+            } elseif (isset($mapping['association']) && $mapping['association'] === ClassMetadata::REFERENCE_ONE) {
                 if (isset($new) || $mapping['nullable'] === true) {
                     $updateData['$set'][$mapping['name']] = (is_null($new) ? null : $this->prepareReferencedDocumentValue($mapping, $new));
                 }

diff --git a/lib/Doctrine/ODM/MongoDB/UnitOfWork.php b/lib/Doctrine/ODM/MongoDB/UnitOfWork.php
@@ -682,6 +682,10 @@ private function computeOrRecomputeChangeSet(ClassMetadata $class, $document, $r
                     $actualData[$propName] = $this->fixPersistentCollectionOwnership($actualValue, $document, $class, $propName);
                     $actualValue = $actualData[$propName];
                 }
+                // ignore inverse side of reference relationship
+                if (isset($class->fieldMappings[$propName]['reference']) && $class->fieldMappings[$propName]['isInverseSide']) {
+                    continue;
+                }
                 $changeSet[$propName] = array(null, $actualValue);
             }
             $this->documentChangeSets[$oid] = $changeSet;
@@ -736,8 +740,8 @@ private function computeOrRecomputeChangeSet(ClassMetadata $class, $document, $r
                     continue;
                 }
 
-                // ignore inverse side of reference-many relationship
-                if (isset($class->fieldMappings[$propName]['reference']) && $class->fieldMappings[$propName]['type'] === 'many' && $class->fieldMappings[$propName]['isInverseSide']) {
+                // ignore inverse side of reference relationship
+                if (isset($class->fieldMappings[$propName]['reference']) && $class->fieldMappings[$propName]['isInverseSide']) {
                     continue;
                 }
 

diff --git a/tests/Doctrine/ODM/MongoDB/Tests/Events/LifecycleCallbacksTest.php b/tests/Doctrine/ODM/MongoDB/Tests/Events/LifecycleCallbacksTest.php
@@ -220,6 +220,23 @@ public function testReferences()
         $this->assertFalse($user2->preUpdate);
         $this->assertFalse($user2->postUpdate);
     }
+
+    public function testEventsNotFiredForInverseSide()
+    {
+        $customer = new Customer();
+        $cart = new Cart();
+
+        $this->dm->persist($customer);
+        $this->dm->persist($cart);
+        $this->dm->flush();
+
+        $customer->cart = $cart;
+        $cart->customer = $customer;
+        $this->dm->flush();
+
+        $this->assertFalse($customer->postUpdate);
+        $this->assertTrue($cart->postUpdate);
+    }
 }
 
 /** @ODM\Document */
@@ -238,6 +255,30 @@ class User extends BaseDocument
     public $friends = array();
 }
 
+/** @ODM\Document */
+class Cart extends BaseDocument
+{
+    /** @ODM\Id */
+    public $id;
+
+    /**
+     * @ODM\ReferenceOne(targetDocument="Customer", inversedBy="cart")
+     */
+    public $customer;
+}
+
+/** @ODM\Document */
+class Customer extends BaseDocument
+{
+    /** @ODM\Id */
+    public $id;
+
+    /**
+     * @ODM\ReferenceOne(targetDocument="Cart", mappedBy="customer")
+     */
+    public $cart;
+}
+
 /** @ODM\EmbeddedDocument */
 class Profile extends BaseDocument
 {