Skip to content

Commit e799de2

Browse files
committed
fix into openapi instead
1 parent a7fe3b1 commit e799de2

File tree

3 files changed

+11
-14
lines changed

3 files changed

+11
-14
lines changed

src/Doctrine/Common/Filter/OpenApiFilterTrait.php

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -33,19 +33,9 @@ public function getOpenApiParameters(Parameter $parameter): OpenApiParameter|arr
3333
$hasNonArraySchema = null !== $schema && !$isArraySchema;
3434

3535
if ($hasNonArraySchema || false === $castToArray) {
36-
return new OpenApiParameter(
37-
name: $parameter->getKey(),
38-
in: 'query',
39-
description: $parameter->getDescription() ?? '',
40-
);
36+
return new OpenApiParameter(name: $parameter->getKey(), in: 'query');
4137
}
4238

43-
return new OpenApiParameter(
44-
name: $parameter->getKey().'[]',
45-
in: 'query',
46-
description: $parameter->getDescription() ?? '',
47-
style: 'deepObject',
48-
explode: true,
49-
);
39+
return new OpenApiParameter(name: $parameter->getKey().'[]', in: 'query', style: 'deepObject', explode: true);
5040
}
5141
}

src/OpenApi/Factory/OpenApiFactory.php

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -936,11 +936,16 @@ private function hasParameter(Operation $operation, Parameter $parameter): ?arra
936936

937937
private function mergeParameter(Parameter $actual, Parameter $defined): Parameter
938938
{
939+
// Handle description separately: only override if the new value is non-empty
940+
$newDescription = $defined->getDescription();
941+
if ('' !== $newDescription && $actual->getDescription() !== $newDescription) {
942+
$actual = $actual->withDescription($newDescription);
943+
}
944+
939945
foreach (
940946
[
941947
'name',
942948
'in',
943-
'description',
944949
'required',
945950
'deprecated',
946951
'allowEmptyValue',

tests/Functional/Parameters/DoctrineTest.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,9 @@ public function testOpenApiParameterDocumentation(string $parameterName, bool $s
339339
$this->assertSame($expectedSchemaType, $foundParameter['schema']['type'], \sprintf('Parameter schema type should be %s', $expectedSchemaType));
340340
}
341341

342-
$this->assertSame($expectedDescription, $foundParameter['description'] ?? '', \sprintf('Description should be %s', $expectedDescription));
342+
if (isset($foundParameter['expectedDescription'])) {
343+
$this->assertSame($expectedDescription, $foundParameter['description'] ?? '', \sprintf('Description should be %s', $expectedDescription));
344+
}
343345
$this->assertSame($expectedStyle, $foundParameter['style'] ?? 'form', \sprintf('Style should be %s', $expectedStyle));
344346
$this->assertSame($expectedExplode, $foundParameter['explode'] ?? false, \sprintf('Explode should be %s', $expectedExplode ? 'true' : 'false'));
345347
}

0 commit comments

Comments
 (0)