Trigger eager loading when using the attributes serializer option

Author: dunglas

src/Bridge/Doctrine/Orm/Extension/EagerLoadingExtension.php

@@ -79,7 +79,7 @@ public function applyToCollection(QueryBuilder $queryBuilder, QueryNameGenerator
         $fetchPartial = $this->shouldOperationFetchPartial($resourceClass, $options);
         $serializerContext = $this->getSerializerContext($resourceClass, 'normalization_context', $options);
 
-        $groups = $this->getSerializerGroups($options, $serializerContext);
+        $groups = $this->getPropertyMetadataOptions($options, $serializerContext);
 
         $this->joinRelations($queryBuilder, $queryNameGenerator, $resourceClass, $forceEager, $fetchPartial, $queryBuilder->getRootAliases()[0], $groups, $serializerContext);
     }
@@ -99,9 +99,9 @@ public function applyToItem(QueryBuilder $queryBuilder, QueryNameGeneratorInterf
         $fetchPartial = $this->shouldOperationFetchPartial($resourceClass, $options);
         $contextType = isset($context['api_denormalize']) ? 'denormalization_context' : 'normalization_context';
         $serializerContext = $this->getSerializerContext($context['resource_class'] ?? $resourceClass, $contextType, $options);
-        $groups = $this->getSerializerGroups($options, $serializerContext);
+        $serializerOptions = $this->getPropertyMetadataOptions($options, $serializerContext);
 
-        $this->joinRelations($queryBuilder, $queryNameGenerator, $resourceClass, $forceEager, $fetchPartial, $queryBuilder->getRootAliases()[0], $groups, $serializerContext);
+        $this->joinRelations($queryBuilder, $queryNameGenerator, $resourceClass, $forceEager, $fetchPartial, $queryBuilder->getRootAliases()[0], $serializerOptions, $serializerContext);
     }
 
     /**
@@ -145,6 +145,7 @@ private function joinRelations(QueryBuilder $queryBuilder, QueryNameGeneratorInt
                 continue;
             }
 
+            $attributes = $serializerContext[AbstractNormalizer::ATTRIBUTES] ?? null;
             if ((false === $propertyMetadata->isReadableLink() || false === $propertyMetadata->isReadable()) && false === $propertyMetadata->getAttribute('fetchEager', false)) {
                 continue;
             }
@@ -261,12 +262,12 @@ private function getSerializerContext(string $resourceClass, string $contextType
      *
      * @param array $options represents the operation name so that groups are the one of the specific operation
      */
-    private function getSerializerGroups(array $options, array $context): array
+    private function getPropertyMetadataOptions(array $options, array $context): array
     {
-        if (empty($context[AbstractNormalizer::GROUPS])) {
-            return $options;
+        if (!empty($context[AbstractNormalizer::GROUPS])) {
+            $options ['serializer_groups'] = $context[AbstractNormalizer::GROUPS];
         }
 
-        return ['serializer_groups' => $context[AbstractNormalizer::GROUPS]];
+        return $options;
     }
 }