RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-03-06 21:06:16 +03:00
Code Issues Projects Releases Wiki Activity

Avoid error when entityName isn't a string

Browse Source
This commit is contained in:
Jeremy Benoist 2016-09-11 16:31:08 +02:00 committed by Marco Pivetta
parent 77a338e0fd
commit 4a87f00fab
2 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3442,6 +3442,10 @@ class UnitOfWork implements PropertyChangedListener
*/ */
private function clearIdentityMapForEntityName($entityName) private function clearIdentityMapForEntityName($entityName)
{ {
if (is_object($entityName)) {
return;
}
if (! isset($this->identityMap[$entityName])) { if (! isset($this->identityMap[$entityName])) {
return; return;
} }

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

@ -349,6 +349,20 @@ class UnitOfWorkTest extends OrmTestCase
$this->assertFalse($this->_unitOfWork->isScheduledForInsert($entity2)); $this->assertFalse($this->_unitOfWork->isScheduledForInsert($entity2));
} }
public function testClearManagerWithObject()
{
$entity = new Country(456, 'United Kingdom');
$this->_unitOfWork->persist($entity);
$this->assertTrue($this->_unitOfWork->isInIdentityMap($entity));
$this->_unitOfWork->clear($entity);
// true because entity wasn't a string so it wasn't cleared
$this->assertTrue($this->_unitOfWork->isInIdentityMap($entity));
$this->assertTrue($this->_unitOfWork->isScheduledForInsert($entity));
}
/** /**
* Data Provider * Data Provider
* *