Style fixes in EagerLoadingExtension (#1545)

Author: dunglas

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

@@ -85,7 +85,6 @@ public function applyToCollection(QueryBuilder $queryBuilder, QueryNameGenerator
     }
 
     /**
-     * {@inheritdoc}
      * The context may contain serialization groups which helps defining joined entities that are readable.
      */
     public function applyToItem(QueryBuilder $queryBuilder, QueryNameGeneratorInterface $queryNameGenerator, string $resourceClass, array $identifiers, string $operationName = null, array $context = [])
@@ -100,29 +99,17 @@ 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);
-
-        if (isset($context[AbstractNormalizer::GROUPS])) {
-            $groups = ['serializer_groups' => $context[AbstractNormalizer::GROUPS]];
-        } else {
-            $groups = $this->getSerializerGroups($options, $serializerContext);
-        }
+        $groups = $this->getSerializerGroups($options, $serializerContext);
 
         $this->joinRelations($queryBuilder, $queryNameGenerator, $resourceClass, $forceEager, $fetchPartial, $queryBuilder->getRootAliases()[0], $groups, $serializerContext);
     }
 
     /**
      * Joins relations to eager load.
      *
-     * @param QueryBuilder                $queryBuilder
-     * @param QueryNameGeneratorInterface $queryNameGenerator
-     * @param string                      $resourceClass
-     * @param bool                        $forceEager
-     * @param string                      $parentAlias
-     * @param array                       $propertyMetadataOptions
-     * @param array                       $context
-     * @param bool                        $wasLeftJoin             if the relation containing the new one had a left join, we have to force the new one to left join too
-     * @param int                         $joinCount               the number of joins
-     * @param int                         $currentDepth            the current max depth
+     * @param bool $wasLeftJoin  if the relation containing the new one had a left join, we have to force the new one to left join too
+     * @param int  $joinCount    the number of joins
+     * @param int  $currentDepth the current max depth
      *
      * @throws RuntimeException when the max number of joins has been reached
      */
@@ -241,11 +228,8 @@ private function addSelect(QueryBuilder $queryBuilder, string $entity, string $a
     /**
      * Gets serializer context.
      *
-     * @param string $resourceClass
-     * @param string $contextType   normalization_context or denormalization_context
-     * @param array  $options       represents the operation name so that groups are the one of the specific operation
-     *
-     * @return array
+     * @param string $contextType normalization_context or denormalization_context
+     * @param array  $options     represents the operation name so that groups are the one of the specific operation
      */
     private function getSerializerContext(string $resourceClass, string $contextType, array $options): array
     {
@@ -269,16 +253,13 @@ private function getSerializerContext(string $resourceClass, string $contextType
             $context = $resourceMetadata->getAttribute($contextType);
         }
 
-        return $context ? $context : [];
+        return $context ?: [];
     }
 
     /**
      * Gets serializer groups if available, if not it returns the $options array.
      *
      * @param array $options represents the operation name so that groups are the one of the specific operation
-     * @param array $context
-     *
-     * @return array
      */
     private function getSerializerGroups(array $options, array $context): array
     {