RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-01-31 12:32:59 +03:00
Code Issues Projects Releases Wiki Activity

#1172 - covering merging of managed proxies

Browse Source
This commit is contained in:
Marco Pivetta 2015-01-16 21:15:39 +01:00
parent 0329ac5074
commit a18f258b4d
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tests/Doctrine/Tests/ORM/Functional/MergeUninitializedProxyTest.php
View File

@ -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;