Skip to content

Commit dce8367

Browse files
authored
Merge pull request #2230 from Siregacvek/multiple-order-filters
Allow multiple order filters in entity.
2 parents 9161117 + 3e4818b commit dce8367

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,14 +61,14 @@ public function applyToCollection(QueryBuilder $queryBuilder, QueryNameGenerator
6161
return;
6262
}
6363

64-
$orderFilter = null;
64+
$orderFilters = [];
6565

6666
foreach ($resourceFilters as $filterId) {
6767
$filter = $this->getFilter($filterId);
6868
if ($filter instanceof FilterInterface) {
6969
// Apply the OrderFilter after every other filter to avoid an edge case where OrderFilter would do a LEFT JOIN instead of an INNER JOIN
7070
if ($filter instanceof OrderFilter) {
71-
$orderFilter = $filter;
71+
$orderFilters[] = $filter;
7272
continue;
7373
}
7474

@@ -77,7 +77,7 @@ public function applyToCollection(QueryBuilder $queryBuilder, QueryNameGenerator
7777
}
7878
}
7979

80-
if (null !== $orderFilter) {
80+
foreach ($orderFilters as $orderFilter) {
8181
$context['filters'] = $context['filters'] ?? [];
8282
$orderFilter->apply($queryBuilder, $queryNameGenerator, $resourceClass, $operationName, $context);
8383
}

0 commit comments

Comments
 (0)