schema/openapi parameter

Author: soyuka

src/Doctrine/Orm/Filter/AbstractUuidFilter.php

@@ -168,61 +168,26 @@ protected function getDoctrineArrayParameterType(): ?ArrayParameterType
         return null;
     }
 
-    public function getOpenApiParameters(Parameter $parameter): array
+    public function getOpenApiParameters(Parameter $parameter): OpenApiParameter|array|null
     {
         $in = $parameter instanceof QueryParameter ? 'query' : 'header';
-        $key = $parameter->getKey();
         $schema = $parameter->getSchema();
-        $addStringParam = false;
-        $addArrayParam = false;
-        $openApiParameters = [];
+        $isArraySchema = 'array' === ($schema['type'] ?? null);
 
-        if (null === $schema) {
-            $addStringParam = true;
-            $addArrayParam = true;
+        if ($isArraySchema) {
+            return new OpenApiParameter(name: $parameter->getKey().'[]', in: $in, style: 'deepObject', explode: true);
         }
 
-        foreach ($schema['oneOf'] ?? [$schema] as $item) {
-            if (!isset($item['type']) || 'string' === $item['type']) {
-                $addStringParam = true;
-            }
-
-            if (!isset($item['type']) || 'array' === $item['type']) {
-                $addArrayParam = true;
-            }
-        }
-
-        if ($addStringParam) {
-            $openApiParameters[] = new OpenApiParameter(
-                name: $key,
-                in: $in,
-                schema: self::UUID_SCHEMA,
-                style: 'form',
-                explode: false
-            );
-        }
-
-        if ($addArrayParam) {
-            $openApiParameters[] = new OpenApiParameter(
-                name: $key.'[]',
-                in: $in,
-                description: 'One or more Uuids',
-                schema: [
-                    'type' => 'array',
-                    'items' => self::UUID_SCHEMA,
-                ],
-                style: 'deepObject',
-                explode: true
-            );
-        }
-
-        return $openApiParameters;
+        return [
+            new OpenApiParameter(name: $parameter->getKey(), in: $in),
+            new OpenApiParameter(name: $parameter->getKey().'[]', in: $in, style: 'deepObject', explode: true),
+        ];
     }
 
     public function getSchema(Parameter $parameter): array
     {
-        if (null !== $parameter->getSchema()) {
-            return $parameter->getSchema();
+        if (false === $parameter->getCastToArray()) {
+            return self::UUID_SCHEMA;
         }
 
         return [

src/Doctrine/Orm/Filter/UlidFilter.php

@@ -14,8 +14,6 @@
 namespace ApiPlatform\Doctrine\Orm\Filter;
 
 use ApiPlatform\Metadata\Parameter;
-use ApiPlatform\Metadata\QueryParameter;
-use ApiPlatform\OpenApi\Model\Parameter as OpenApiParameter;
 
 final class UlidFilter extends AbstractUuidFilter
 {
@@ -24,35 +22,20 @@ final class UlidFilter extends AbstractUuidFilter
         'format' => 'ulid',
     ];
 
-    public function getOpenApiParameters(Parameter $parameter): array
+    public function getSchema(Parameter $parameter): array
     {
-        $in = $parameter instanceof QueryParameter ? 'query' : 'header';
-        $key = $parameter->getKey();
+        if (false === $parameter->getCastToArray()) {
+            return self::ULID_SCHEMA;
+        }
 
         return [
-            new OpenApiParameter(
-                name: $key,
-                in: $in,
-                schema: self::ULID_SCHEMA,
-                style: 'form',
-                explode: false
-            ),
-            new OpenApiParameter(
-                name: $key.'[]',
-                in: $in,
-                description: 'One or more Ulids',
-                schema: [
+            'oneOf' => [
+                self::ULID_SCHEMA,
+                [
                     'type' => 'array',
                     'items' => self::ULID_SCHEMA,
                 ],
-                style: 'deepObject',
-                explode: true
-            ),
+            ],
         ];
     }
-
-    public function getSchema(Parameter $parameter): array
-    {
-        return self::ULID_SCHEMA;
-    }
 }