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

Second level cache stores identifier with correct type even if findById is called with wrong identifier type

Browse Source
This commit is contained in:
Jan Langer 2015-11-14 10:36:19 +01:00
parent 71bb27a62f
commit 91ce78815f
2 changed files with 34 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Doctrine/ORM/Cache/DefaultEntityHydrator.php
View File

@ -73,7 +73,7 @@ class DefaultEntityHydrator implements EntityHydrator
public function buildCacheEntry(ClassMetadata $metadata, EntityCacheKey $key, $entity) public function buildCacheEntry(ClassMetadata $metadata, EntityCacheKey $key, $entity)
{ {
$data = $this->uow->getOriginalEntityData($entity); $data = $this->uow->getOriginalEntityData($entity);
$data = array_merge($data, $key->identifier); // why update has no identifier values ? $data = array_merge($data, $metadata->getIdentifierValues($entity)); // why update has no identifier values ?
foreach ($metadata->associationMappings as $name => $assoc) { foreach ($metadata->associationMappings as $name => $assoc) {
if ( ! isset($data[$name])) { if ( ! isset($data[$name])) {

36
tests/Doctrine/Tests/ORM/Cache/DefaultEntityHydratorTest.php
View File

@ -119,7 +119,7 @@ class DefaultEntityHydratorTest extends OrmTestCase
$this->assertArrayHasKey('name', $cache->data); $this->assertArrayHasKey('name', $cache->data);
$this->assertArrayHasKey('country', $cache->data); $this->assertArrayHasKey('country', $cache->data);
$this->assertEquals(array( $this->assertEquals(array(
'id' => 11, 'id' => 12,
'name' => 'Bar', 'name' => 'Bar',
'country' => new AssociationCacheEntry(Country::CLASSNAME, array('id' => 11)), 'country' => new AssociationCacheEntry(Country::CLASSNAME, array('id' => 11)),
), $cache->data); ), $cache->data);
@ -147,9 +147,39 @@ class DefaultEntityHydratorTest extends OrmTestCase
$this->assertArrayHasKey('name', $cache->data); $this->assertArrayHasKey('name', $cache->data);
$this->assertArrayHasKey('country', $cache->data); $this->assertArrayHasKey('country', $cache->data);
$this->assertEquals(array( $this->assertEquals(array(
'id' => 11, 'id' => 12,
'name' => 'Bar', 'name' => 'Bar',
'country' => new AssociationCacheEntry(Country::CLASSNAME, array('id' => 11)), 'country' => new AssociationCacheEntry(Country::CLASSNAME, array('id' => 11)),
), $cache->data); ), $cache->data);
} }
}
public function testCacheEntryWithWrongIdentifierType()
{
$proxy = $this->em->getReference(Country::CLASSNAME, 11);
$entity = new State('Bat', $proxy);
$uow = $this->em->getUnitOfWork();
$entityData = array('id'=> 12, 'name'=>'Bar', 'country' => $proxy);
$metadata = $this->em->getClassMetadata(State::CLASSNAME);
$key = new EntityCacheKey($metadata->name, array('id'=>'12'));
$entity->setId(12);
$uow->registerManaged($entity, array('id'=>12), $entityData);
$cache = $this->structure->buildCacheEntry($metadata, $key, $entity);
$this->assertInstanceOf('Doctrine\ORM\Cache\CacheEntry', $cache);
$this->assertInstanceOf('Doctrine\ORM\Cache\EntityCacheEntry', $cache);
$this->assertArrayHasKey('id', $cache->data);
$this->assertArrayHasKey('name', $cache->data);
$this->assertArrayHasKey('country', $cache->data);
$this->assertSame($entity->getId(), $cache->data['id']);
$this->assertEquals(array(
'id' => 12,
'name' => 'Bar',
'country' => new AssociationCacheEntry(Country::CLASSNAME, array('id' => 11)),
), $cache->data);
}
}