Resolve association entries on multi get cache

doctrine · Feb 2, 2015 · 268426a · 268426a
1 parent 8435e1f
commit 268426a
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 8 deletions.
diff --git a/lib/Doctrine/ORM/Cache/DefaultCollectionHydrator.php b/lib/Doctrine/ORM/Cache/DefaultCollectionHydrator.php
@@ -89,7 +89,7 @@ public function loadCacheEntry(ClassMetadata $metadata, CollectionCacheKey $key,
 
         /* @var $entityEntries \Doctrine\ORM\Cache\EntityCacheEntry[] */
         foreach ($entityEntries as $index => $entityEntry) {
-            $list[$index] = $this->uow->createEntity($entityEntry->class, $entityEntry->data, self::$hints);
+            $list[$index] = $this->uow->createEntity($entityEntry->class, $entityEntry->resolveAssociationEntries($this->em), self::$hints);
         }
 
         array_walk($list, function($entity, $index) use ($collection) {

diff --git a/lib/Doctrine/ORM/UnitOfWork.php b/lib/Doctrine/ORM/UnitOfWork.php
@@ -2625,10 +2625,6 @@ public function createEntity($className, array $data, &$hints = array())
 
                         if ($joinColumnValue !== null) {
                             if ($targetClass->containsForeignIdentifier) {
-                                if ($joinColumnValue instanceof AssociationCacheEntry) {
-                                    $joinColumnValue = implode(' ', $joinColumnValue->identifier);
-                                }
-
                                 $associatedId[$targetClass->getFieldForColumn($targetColumn)] = $joinColumnValue;
                             } else {
                                 $associatedId[$targetClass->fieldNames[$targetColumn]] = $joinColumnValue;

diff --git a/lib/Doctrine/ORM/Utility/IdentifierFlattener.php b/lib/Doctrine/ORM/Utility/IdentifierFlattener.php
@@ -72,9 +72,7 @@ public function flattenIdentifier(ClassMetadata $class, array $id)
         $flatId = array();
 
         foreach ($class->identifier as $field) {
-            if (isset($class->associationMappings[$field]) && isset($id[$field]) && $id[$field] instanceof \Doctrine\ORM\Cache\AssociationCacheEntry) {
-                $flatId[$field] = implode(' ', $id[$field]->identifier);
-            } elseif (isset($class->associationMappings[$field]) && isset($id[$field]) && is_object($id[$field])) {
+            if (isset($class->associationMappings[$field]) && isset($id[$field]) && is_object($id[$field])) {
                 $targetClassMetadata = $this->metadataFactory->getMetadataFor(
                     $class->associationMappings[$field]['targetEntity']
                 );