Skip to content

Commit 7047de6

Browse files
committed
fix: correct escape filter condition
1 parent d9bc540 commit 7047de6

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

src/Doctrine/Odm/Filter/OrderFilter.php

+1-3
Original file line numberDiff line numberDiff line change
@@ -230,9 +230,7 @@ public function __construct(?ManagerRegistry $managerRegistry = null, string $or
230230
*/
231231
public function apply(Builder $aggregationBuilder, string $resourceClass, ?Operation $operation = null, array &$context = []): void
232232
{
233-
if (!isset($context['filters'][$this->orderParameterName]) || !\is_array($context['filters'][$this->orderParameterName])) {
234-
parent::apply($aggregationBuilder, $resourceClass, $operation, $context);
235-
233+
if (isset($context['filters']) && !isset($context['filters'][$this->orderParameterName]) && !isset($context['parameter'])) {
236234
return;
237235
}
238236

src/Doctrine/Orm/Filter/OrderFilter.php

+7-2
Original file line numberDiff line numberDiff line change
@@ -229,8 +229,13 @@ public function __construct(?ManagerRegistry $managerRegistry = null, string $or
229229
*/
230230
public function apply(QueryBuilder $queryBuilder, QueryNameGeneratorInterface $queryNameGenerator, string $resourceClass, ?Operation $operation = null, array $context = []): void
231231
{
232-
if (!isset($context['filters'][$this->orderParameterName]) || !\is_array($context['filters'][$this->orderParameterName])) {
233-
parent::apply($queryBuilder, $queryNameGenerator, $resourceClass, $operation, $context);
232+
if (isset($context['filters']) && !isset($context['filters'][$this->orderParameterName]) && !isset($context['parameter'])) {
233+
return;
234+
}
235+
236+
$parameter = $context['parameter'] ?? null;
237+
if (null !== ($value = $context['filters'][$parameter?->getProperty()] ?? null)) {
238+
$this->filterProperty($this->denormalizePropertyName($parameter->getProperty()), $value, $queryBuilder, $queryNameGenerator, $resourceClass, $operation, $context);
234239

235240
return;
236241
}

0 commit comments

Comments
 (0)