human review

Author: soyuka

src/Doctrine/Odm/Filter/ComparisonFilter.php

@@ -46,8 +46,6 @@ final class ComparisonFilter implements FilterInterface, OpenApiParameterFilterI
         'lte' => 'lte',
     ];
 
-    public const ALLOWED_COMPARISON_METHODS = ['equals', 'gt', 'gte', 'lt', 'lte'];
-
     public function __construct(private readonly FilterInterface $filter)
     {
     }
@@ -87,19 +85,21 @@ public function getOpenApiParameters(Parameter $parameter): array
     {
         $in = $parameter instanceof QueryParameter ? 'query' : 'header';
         $key = $parameter->getKey();
-        $schema = $this->getInnerSchema($parameter);
 
         return [
-            new OpenApiParameter(name: "{$key}[gt]", in: $in, schema: $schema),
-            new OpenApiParameter(name: "{$key}[gte]", in: $in, schema: $schema),
-            new OpenApiParameter(name: "{$key}[lt]", in: $in, schema: $schema),
-            new OpenApiParameter(name: "{$key}[lte]", in: $in, schema: $schema),
+            new OpenApiParameter(name: "{$key}[gt]", in: $in),
+            new OpenApiParameter(name: "{$key}[gte]", in: $in),
+            new OpenApiParameter(name: "{$key}[lt]", in: $in),
+            new OpenApiParameter(name: "{$key}[lte]", in: $in),
         ];
     }
 
     public function getSchema(Parameter $parameter): array
     {
-        $innerSchema = $this->getInnerSchema($parameter);
+        $innerSchema = ['type' => 'string'];
+        if ($this->filter instanceof JsonSchemaFilterInterface) {
+            $innerSchema = $this->filter->getSchema($parameter);
+        }
 
         return [
             'type' => 'object',
@@ -130,13 +130,4 @@ private function applyOperator(Builder $aggregationBuilder, string $resourceClas
             $context['match'] = $newContext['match'];
         }
     }
-
-    private function getInnerSchema(Parameter $parameter): array
-    {
-        if ($this->filter instanceof JsonSchemaFilterInterface) {
-            return $this->filter->getSchema($parameter);
-        }
-
-        return ['type' => 'string'];
-    }
 }

src/Doctrine/Odm/Filter/ExactFilter.php

@@ -62,9 +62,6 @@ public function apply(Builder $aggregationBuilder, string $resourceClass, ?Opera
 
         if (!$classMetadata->hasReference($property)) {
             $comparisonMethod = $context['comparisonMethod'] ?? (is_iterable($value) ? 'in' : 'equals');
-            if (!\in_array($comparisonMethod, ComparisonFilter::ALLOWED_COMPARISON_METHODS, true) && 'in' !== $comparisonMethod) {
-                throw new InvalidArgumentException(\sprintf('Unsupported comparison method "%s".', $comparisonMethod));
-            }
             $match
                 ->{$operator}($aggregationBuilder->matchExpr()->field($property)->{$comparisonMethod}($value));
 

src/Doctrine/Orm/Filter/ComparisonFilter.php

@@ -85,19 +85,21 @@ public function getOpenApiParameters(Parameter $parameter): array
     {
         $in = $parameter instanceof QueryParameter ? 'query' : 'header';
         $key = $parameter->getKey();
-        $schema = $this->getInnerSchema($parameter);
 
         return [
-            new OpenApiParameter(name: "{$key}[gt]", in: $in, schema: $schema),
-            new OpenApiParameter(name: "{$key}[gte]", in: $in, schema: $schema),
-            new OpenApiParameter(name: "{$key}[lt]", in: $in, schema: $schema),
-            new OpenApiParameter(name: "{$key}[lte]", in: $in, schema: $schema),
+            new OpenApiParameter(name: "{$key}[gt]", in: $in),
+            new OpenApiParameter(name: "{$key}[gte]", in: $in),
+            new OpenApiParameter(name: "{$key}[lt]", in: $in),
+            new OpenApiParameter(name: "{$key}[lte]", in: $in),
         ];
     }
 
     public function getSchema(Parameter $parameter): array
     {
-        $innerSchema = $this->getInnerSchema($parameter);
+        $innerSchema = ['type' => 'string'];
+        if ($this->filter instanceof JsonSchemaFilterInterface) {
+            $innerSchema = $this->filter->getSchema($parameter);
+        }
 
         return [
             'type' => 'object',
@@ -110,6 +112,9 @@ public function getSchema(Parameter $parameter): array
         ];
     }
 
+    /**
+     * @param array<string,mixed> $context
+     */
     private function applyOperator(QueryBuilder $queryBuilder, QueryNameGeneratorInterface $queryNameGenerator, string $resourceClass, ?Operation $operation, array $context, Parameter $parameter, string $operator, mixed $value): void
     {
         if (!\is_string($value) && !is_numeric($value) && !$value instanceof \DateTimeInterface) {
@@ -125,13 +130,4 @@ private function applyOperator(QueryBuilder $queryBuilder, QueryNameGeneratorInt
             ['operator' => $operator, 'parameter' => $subParameter] + $context
         );
     }
-
-    private function getInnerSchema(Parameter $parameter): array
-    {
-        if ($this->filter instanceof JsonSchemaFilterInterface) {
-            return $this->filter->getSchema($parameter);
-        }
-
-        return ['type' => 'string'];
-    }
 }

tests/Functional/Parameters/ComparisonFilterTest.php

@@ -148,9 +148,6 @@ public function testOpenApiDocumentation(): void
         $comparisonParams = array_filter($parameters, static fn ($p) => str_starts_with($p['name'], 'idComparison['));
         foreach ($comparisonParams as $param) {
             $this->assertSame('query', $param['in']);
-            $this->assertArrayHasKey('schema', $param);
-
-            $this->assertSame('string', $param['schema']['type']);
         }
     }