Skip to content

Commit 27f331c

Browse files
authored
Merge pull request #1698 from antograssiot/avoid-filter-deprecation
Fix deprecation notice on filters applied on collection without params
2 parents 3a1961f + 530a996 commit 27f331c

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,8 @@ public function applyToCollection(QueryBuilder $queryBuilder, QueryNameGenerator
6565
continue;
6666
}
6767

68+
$context['filters'] = $context['filters'] ?? [];
69+
6870
$filter->apply($queryBuilder, $queryNameGenerator, $resourceClass, $operationName, $context);
6971
}
7072
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public function testApplyToCollectionWithValidFilters()
4141
$queryBuilder = $queryBuilderProphecy->reveal();
4242

4343
$ormFilterProphecy = $this->prophesize(FilterInterface::class);
44-
$ormFilterProphecy->apply($queryBuilder, new QueryNameGenerator(), Dummy::class, 'get', [])->shouldBeCalled();
44+
$ormFilterProphecy->apply($queryBuilder, new QueryNameGenerator(), Dummy::class, 'get', ['filters' => []])->shouldBeCalled();
4545

4646
$ordinaryFilterProphecy = $this->prophesize(ApiFilterInterface::class);
4747

@@ -70,7 +70,7 @@ public function testApplyToCollectionWithValidFiltersAndDeprecatedFilterCollecti
7070
$queryBuilder = $queryBuilderProphecy->reveal();
7171

7272
$filterProphecy = $this->prophesize(FilterInterface::class);
73-
$filterProphecy->apply($queryBuilder, new QueryNameGenerator(), Dummy::class, 'get', [])->shouldBeCalled();
73+
$filterProphecy->apply($queryBuilder, new QueryNameGenerator(), Dummy::class, 'get', ['filters' => []])->shouldBeCalled();
7474

7575
$orderExtensionTest = new FilterExtension($resourceMetadataFactoryProphecy->reveal(), new FilterCollection(['dummyFilter' => $filterProphecy->reveal()]));
7676
$orderExtensionTest->applyToCollection($queryBuilder, new QueryNameGenerator(), Dummy::class, 'get');

0 commit comments

Comments
 (0)