From 91f4ed8b921fcc5fd5bf94a0fe470364c9548411 Mon Sep 17 00:00:00 2001
From: Marco Pivetta <ocramius@gmail.com>
Date: Tue, 20 Jan 2015 15:48:00 +0100
Subject: [PATCH] DDC-2704 - data should be merged only into initialized
 proxies

---
 .../Tests/ORM/Functional/MergeProxiesTest.php | 29 +++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/tests/Doctrine/Tests/ORM/Functional/MergeProxiesTest.php b/tests/Doctrine/Tests/ORM/Functional/MergeProxiesTest.php
index daed36652..3b334d5d5 100644
--- a/tests/Doctrine/Tests/ORM/Functional/MergeProxiesTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/MergeProxiesTest.php
@@ -83,6 +83,35 @@ class MergeProxiesTest extends OrmFunctionalTestCase
         $this->assertFalse($managed->__isInitialized());
     }
 
+    /**
+     * @group DDC-1392
+     * @group DDC-1734
+     * @group DDC-3368
+     * @group #1172
+     *
+     * Bug discovered while working on DDC-2704 - merging towards un-initialized proxies does not initialize them,
+     * causing merged data to be lost when they are actually initialized
+     */
+    public function testMergeWithExistingUninitializedManagedProxy()
+    {
+        $date = new DateTimeModel();
+
+        $this->_em->persist($date);
+        $this->_em->flush($date);
+        $this->_em->clear();
+
+        $managed = $this->_em->getReference(DateTimeModel::CLASSNAME, $date->id);
+
+        $this->assertInstanceOf('Doctrine\Common\Proxy\Proxy', $managed);
+        $this->assertFalse($managed->__isInitialized());
+
+        $date->date = $dateTime = new \DateTime();
+
+        $this->assertSame($managed, $this->_em->merge($date));
+        $this->assertTrue($managed->__isInitialized());
+        $this->assertSame($dateTime, $managed->date, 'Data was merged into the proxy after initialization');
+    }
+
     /**
      * @group DDC-1392
      * @group DDC-1734