RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-03-10 14:56:11 +03:00
Code Issues Projects Releases Wiki Activity

Merge branch 'hotfix/#1338-identity-map-garbage-collection-prevention-on-canceled-remove-2.4' into 2.4

Browse Source
This commit is contained in:
Marco Pivetta 2015-03-17 22:42:48 +00:00
commit 1c8f9ca1cc
2 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/Doctrine/ORM/UnitOfWork.php
View File

@ -1630,6 +1630,7 @@ class UnitOfWork implements PropertyChangedListener
case self::STATE_REMOVED: case self::STATE_REMOVED:
// Entity becomes managed again // Entity becomes managed again
unset($this->entityDeletions[$oid]); unset($this->entityDeletions[$oid]);
$this->addToIdentityMap($entity);
$this->entityStates[$oid] = self::STATE_MANAGED; $this->entityStates[$oid] = self::STATE_MANAGED;
break; break;

19
tests/Doctrine/Tests/ORM/UnitOfWorkTest.php
View File

@ -229,6 +229,25 @@ class UnitOfWorkTest extends \Doctrine\Tests\OrmTestCase
$this->setExpectedException('InvalidArgumentException'); $this->setExpectedException('InvalidArgumentException');
$this->_unitOfWork->lock(null, null, null); $this->_unitOfWork->lock(null, null, null);
} }
/**
* @group DDC-3619
* @group 1338
*/
public function testRemovedAndRePersistedEntitiesAreInTheIdentityMapAndAreNotGarbageCollected()
{
$entity = new ForumUser();
$entity->id = 123;
$this->_unitOfWork->registerManaged($entity, array('id' => 123), array());
$this->assertTrue($this->_unitOfWork->isInIdentityMap($entity));
$this->_unitOfWork->remove($entity);
$this->assertFalse($this->_unitOfWork->isInIdentityMap($entity));
$this->_unitOfWork->persist($entity);
$this->assertTrue($this->_unitOfWork->isInIdentityMap($entity));
}
} }
/** /**