Stop passing changeset by reference to PreUpdate event

doctrine · Jan 2, 2016 · cd58ce3 · cd58ce3
1 parent 5e483d1
commit cd58ce3
Show file tree

Hide file tree

Showing 3 changed files with 49 additions and 2 deletions.
diff --git a/lib/Doctrine/ODM/MongoDB/Event/PreUpdateEventArgs.php b/lib/Doctrine/ODM/MongoDB/Event/PreUpdateEventArgs.php
@@ -40,10 +40,10 @@ class PreUpdateEventArgs extends LifecycleEventArgs
      * @param DocumentManager $dm
      * @param array           $changeSet
      */
-    public function __construct($document, DocumentManager $dm, array &$changeSet)
+    public function __construct($document, DocumentManager $dm, array $changeSet)
     {
         parent::__construct($document, $dm);
-        $this->documentChangeSet = &$changeSet;
+        $this->documentChangeSet = $changeSet;
     }
 
     /**
@@ -105,6 +105,7 @@ public function setNewValue($field, $value)
         $this->assertValidField($field);
 
         $this->documentChangeSet[$field][1] = $value;
+        $this->getDocumentManager()->getUnitOfWork()->setDocumentChangeSet($this->getDocument(), $this->documentChangeSet);
     }
 
     /**

diff --git a/lib/Doctrine/ODM/MongoDB/UnitOfWork.php b/lib/Doctrine/ODM/MongoDB/UnitOfWork.php
@@ -585,6 +585,18 @@ public function getDocumentChangeSet($document)
         return array();
     }
 
+    /**
+     * INTERNAL:
+     * Sets the changeset for a document.
+     *
+     * @param object $document
+     * @param array $changeset
+     */
+    public function setDocumentChangeSet($document, $changeset)
+    {
+        $this->documentChangeSets[spl_object_hash($document)] = $changeset;
+    }
+
     /**
      * Get a documents actual data, flattening all the objects to arrays.
      *

diff --git a/tests/Doctrine/ODM/MongoDB/Tests/Events/PreUpdateEventArgsTest.php b/tests/Doctrine/ODM/MongoDB/Tests/Events/PreUpdateEventArgsTest.php
@@ -0,0 +1,34 @@
+<?php
+
+namespace Doctrine\ODM\MongoDB\Tests\Events;
+
+use Doctrine\ODM\MongoDB\Event\PreUpdateEventArgs;
+use Doctrine\ODM\MongoDB\Events;
+use Documents\Article;
+
+class PreUpdateEventArgsTest extends \Doctrine\ODM\MongoDB\Tests\BaseTest
+{
+    public function setUp()
+    {
+        parent::setUp();
+        $this->dm->getEventManager()->addEventListener(Events::preUpdate, $this);
+    }
+
+    public function testChangeSetIsUpdated()
+    {
+        $a = new Article();
+        $a->setTitle('Title');
+        $this->dm->persist($a);
+        $this->dm->flush();
+        $a->setBody('Body');
+        $this->dm->flush();
+        $this->dm->clear();
+        $a = $this->dm->find(Article::class, $a->getId());
+        $this->assertEquals('Changed', $a->getBody());
+    }
+
+    public function preUpdate(PreUpdateEventArgs $e)
+    {
+        $e->setNewValue('body', 'Changed');
+    }
+}