Merge 9510ae3 into e8f26ca

Author: jewome62

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

@@ -72,6 +72,7 @@ public function applyToCollection(QueryBuilder $queryBuilder, QueryNameGenerator
         $queryBuilderClone = clone $queryBuilder;
         $queryBuilderClone->resetDQLPart('where');
         $changedWhereClause = false;
+        $in = null;
 
         if (!$classMetadata->isIdentifierComposite) {
             $replacementAlias = $queryNameGenerator->generateJoinAlias($originAlias);
@@ -98,6 +99,10 @@ public function applyToCollection(QueryBuilder $queryBuilder, QueryNameGenerator
             return;
         }
 
+        if (\count($in->getDQLPart('orderBy')) === \count($queryBuilder->getDQLPart('orderBy'))) {
+            $queryBuilder->resetDQLPart('orderBy');
+        }
+
         $queryBuilder->resetDQLPart('where');
         $queryBuilder->add('where', $queryBuilderClone->getDQLPart('where'));
     }
@@ -114,6 +119,7 @@ private function getQueryBuilderWithNewAliases(QueryBuilder $queryBuilder, Query
 
         $joinParts = $queryBuilder->getDQLPart('join');
         $wherePart = $queryBuilder->getDQLPart('where');
+        $orderByPart = $queryBuilder->getDQLPart('orderBy');
 
         //reset parts
         $queryBuilderClone->resetDQLPart('join');
@@ -158,6 +164,15 @@ private function getQueryBuilderWithNewAliases(QueryBuilder $queryBuilder, Query
 
         $queryBuilderClone->add('where', str_replace($aliases, $replacements, (string) $wherePart));
 
+        foreach ($orderByPart as $order) {
+            $oldOrderBy = (string) $order;
+            $newOrderBy = str_replace($aliases, $replacements, $oldOrderBy);
+
+            if ($newOrderBy !== $oldOrderBy) {
+                $queryBuilderClone->add('orderBy', str_replace($aliases, $replacements, (string) $order), true);
+            }
+        }
+
         return $queryBuilderClone;
     }
 }

src/Bridge/Symfony/Bundle/Resources/config/doctrine_orm.xml

@@ -143,14 +143,24 @@
         </service>
         <service id="ApiPlatform\Core\Bridge\Doctrine\Orm\Extension\FilterExtension" alias="api_platform.doctrine.orm.query_extension.filter" />
 
+
+        <service id="api_platform.doctrine.orm.query_extension.order" class="ApiPlatform\Core\Bridge\Doctrine\Orm\Extension\OrderExtension" public="false">
+            <argument>%api_platform.collection.order%</argument>
+            <argument type="service" id="api_platform.metadata.resource.metadata_factory" />
+
+            <tag name="api_platform.doctrine.orm.query_extension.collection" priority="-17" />
+        </service>
+        <service id="ApiPlatform\Core\Bridge\Doctrine\Orm\Extension\OrderExtension" alias="api_platform.doctrine.orm.query_extension.order" />
+
+
         <!-- This needs to be executed right after the filter extension -->
 
         <service id="api_platform.doctrine.orm.query_extension.filter_eager_loading" class="ApiPlatform\Core\Bridge\Doctrine\Orm\Extension\FilterEagerLoadingExtension" public="false">
             <argument type="service" id="api_platform.metadata.resource.metadata_factory" />
             <argument>%api_platform.eager_loading.force_eager%</argument>
             <argument type="service" id="api_platform.resource_class_resolver" />
 
-            <tag name="api_platform.doctrine.orm.query_extension.collection" priority="-17" />
+            <tag name="api_platform.doctrine.orm.query_extension.collection" priority="-18" />
         </service>
         <service id="ApiPlatform\Core\Bridge\Doctrine\Orm\Extension\FilterEagerLoadingExtension" alias="api_platform.doctrine.orm.query_extension.filter_eager_loading" />
 
@@ -162,14 +172,6 @@
             <tag name="api_platform.doctrine.orm.query_extension.collection" priority="-64" />
         </service>
         <service id="ApiPlatform\Core\Bridge\Doctrine\Orm\Extension\PaginationExtension" alias="api_platform.doctrine.orm.query_extension.pagination" />
-
-        <service id="api_platform.doctrine.orm.query_extension.order" class="ApiPlatform\Core\Bridge\Doctrine\Orm\Extension\OrderExtension" public="false">
-            <argument>%api_platform.collection.order%</argument>
-            <argument type="service" id="api_platform.metadata.resource.metadata_factory" />
-
-            <tag name="api_platform.doctrine.orm.query_extension.collection" priority="-32" />
-        </service>
-        <service id="ApiPlatform\Core\Bridge\Doctrine\Orm\Extension\OrderExtension" alias="api_platform.doctrine.orm.query_extension.order" />
     </services>
 
 </container>

tests/Bridge/Doctrine/Orm/Extension/FilterEagerLoadingExtensionTest.php

@@ -327,9 +327,9 @@ public function testGroupBy()
   SELECT o_2 FROM ApiPlatform\Core\Tests\Fixtures\TestBundle\Entity\DummyCar o_2
   LEFT JOIN o_2.colors colors_2
   WHERE o_2.colors = :foo
+  ORDER BY o_2.colors ASC
 )
 GROUP BY o.colors HAVING counter > 3
-ORDER BY o.colors ASC
 SQL;
 
         $this->assertEquals($this->toDQLString($expected), $qb->getDQL());