From a18f258b4d1a3ae2987d7182284d4ce583bbbdcd Mon Sep 17 00:00:00 2001
From: Marco Pivetta <ocramius@gmail.com>
Date: Fri, 16 Jan 2015 21:15:39 +0100
Subject: [PATCH] #1172 - covering merging of managed proxies

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

diff --git a/tests/Doctrine/Tests/ORM/Functional/MergeUninitializedProxyTest.php b/tests/Doctrine/Tests/ORM/Functional/MergeUninitializedProxyTest.php
index d0b8036cb..f5661c98e 100644
--- a/tests/Doctrine/Tests/ORM/Functional/MergeUninitializedProxyTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/MergeUninitializedProxyTest.php
@@ -53,6 +53,15 @@ class MergeUninitializedProxyTest extends \Doctrine\Tests\OrmFunctionalTestCase
         $this->assertFalse($detachedUninitialized->__isInitialized());
     }
 
+    public function testMergeManagedProxy()
+    {
+        $managed = $this->_em->getReference(MUPFile::CLASSNAME, 123);
+
+        $this->assertSame($managed, $this->_em->merge($managed));
+
+        $this->assertFalse($managed->__isInitialized());
+    }
+
     public function testMergeUnserializedIntoEntity() {
 
         $file = new MUPFile;