Fix changeset handling for new documents

lib/Doctrine/ODM/MongoDB/UnitOfWork.php

@@ -803,7 +803,9 @@ private function computeOrRecomputeChangeSet(ClassMetadata $class, $document, $r
                     : $changeSet;
 
                 $this->originalDocumentData[$oid] = $actualData;
-                $this->documentUpdates[$oid] = $document;
+                if ( ! isset($this->documentInsertions[$oid])) {
+                    $this->documentUpdates[$oid] = $document;
+                }
             }
         }
 
@@ -831,7 +833,7 @@ private function computeOrRecomputeChangeSet(ClassMetadata $class, $document, $r
                         $oid2 = spl_object_hash($obj);
                         if (isset($this->documentChangeSets[$oid2])) {
                             $this->documentChangeSets[$oid][$mapping['fieldName']] = array($value, $value);
-                            if ( ! $isNewDocument) {
+                            if ( ! $isNewDocument && ! isset($this->documentInsertions[$oid])) {
                                 $this->documentUpdates[$oid] = $document;
                             }
                             break;

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

@@ -0,0 +1,69 @@
+<?php
+
+namespace Doctrine\ODM\MongoDB\Tests\Functional\Ticket;
+
+use Doctrine\ODM\MongoDB\Event\OnFlushEventArgs;
+use Doctrine\ODM\MongoDB\Events;
+use Doctrine\ODM\MongoDB\Tests\BaseTest;
+use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM;
+
+class GH999Test extends BaseTest
+{
+    public function testModifyingInFlushHandler()
+    {
+        $this->dm->getEventManager()->addEventListener(array(Events::onFlush), new GH999Listener());
+
+        $document = new GH999Document('name');
+        $this->dm->persist($document);
+        $this->dm->flush();
+    }
+}
+
+class GH999Listener
+{
+    public function onFlush(OnFlushEventArgs $args) {
+        $dm = $args->getDocumentManager();
+
+        foreach ($dm->getUnitOfWork()->getScheduledDocumentInsertions() as $document) {
+            $document->setName('name #changed');
+            $metadata = $dm->getClassMetadata(get_class($document));
+            $dm->getUnitOfWork()->recomputeSingleDocumentChangeSet($metadata, $document);
+        }
+    }
+}
+
+/** @ODM\Document @ODM\HasLifecycleCallbacks */
+class GH999Document
+{
+    /** @ODM\Id */
+    private $id;
+
+    /** @ODM\String */
+    private $name;
+
+    public function __construct($name)
+    {
+        $this->name = $name;
+    }
+
+    public function getId()
+    {
+        return $this->id;
+    }
+
+    public function getName()
+    {
+        return $this->name;
+    }
+
+    public function setName($name)
+    {
+        $this->name = $name;
+    }
+
+    /** @ODM\PostUpdate */
+    public function postUpdate()
+    {
+        throw new \Exception('Did not expect postUpdate to be called when persisting a new document');
+    }
+}

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

@@ -347,22 +347,22 @@ public function getScheduleForUpdateWithArraysTests()
             array(
                 null,
                 array('bar' => 'foo'),
-                true
+                false
             ),
             array(
                 array('foo' => 'bar'),
                 null,
-                true
+                false
             ),
             array(
                 array('foo' => 'bar'),
                 array('bar' => 'foo'),
-                true
+                false
             ),
             array(
                 array('foo' => 'bar'),
                 array('foo' => 'foo'),
-                true
+                false
             ),
             array(
                 array('foo' => 'bar'),
@@ -372,17 +372,17 @@ public function getScheduleForUpdateWithArraysTests()
             array(
                 array('foo' => 'bar'),
                 array('foo' => true),
-                true
+                false
             ),
             array(
                 array('foo' => 'bar'),
                 array('foo' => 99),
-                true
+                false
             ),
             array(
                 array('foo' => 99),
                 array('foo' => true),
-                true
+                false
             ),
             array(
                 array('foo' => true),