TASK: Remove the '[]' postfix from collection parameters as those wil…

…l use deepObject style now
sitegeist · Jun 14, 2024 · 6d31435 · 6d31435
1 parent 074774e
commit 6d31435
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/Classes/Domain/Path/OpenApiParameter.php b/Classes/Domain/Path/OpenApiParameter.php
@@ -69,7 +69,7 @@ public static function fromReflectionParameter(\ReflectionParameter $reflectionP
         $parameterSchema = OpenApiSchema::fromReflectionClass($reflectionClass);
 
         return new self(
-            name: $reflectionParameter->name . (($parameterAttribute->in === ParameterLocation::LOCATION_QUERY && $parameterSchema->type === 'array') ? '[]' : ''),
+            name: $reflectionParameter->name,
             in: $parameterAttribute->in,
             description: $parameterAttribute->description ?: $schemaAttribute->description,
             required: !$reflectionParameter->isDefaultValueAvailable(),

diff --git a/Tests/Unit/Application/ParameterFactoryTest.php b/Tests/Unit/Application/ParameterFactoryTest.php
@@ -100,11 +100,12 @@ public static function parameterProvider(): iterable
                 new Uri('https://acme.site/de/')
             ))->withQueryParams(
                 [
-                    'endpointQuery' => ['language' => 'de'],
                     'anotherEndpointQuery' => '{"pleaseFail":"true"}'
                 ]
             )
         );
+        $multipleParametersRequest->setArgument('endpointQuery', ['language' => 'de']);
+
         yield 'withMultipleParameters' => [
             'request' => $multipleParametersRequest,
             'className' => PathController::class,
@@ -118,9 +119,9 @@ public static function parameterProvider(): iterable
         $collectionParametersRequest = ActionRequest::fromHttpRequest(
             (new ServerRequest(
                 HttpMethod::METHOD_GET->value,
-                new Uri('https://acme.site/?identifierCollection[]=foo&identifierCollection[]=bar&identifier=baz')
+                new Uri('https://acme.site/?identifierCollection=foo&identifierCollection=bar&identifier=baz')
             ))->withQueryParams([
-                'identifierCollection' => ['foo','bar'],
+                'identifierCollection' => '["foo","bar"]',
                 'identifier' => 'baz'
             ])
         );

diff --git a/Tests/Unit/Domain/OpenApiDocumentFactoryTest.php b/Tests/Unit/Domain/OpenApiDocumentFactoryTest.php
@@ -480,7 +480,7 @@ public function testFromClassNameCreatesDefinitionsForValidClasses(): void
                                 style: ParameterStyle::STYLE_FORM
                             ),
                             new OpenApiParameter(
-                                name: 'identifierCollection[]',
+                                name: 'identifierCollection',
                                 description: '',
                                 in: ParameterLocation::LOCATION_QUERY,
                                 required: true,