|
@@ -130,7 +130,7 @@ discard block |
|
|
block discarded – undo |
|
130
|
130
|
|
|
131
|
131
|
if ( ! $hasRelation) { |
|
132
|
132
|
|
|
133
|
|
- $result[$index] = $this->uow->createEntity($entityEntry->class, $entityEntry->resolveAssociationEntries($this->em), self::$hints); |
|
|
133
|
+ $result[$index] = $this->uow->createEntity($entityEntry->class, $entityEntry->resolveAssociationEntries($this->em), self::$hints); |
|
134
|
134
|
|
|
135
|
135
|
continue; |
|
136
|
136
|
} |
|
@@ -263,7 +263,7 @@ discard block |
|
|
block discarded – undo |
|
263
|
263
|
$metadata = $this->em->getClassMetadata($rsm->aliasMap[$rsm->parentAliasMap[$alias]]); |
|
264
|
264
|
$className = $metadata->getName(); |
|
265
|
265
|
|
|
266
|
|
- if (! $entity instanceof $className) { |
|
|
266
|
+ if ( ! $entity instanceof $className) { |
|
267
|
267
|
// this alias is not the root alias, therefore we skip it. $entity is always the root of the selection here |
|
268
|
268
|
// @TODO should actually cache all aliases |
|
269
|
269
|
continue; |
Please login to merge, or discard this patch.