RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-01-19 15:01:40 +03:00
Code Issues Projects Releases Wiki Activity

#1172 - when merging an initialized proxy, the managed proxy must be initialized before merging

Browse Source
This commit is contained in:
Marco Pivetta 2015-01-16 21:23:47 +01:00
parent a18f258b4d
commit 3df119f4fe
1 changed files with 25 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -62,6 +62,27 @@ class MergeUninitializedProxyTest extends \Doctrine\Tests\OrmFunctionalTestCase
$this->assertFalse($managed->__isInitialized()); $this->assertFalse($managed->__isInitialized());
} }
public function testMergeInitializedProxy()
{
$file = new MUPFile();
$this->_em->persist($file);
$this->_em->flush();
$this->_em->clear();
$initialized = $this->_em->getReference(MUPFile::CLASSNAME, $file->fileId);
$initialized->__load();
$this->_em->clear();
$managed = $this->_em->getReference(MUPFile::CLASSNAME, $file->fileId);
$this->assertSame($managed, $this->_em->merge($initialized));
$this->assertTrue($managed->__isInitialized());
}
public function testMergeUnserializedIntoEntity() { public function testMergeUnserializedIntoEntity() {
$file = new MUPFile; $file = new MUPFile;
@ -212,18 +233,14 @@ class MUPPicture
} }
/** /** @Entity */
* @Entity
*/
class MUPFile class MUPFile
{ {
const CLASSNAME = __CLASS__; const CLASSNAME = __CLASS__;
/** /** @Column(name="file_id", type="integer") @Id @GeneratedValue(strategy="AUTO") */
* @Column(name="file_id", type="integer")
* @Id
* @GeneratedValue(strategy="AUTO")
*/
public $fileId; public $fileId;
/** @Column(type="string", nullable=true) */
private $contents;
} }