OpenApi definitions have higher priority than core definitions

contributte · Mar 29, 2019 · b0a8756 · b0a8756
1 parent 4028d22
commit b0a8756
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/SchemaDefinition/CoreDefinition.php b/src/SchemaDefinition/CoreDefinition.php
@@ -30,7 +30,7 @@ public function load(): array
 			foreach ($endpoint->getMethods() as $method) {
 				$data['paths'][(string) $endpoint->getMask()][strtolower($method)] = $this->createOperation($endpoint);
 			}
-			$data = Helpers::merge($data, $endpoint->getOpenApi()['controller'] ?? []);
+			$data = Helpers::merge($endpoint->getOpenApi()['controller'] ?? [], $data);
 		}
 		return $data;
 	}
@@ -75,7 +75,7 @@ protected function createOperation(Endpoint $endpoint): array
 		// TODO deprecated
 		// $operation->setDeprecated(false);
 
-		$operation = Helpers::merge($operation, $endpoint->getOpenApi()['method'] ?? []);
+		$operation = Helpers::merge($endpoint->getOpenApi()['method'] ?? [], $operation);
 
 		return $operation;
 	}

diff --git a/tests/cases/SchemaDefinition/CoreDefinition.phpt b/tests/cases/SchemaDefinition/CoreDefinition.phpt
@@ -44,7 +44,7 @@ final class CoreDefinitionTest extends TestCase
 				],
 			],
 			'method' => [
-				'description' => 'Not overridden description',
+				'description' => 'Overridden description',
 			],
 		]);
 
@@ -70,13 +70,12 @@ final class CoreDefinitionTest extends TestCase
 
 		Assert::same(
 			[
-				'info' => ['title' => 'Title', 'version' => '1.0.0'],
 				'paths' => [
 					'/foo/bar' => [
 						'get' => ['responses' => [], 'tags' => ['tag1']],
 						'post' => [
-							'description' => 'description',
 							'responses' => [200 => ['description' => 'description']],
+							'description' => 'Overridden description',
 							'tags' => ['tag2', 'tag3'],
 							'parameters' => [
 								[
@@ -96,8 +95,8 @@ final class CoreDefinitionTest extends TestCase
 							],
 						],
 						'put' => [
-							'description' => 'description',
 							'responses' => [200 => ['description' => 'description']],
+							'description' => 'Overridden description',
 							'tags' => ['tag2', 'tag3'],
 							'parameters' => [
 								[
@@ -118,6 +117,7 @@ final class CoreDefinitionTest extends TestCase
 						],
 					],
 				],
+				'info' => ['title' => 'Title', 'version' => '1.0.0'],
 			],
 			$definition->load()
 		);