Merge pull request #41 from reinfi/merge-response-and-request-bodies

Merge response and request bodies

Author: marcelthole

src/Merge/ComponentsMerger.php

@@ -41,6 +41,26 @@ public function merge(
             );
         }
 
+        if (
+            count($existingComponents->requestBodies ?? []) > 0
+            || count($newComponents->requestBodies ?? []) > 0
+        ) {
+            $mergedComponents->requestBodies = array_merge(
+                $existingComponents->requestBodies ?? [],
+                $newComponents->requestBodies ?? [],
+            );
+        }
+
+        if (
+            count($existingComponents->responses ?? []) > 0
+            || count($newComponents->responses ?? []) > 0
+        ) {
+            $mergedComponents->responses = array_merge(
+                $existingComponents->responses ?? [],
+                $newComponents->responses ?? [],
+            );
+        }
+
         $clonedSpec = new OpenApi(Json::toArray($existingSpec->getSerializableData()));
 
         $clonedSpec->components = $mergedComponents;

src/OpenApiMerge.php

@@ -50,7 +50,9 @@ public function mergeFiles(File $baseFile, array $additionalFiles, bool $resolve
         }
 
         if ($resolveReference && $mergedOpenApiDefinition->components !== null) {
-            $mergedOpenApiDefinition->components->schemas = [];
+            $mergedOpenApiDefinition->components->schemas       = [];
+            $mergedOpenApiDefinition->components->responses     = [];
+            $mergedOpenApiDefinition->components->requestBodies = [];
         }
 
         return new SpecificationFile(

tests/Acceptance/Fixtures/expected.yml

@@ -97,6 +97,8 @@ components:
       type: http
     BasicAuth:
       type: http
+  responses: {  }
+  requestBodies: {  }
 security: []
 tags:
   -

tests/Acceptance/Fixtures/expected_yaml610.yml

@@ -97,6 +97,8 @@ components:
       type: http
     BasicAuth:
       type: http
+  responses: {  }
+  requestBodies: {  }
 security: []
 tags:
   -

tests/Merge/ComponentsMergerTest.php

@@ -152,5 +152,99 @@ public function mergeDataProvider(): iterable
                 ],
             ]),
         ];
+
+        yield 'request bodies first' => [
+            new Components([
+                'requestBodies' => [
+                    'RequestBody' => [],
+                ],
+            ]),
+            null,
+            new Components([
+                'requestBodies' => [
+                    'RequestBody' => [],
+                ],
+            ]),
+        ];
+
+        yield 'request bodies second' => [
+            null,
+            new Components([
+                'requestBodies' => [
+                    'RequestBody' => [],
+                ],
+            ]),
+            new Components([
+                'requestBodies' => [
+                    'RequestBody' => [],
+                ],
+            ]),
+        ];
+
+        yield 'request bodies both' => [
+            new Components([
+                'requestBodies' => [
+                    'RequestBody' => [],
+                ],
+            ]),
+            new Components([
+                'requestBodies' => [
+                    'AnotherRequestBody' => [],
+                ],
+            ]),
+            new Components([
+                'requestBodies' => [
+                    'RequestBody' => [],
+                    'AnotherRequestBody' => [],
+                ],
+            ]),
+        ];
+
+        yield 'responses first' => [
+            new Components([
+                'responses' => [
+                    'ProblemResponse' => [],
+                ],
+            ]),
+            null,
+            new Components([
+                'responses' => [
+                    'ProblemResponse' => [],
+                ],
+            ]),
+        ];
+
+        yield 'responses second' => [
+            null,
+            new Components([
+                'responses' => [
+                    'ProblemResponse' => [],
+                ],
+            ]),
+            new Components([
+                'responses' => [
+                    'ProblemResponse' => [],
+                ],
+            ]),
+        ];
+
+        yield 'responses both' => [
+            new Components([
+                'responses' => [
+                    'ProblemResponse' => [],
+                ],
+            ]),
+            new Components([
+                'responses' => [
+                    'AnotherProblemResponse' => [],
+                ],
+            ]),
+            new Components([
+                'responses' => [
+                    'ProblemResponse' => [],
+                    'AnotherProblemResponse' => [],
+                ],
+            ]),
+        ];
     }
 }