Merge pull request #1210 from VoycerAG/fix-proxy-changeset-computation

Don't compute changesets for uninitialized proxies

Author: alcaeus

lib/Doctrine/ODM/MongoDB/UnitOfWork.php

@@ -989,6 +989,11 @@ private function computeAssociationChanges($parentDocument, array $assoc, $value
      */
     public function recomputeSingleDocumentChangeSet(ClassMetadata $class, $document)
     {
+        // Ignore uninitialized proxy objects
+        if ($document instanceof Proxy && ! $document->__isInitialized__) {
+            return;
+        }
+
         $oid = spl_object_hash($document);
 
         if ( ! isset($this->documentStates[$oid]) || $this->documentStates[$oid] != self::STATE_MANAGED) {

tests/Doctrine/ODM/MongoDB/Tests/UnitOfWorkTest.php

@@ -586,6 +586,31 @@ public function testGetClassNameForAssociationReturnsTargetDocumentWithNullData(
         $this->assertEquals('Documents\User', $this->uow->getClassNameForAssociation($mapping, null));
     }
 
+    public function testRecomputeChangesetForUninitializedProxyDoesNotCreateChangeset()
+    {
+        $user = new \Documents\ForumUser();
+        $user->username = '12345';
+        $user->setAvatar(new \Documents\ForumAvatar());
+
+        $this->dm->persist($user);
+        $this->dm->flush();
+
+        $id = $user->getId();
+        $this->dm->clear();
+
+        $user = $this->dm->find('\Documents\ForumUser', $id);
+        $this->assertInstanceOf('\Documents\ForumUser', $user);
+
+        $this->assertInstanceOf('Doctrine\ODM\MongoDB\Proxy\Proxy', $user->getAvatar());
+
+        $classMetadata = $this->dm->getClassMetadata('Documents\ForumAvatar');
+
+        $this->uow->recomputeSingleDocumentChangeSet($classMetadata, $user->getAvatar());
+
+        $this->assertEquals(array(), $this->uow->getDocumentChangeSet($user->getAvatar()));
+    }
+
+
     protected function getDocumentManager()
     {
         return new \Stubs\DocumentManager();