Merge pull request #844 from dunglas/eager_loading

Make EagerLoadingExtension robuster and less complex

Author: dunglas

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

@@ -111,7 +111,7 @@ public function applyToItem(QueryBuilder $queryBuilder, QueryNameGeneratorInterf
     }
 
     /**
-     * Left joins relations to eager load.
+     * Joins relations to eager load.
      *
      * @param QueryBuilder $queryBuilder
      * @param string       $resourceClass
@@ -131,8 +131,7 @@ private function joinRelations(QueryBuilder $queryBuilder, string $resourceClass
 
         $entityManager = $queryBuilder->getEntityManager();
         $classMetadata = $entityManager->getClassMetadata($resourceClass);
-        $j = 0;
-        $i = 0;
+        $i = $j = 0;
 
         foreach ($classMetadata->associationMappings as $association => $mapping) {
             $propertyMetadata = $this->propertyMetadataFactory->create($resourceClass, $association, $propertyMetadataOptions);
@@ -145,16 +144,11 @@ private function joinRelations(QueryBuilder $queryBuilder, string $resourceClass
                 continue;
             }
 
-            if (false === $wasLeftJoin) {
-                $joinColumns = $mapping['joinColumns'] ?? $mapping['joinTable']['joinColumns'] ?? null;
-
-                if (null === $joinColumns) {
-                    $method = 'leftJoin';
-                } else {
-                    $method = false === $joinColumns[0]['nullable'] ? 'innerJoin' : 'leftJoin';
-                }
-            } else {
+            $joinColumns = $mapping['joinColumns'] ?? $mapping['joinTable']['joinColumns'] ?? null;
+            if (false !== $wasLeftJoin || !isset($joinColumns[0]['nullable']) || false !== $joinColumns[0]['nullable']) {
                 $method = 'leftJoin';
+            } else {
+                $method = 'innerJoin';
             }
 
             $associationAlias = $relationAlias.$i++;