Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/Utils/SchemaGenerator.php
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,10 @@ private function buildParameterSchema(array $paramInfo, ?array $methodLevelParam
// Parameter-level takes highest precedence
$parameterLevelSchema = $paramInfo['parameter_schema'];
if (!empty($parameterLevelSchema)) {
if (isset($parameterLevelSchema['definition']) && is_array($parameterLevelSchema['definition'])) {
return $parameterLevelSchema['definition'];
}

$mergedSchema = $this->mergeSchemas($mergedSchema, $parameterLevelSchema);
}

Expand Down
13 changes: 13 additions & 0 deletions tests/Fixtures/Utils/SchemaGeneratorFixture.php
Original file line number Diff line number Diff line change
Expand Up @@ -397,4 +397,17 @@ public function parameterSchemaInferredType(
$inferredParam
): void {
}

/**
* Parameter with complete custom definition via #[Schema(definition: ...)]
*/
public function parameterWithRawDefinition(
#[Schema(definition: [
'description' => 'Custom-defined schema',
'type' => 'string',
'format' => 'uuid'
])]
string $custom
): void {
}
}
13 changes: 13 additions & 0 deletions tests/Integration/SchemaGenerationTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -354,3 +354,16 @@

expect($schema['required'])->toEqual(['inferredParam']);
});

it('uses raw parameter-level schema definition as-is', function () {
$method = new ReflectionMethod(SchemaGeneratorFixture::class, 'parameterWithRawDefinition');
$schema = $this->schemaGenerator->generate($method);

expect($schema['properties']['custom'])->toEqual([
'description' => 'Custom-defined schema',
'type' => 'string',
'format' => 'uuid'
]);

expect($schema['required'])->toEqual(['custom']);
});