fix(doctrine): filters schema for dates and numbers (#7131)

Author: soyuka

src/Doctrine/Odm/Filter/DateFilter.php

@@ -248,7 +248,7 @@ private function addMatch(Builder $aggregationBuilder, string $field, string $op
      */
     public function getSchema(Parameter $parameter): array
     {
-        return ['type' => 'date'];
+        return ['type' => 'string', 'format' => 'date'];
     }
 
     public function getOpenApiParameters(Parameter $parameter): OpenApiParameter|array|null

src/Doctrine/Odm/Filter/NumericFilter.php

@@ -168,6 +168,6 @@ protected function getType(?string $doctrineType = null): string
 
     public function getSchema(Parameter $parameter): array
     {
-        return ['type' => 'numeric'];
+        return ['type' => 'number'];
     }
 }

src/Doctrine/Orm/Filter/DateFilter.php

@@ -280,7 +280,7 @@ protected function addWhere(QueryBuilder $queryBuilder, QueryNameGeneratorInterf
      */
     public function getSchema(Parameter $parameter): array
     {
-        return ['type' => 'date'];
+        return ['type' => 'string', 'format' => 'date'];
     }
 
     public function getOpenApiParameters(Parameter $parameter): OpenApiParameter|array|null

src/Doctrine/Orm/Filter/NumericFilter.php

@@ -181,6 +181,6 @@ protected function getType(?string $doctrineType = null): string
 
     public function getSchema(Parameter $parameter): array
     {
-        return ['type' => 'numeric'];
+        return ['type' => 'number'];
     }
 }

src/State/ApiResource/Error.php

@@ -104,7 +104,7 @@ public function __construct(
             identifier: true,
             writable: false,
             initializable: false,
-            schema: ['type' => 'number', 'example' => 404, 'default' => 400]
+            schema: ['type' => 'number', 'examples' => [404], 'default' => 400]
         )] private int $status,
         ?array $originalTrace = null,
         private ?string $instance = null,

tests/Fixtures/TestBundle/ApiResource/WithParameter.php

@@ -32,7 +32,7 @@
 #[Get(
     uriTemplate: 'with_parameters/{id}{._format}',
     uriVariables: [
-        'id' => new Link(schema: ['type' => 'uuid'], property: 'id'),
+        'id' => new Link(schema: ['type' => 'string', 'format' => 'uuid'], property: 'id'),
     ],
     parameters: [
         'groups' => new QueryParameter(filter: new GroupFilter(parameterName: 'groups', overrideDefaultGroups: false)),

tests/Fixtures/TestBundle/Document/FilteredDateParameter.php

@@ -32,18 +32,18 @@
         'date' => new QueryParameter(
             filter: new DateFilter(),
             property: 'createdAt',
-            openApi: new Parameter('createdAt', 'query', allowEmptyValue: true)
+            openApi: new Parameter('date', 'query', allowEmptyValue: true)
         ),
         'date_include_null_always' => new QueryParameter(
             filter: new DateFilter(),
             property: 'createdAt',
             filterContext: DateFilterInterface::INCLUDE_NULL_BEFORE_AND_AFTER,
-            openApi: new Parameter('createdAt', 'query', allowEmptyValue: true)
+            openApi: new Parameter('date_include_null_always', 'query', allowEmptyValue: true)
         ),
         'date_old_way' => new QueryParameter(
             filter: new DateFilter(properties: ['createdAt' => DateFilterInterface::INCLUDE_NULL_BEFORE_AND_AFTER]),
             property: 'createdAt',
-            openApi: new Parameter('createdAt', 'query', allowEmptyValue: true)
+            openApi: new Parameter('date_old_way', 'query', allowEmptyValue: true)
         ),
     ],
 )]

tests/Fixtures/TestBundle/Document/FilteredRangeParameter.php

@@ -26,12 +26,12 @@
     parameters: [
         'quantity' => new QueryParameter(
             filter: new RangeFilter(),
-            openApi: new Parameter('createdAt', 'query', allowEmptyValue: true)
+            openApi: new Parameter('quantity', 'query', allowEmptyValue: true)
         ),
         'amount' => new QueryParameter(
             filter: new RangeFilter(),
             property: 'quantity',
-            openApi: new Parameter('createdAt', 'query', allowEmptyValue: true)
+            openApi: new Parameter('amount', 'query', allowEmptyValue: true)
         ),
     ],
 )]