#1172 - covering merging of managed proxies
This commit is contained in:
parent
0329ac5074
commit
a18f258b4d
@ -53,6 +53,15 @@ class MergeUninitializedProxyTest extends \Doctrine\Tests\OrmFunctionalTestCase
|
|||||||
$this->assertFalse($detachedUninitialized->__isInitialized());
|
$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() {
|
public function testMergeUnserializedIntoEntity() {
|
||||||
|
|
||||||
$file = new MUPFile;
|
$file = new MUPFile;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user