Skip to content

Remove checks now performed by reader #154

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
carnage merged 2 commits into from
Sep 27, 2023
Merged

Remove checks now performed by reader #154

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ba9f54d
Remove unnecessary fixture
charjr Sep 27, 2023
bbeace4
Remove unnecessary checks from findSchema
charjr Sep 27, 2023
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
21 changes: 6 additions & 15 deletions src/OpenAPI/Builder/OpenAPIRequestBuilder.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,21 +91,12 @@ private function fromParameters(OpenAPIRequest $specification): array

private function findSchema(Parameter $parameter): Schema
{
$schemaLocations = null;
// Membrane\OpenAPIReader\Reader ensures parameters have a schema xor non-empty content
$schema = $parameter->schema ??
$parameter->content['application/json']?->schema ??
throw CannotProcessOpenAPI::unsupportedMediaTypes(array_keys($parameter->content));

if ($parameter->schema !== null) {
$schemaLocations = $parameter->schema;
}

if ($parameter->content !== []) {
$schemaLocations = $parameter->content['application/json']?->schema
??
throw CannotProcessOpenAPI::unsupportedMediaTypes(array_keys($parameter->content));
}

// Cebe library already validates that parameters MUST have either a schema or content but not both.
assert($schemaLocations instanceof Schema);

return $schemaLocations;
assert($schema instanceof Schema);
return $schema;
}
}
14 changes: 0 additions & 14 deletions tests/fixtures/OpenAPI/noReferences.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,20 +148,6 @@
}
},
"/requestpathexceptions": {
"get": {
"operationId": "no-schema-nor-content",
"parameters": [
{
"name": "id",
"in": "query"
}
],
"responses": {
"200": {
"description": ""
}
}
},
"post": {
"operationId": "unsupported-content-type",
"parameters": [
Expand Down