Trigger eager loading when using the attributes serializer option

dunglas · dunglas · commit fe80ac4a1b14 · 2017-12-06T13:18:16.000+01:00
diff --git a/src/Bridge/Doctrine/Orm/Extension/EagerLoadingExtension.php b/src/Bridge/Doctrine/Orm/Extension/EagerLoadingExtension.php
@@ -137,8 +137,11 @@ private function joinRelations(QueryBuilder $queryBuilder, QueryNameGeneratorInt
                 continue;
             }
 
-            if ((false === $propertyMetadata->isReadableLink() || false === $propertyMetadata->isReadable()) && false === $propertyMetadata->getAttribute('fetchEager', false)) {
-                continue;
+            if ($inAttributes = isset($context[AbstractNormalizer::ATTRIBUTES][$association])) {
+                // prepare the child context
+                $context[AbstractNormalizer::ATTRIBUTES] = $context[AbstractNormalizer::ATTRIBUTES][$association];
+            } else {
+                unset($context[AbstractNormalizer::ATTRIBUTES]);
             }
 
             $isNullable = $mapping['joinColumns'][0]['nullable'] ?? true;

Original file line number	Diff line number	Diff line change
`@@ -137,8 +137,11 @@ private function joinRelations(QueryBuilder $queryBuilder, QueryNameGeneratorInt`
`137`	`137`	`continue;`
`138`	`138`	`}`
`139`	`139`
`140`		`- if ((false === $propertyMetadata->isReadableLink() \|\| false === $propertyMetadata->isReadable()) && false === $propertyMetadata->getAttribute('fetchEager', false)) {`
`141`		`- continue;`
	`140`	`+ if ($inAttributes = isset($context[AbstractNormalizer::ATTRIBUTES][$association])) {`
	`141`	`+ // prepare the child context`
	`142`	`+ $context[AbstractNormalizer::ATTRIBUTES] = $context[AbstractNormalizer::ATTRIBUTES][$association];`
	`143`	`+ } else {`
	`144`	`+ unset($context[AbstractNormalizer::ATTRIBUTES]);`
`142`	`145`	`}`
`143`	`146`
`144`	`147`	`$isNullable = $mapping['joinColumns'][0]['nullable'] ?? true;`