RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-04-03 13:23:37 +03:00
Code Issues Projects Releases Wiki Activity

#954 DDC-2982 - No need to check if a Region is a MultiGetRegion

Browse source
This commit is contained in:
Marco Pivetta 2015-01-17 23:11:14 +01:00
parent 3c5a794691
commit 8ddcc4b270
1 changed files with 5 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
lib/Doctrine/ORM/Cache/DefaultCollectionHydrator.php
View file

@ -76,25 +76,18 @@ class DefaultCollectionHydrator implements CollectionHydrator
public function loadCacheEntry(ClassMetadata $metadata, CollectionCacheKey $key, CollectionCacheEntry $entry, PersistentCollection $collection) public function loadCacheEntry(ClassMetadata $metadata, CollectionCacheKey $key, CollectionCacheEntry $entry, PersistentCollection $collection)
{ {
$assoc = $metadata->associationMappings[$key->association]; $assoc = $metadata->associationMappings[$key->association];
/* @var $targetPersister \Doctrine\ORM\Cache\Persister\CachedPersister */
$targetPersister = $this->uow->getEntityPersister($assoc['targetEntity']); $targetPersister = $this->uow->getEntityPersister($assoc['targetEntity']);
$targetRegion = $targetPersister->getCacheRegion(); $targetRegion = $targetPersister->getCacheRegion();
$list = array(); $list = array();
if ($targetRegion instanceof MultiGetRegion) { $entityEntries = $targetRegion->getMultiple($entry);
$entityEntries = $targetRegion->getMulti($entry);
if ($entityEntries === null) { if ($entityEntries === null) {
return null; return null;
}
} else {
$entityEntries = array();
foreach ($entry->identifiers as $index => $identifier) {
if (null === ($entityEntries[$index] = $targetRegion->get($identifier))) {
return null;
}
}
} }
/* @var $entityEntries \Doctrine\ORM\Cache\EntityCacheEntry[] */
foreach ($entityEntries as $index => $entityEntry) { foreach ($entityEntries as $index => $entityEntry) {
$list[$index] = $this->uow->createEntity($entityEntry->class, $entityEntry->data, self::$hints); $list[$index] = $this->uow->createEntity($entityEntry->class, $entityEntry->data, self::$hints);
} }