Skip to content

Commit 5b6a6cb

Browse files
soyukanikophil
authored andcommitted
fix: parameter context for filters (#6535)
1 parent 84a2b06 commit 5b6a6cb

File tree

3 files changed

+3
-2
lines changed

3 files changed

+3
-2
lines changed

src/Doctrine/Odm/Extension/ParameterExtension.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ private function applyFilter(Builder $aggregationBuilder, ?string $resourceClass
4747

4848
$filter = $this->filterLocator->has($filterId) ? $this->filterLocator->get($filterId) : null;
4949
if ($filter instanceof FilterInterface) {
50-
$filterContext = ['filters' => $values];
50+
$filterContext = ['filters' => $values, 'parameter' => $parameter];
5151
$filter->apply($aggregationBuilder, $resourceClass, $operation, $filterContext);
5252
// update by reference
5353
if (isset($filterContext['mongodb_odm_sort_fields'])) {

src/Doctrine/Orm/Extension/ParameterExtension.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ private function applyFilter(QueryBuilder $queryBuilder, QueryNameGeneratorInter
5151

5252
$filter = $this->filterLocator->has($filterId) ? $this->filterLocator->get($filterId) : null;
5353
if ($filter instanceof FilterInterface) {
54-
$filter->apply($queryBuilder, $queryNameGenerator, $resourceClass, $operation, ['filters' => $values] + $context);
54+
$filter->apply($queryBuilder, $queryNameGenerator, $resourceClass, $operation, ['filters' => $values, 'parameter' => $parameter] + $context);
5555
}
5656
}
5757
}

src/Serializer/Parameter/SerializerFilterParameterProvider.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ public function provide(Parameter $parameter, array $parameters = [], array $con
4646
}
4747

4848
$context = $operation->getNormalizationContext();
49+
$request->attributes->set('_api_parameter', $parameter);
4950
$filter->apply($request, true, RequestAttributesExtractor::extractAttributes($request), $context);
5051

5152
return $operation->withNormalizationContext($context);

0 commit comments

Comments
 (0)