Fixes OpenApiResponse association permenantly modifying the Schema

Resolves #363
cnizzardini · Dec 27, 2021 · 869c8c9 · 869c8c9
1 parent a53bc2d
commit 869c8c9
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/src/Lib/Operation/OperationResponseAssociation.php b/src/Lib/Operation/OperationResponseAssociation.php
@@ -178,8 +178,12 @@ private function findSchema(Table $table, string $schemaMode): Schema
 
         $entityName = $this->inflector::singularize($table->getAlias());
 
-        return $this->swagger->getSchemaByName($entityName . '-' . $schemaMode) ??
-            $this->buildAssociatedSchema($entityName, $table->getAlias());
+        $schema = $this->swagger->getSchemaByName($entityName . '-' . $schemaMode);
+        if ($schema) {
+            return clone $schema;
+        }
+
+        return clone $this->buildAssociatedSchema($entityName, $table->getAlias());
     }
 
     /**

diff --git a/tests/TestCase/Lib/Operation/OperationResponseTest.php b/tests/TestCase/Lib/Operation/OperationResponseTest.php
@@ -371,8 +371,10 @@ public function test_associations(): void
                 ])
             );
 
+        $swagger = (new SwaggerFactory($this->config, new RouteScanner($this->router, $this->config)))->create();
+
         $operationResponse = new OperationResponse(
-            (new SwaggerFactory($this->config, new RouteScanner($this->router, $this->config)))->create(),
+            $swagger,
             $this->config,
             new Operation('hello', 'get'),
             $route,
@@ -383,6 +385,10 @@ public function test_associations(): void
         $operation = $operationResponse->getOperationWithResponses();
         $content = $operation->getResponseByCode('200')->getContentByMimeType('application/json');
         $this->assertArrayHasKey('department_employees', $content->getSchema()->getProperties());
+
+        // issue #363 association schema should only modify the operations response schema and not the main schema.
+        $schema = $swagger->getSchemaByName('Employee-Read');
+        $this->assertArrayNotHasKey('department_employees', $schema->getProperties());
     }
 
     public function test_text_plain_mime_type(): void