fix: correct escape filter condition

api-platform · Dec 10, 2024 · 7047de6 · 7047de6
1 parent d9bc540
commit 7047de6
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/src/Doctrine/Odm/Filter/OrderFilter.php b/src/Doctrine/Odm/Filter/OrderFilter.php
@@ -230,9 +230,7 @@ public function __construct(?ManagerRegistry $managerRegistry = null, string $or
      */
     public function apply(Builder $aggregationBuilder, string $resourceClass, ?Operation $operation = null, array &$context = []): void
     {
-        if (!isset($context['filters'][$this->orderParameterName]) || !\is_array($context['filters'][$this->orderParameterName])) {
-            parent::apply($aggregationBuilder, $resourceClass, $operation, $context);
-
+        if (isset($context['filters']) && !isset($context['filters'][$this->orderParameterName]) && !isset($context['parameter'])) {
             return;
         }
 

diff --git a/src/Doctrine/Orm/Filter/OrderFilter.php b/src/Doctrine/Orm/Filter/OrderFilter.php
@@ -229,8 +229,13 @@ public function __construct(?ManagerRegistry $managerRegistry = null, string $or
      */
     public function apply(QueryBuilder $queryBuilder, QueryNameGeneratorInterface $queryNameGenerator, string $resourceClass, ?Operation $operation = null, array $context = []): void
     {
-        if (!isset($context['filters'][$this->orderParameterName]) || !\is_array($context['filters'][$this->orderParameterName])) {
-            parent::apply($queryBuilder, $queryNameGenerator, $resourceClass, $operation, $context);
+        if (isset($context['filters']) && !isset($context['filters'][$this->orderParameterName]) && !isset($context['parameter'])) {
+            return;
+        }
+
+        $parameter = $context['parameter'] ?? null;
+        if (null !== ($value = $context['filters'][$parameter?->getProperty()] ?? null)) {
+            $this->filterProperty($this->denormalizePropertyName($parameter->getProperty()), $value, $queryBuilder, $queryNameGenerator, $resourceClass, $operation, $context);
 
             return;
         }