Merge pull request #1093 from dunglas/improve_ShouldEagerLoad

Improve the ShouldEagerLoad

Author: dunglas

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

@@ -40,9 +40,7 @@ final class EagerLoadingExtension implements QueryCollectionExtensionInterface,
 
     private $propertyNameCollectionFactory;
     private $propertyMetadataFactory;
-    private $resourceMetadataFactory;
     private $maxJoins;
-    private $forceEager;
     private $serializerContextBuilder;
     private $requestStack;
 

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

@@ -27,9 +27,6 @@ final class FilterEagerLoadingExtension implements QueryCollectionExtensionInter
 {
     use ShouldEagerLoad;
 
-    private $resourceMetadataFactory;
-    private $forceEager;
-
     public function __construct(ResourceMetadataFactoryInterface $resourceMetadataFactory, $forceEager = true)
     {
         $this->resourceMetadataFactory = $resourceMetadataFactory;

src/Bridge/Doctrine/Orm/Util/ShouldEagerLoad.php

@@ -18,9 +18,14 @@
 
 /**
  * @author Antoine Bluchet <[email protected]>
+ *
+ * @internal
  */
 trait ShouldEagerLoad
 {
+    private $forceEager;
+    private $resourceMetadataFactory;
+
     /**
      * Checks if an operation has a `force_eager` attribute.
      *
@@ -50,8 +55,10 @@ private function shouldOperationForceEager(string $resourceClass, array $options
      * @param EntityManager     $em
      * @param ClassMetadataInfo $classMetadata
      * @param array             $checked       array cache of tested metadata classes
+     *
+     * @return bool
      */
-    private function hasFetchEagerAssociation(EntityManager $em, ClassMetadataInfo $classMetadata, &$checked = [])
+    private function hasFetchEagerAssociation(EntityManager $em, ClassMetadataInfo $classMetadata, array &$checked = []): bool
     {
         $checked[] = $classMetadata->name;