From c0f52c14492a3b3f470c69c0e204907028ca3f58 Mon Sep 17 00:00:00 2001 From: Guilliam Xavier Date: Tue, 13 Apr 2021 09:39:45 +0200 Subject: [PATCH 1/3] Add test for #4209 (response without content) --- tests/OpenApi/Factory/OpenApiFactoryTest.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/OpenApi/Factory/OpenApiFactoryTest.php b/tests/OpenApi/Factory/OpenApiFactoryTest.php index 3ad7f55650c..463587f9c29 100644 --- a/tests/OpenApi/Factory/OpenApiFactoryTest.php +++ b/tests/OpenApi/Factory/OpenApiFactoryTest.php @@ -96,6 +96,7 @@ public function testInvoke(): void 'Foo' => ['$ref' => '#/components/schemas/Dummy'], ], ], + '205' => [], ], 'requestBody' => [ 'required' => true, @@ -434,6 +435,7 @@ public function testInvoke(): void ]), new \ArrayObject([ 'Foo' => ['$ref' => '#/components/schemas/Dummy'], ])), + '205' => new Model\Response(), '404' => new Model\Response('Resource not found'), ], 'Dummy', From 9aede4b653e3f3dcbaa61740017a7578c1b36f2a Mon Sep 17 00:00:00 2001 From: Guilliam Xavier Date: Tue, 13 Apr 2021 09:41:50 +0200 Subject: [PATCH 2/3] Fix #4209 --- src/OpenApi/Factory/OpenApiFactory.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/OpenApi/Factory/OpenApiFactory.php b/src/OpenApi/Factory/OpenApiFactory.php index 0a814a1b2b3..3e1344dff63 100644 --- a/src/OpenApi/Factory/OpenApiFactory.php +++ b/src/OpenApi/Factory/OpenApiFactory.php @@ -251,7 +251,7 @@ private function collectPaths(ResourceMetadata $resourceMetadata, string $resour if ($contextResponses = $operation['openapi_context']['responses'] ?? false) { foreach ($contextResponses as $statusCode => $contextResponse) { - $responses[$statusCode] = new Model\Response($contextResponse['description'] ?? '', new \ArrayObject($contextResponse['content']), isset($contextResponse['headers']) ? new \ArrayObject($contextResponse['headers']) : null, isset($contextResponse['links']) ? new \ArrayObject($contextResponse['links']) : null); + $responses[$statusCode] = new Model\Response($contextResponse['description'] ?? '', isset($contextResponse['content']) ? new \ArrayObject($contextResponse['content']) : null, isset($contextResponse['headers']) ? new \ArrayObject($contextResponse['headers']) : null, isset($contextResponse['links']) ? new \ArrayObject($contextResponse['links']) : null); } } From 6645c56cfc94681459028b43c7c996b1836997ca Mon Sep 17 00:00:00 2001 From: Guilliam Xavier Date: Tue, 13 Apr 2021 09:48:56 +0200 Subject: [PATCH 3/3] Update CHANGELOG.md --- CHANGELOG.md | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 08ad6acfd80..755b7057403 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## 2.6.5 + +* OpenAPI: Fix notice/warning for `response` without `content` in the `openapi_context` (#4210) + ## 2.6.4 * OpenAPI: Using an implicit flow is now valid, changes oauth configuration default values (#4115) @@ -10,7 +14,7 @@ * Serializer: Fix denormalization of basic property-types in XML and CSV (#4145) * Serializer: Fix denormalization of collection with one element in XML (#4154) * JSON Schema: Manage Sequentially and AtLeastOneOf constraints when generating property metadata (#4139 and #4147) -* JSON Schema: properties regex pattern is now correctly anchored (#4176) +* JSON Schema: properties regex pattern is now correctly anchored (#4176 and #4198) * JSON Schema: Fix PropertySchemaLengthRestriction string-only (#4177) * Doctrine: Fix purging HTTP cache for unreadable relations (#3441) * Doctrine: Revert #3774 support for binary UUID in search filter (#4134) @@ -23,7 +27,7 @@ * GraphQL: Make sure the order of order filters is preserved if nested resources are used (#4171) * Metadata: Sort mapping resources (#3256) * UUID: manage Ulid in format property schema restriction (#4148) -* Symfony: Do not override Vary headers already set in the Response +* Symfony: Do not override Vary headers already set in the Response (#4146) * Symfony: Make Twig dependency lazy (#4187) * Compatibility with `psr/cache` version 2 and 3 (#4117) * Docs: Upgrade Swagger UI to version 3.46.0