Merge pull request #2799 from weaverryan/fix-servers-empty-base-path

dunglas · web-flow · commit d39b44e832d4 · 2019-05-16T16:57:39.000+02:00
Fixing bug where servers would be added and set to an empty string in OpenAPI
diff --git a/src/Swagger/Serializer/DocumentationNormalizer.php b/src/Swagger/Serializer/DocumentationNormalizer.php
@@ -702,7 +702,7 @@ private function computeDoc(bool $v3, Documentation $documentation, \ArrayObject
 
         if ($v3) {
             $docs = ['openapi' => self::OPENAPI_VERSION];
-            if ('/' !== $baseUrl) {
+            if ('/' !== $baseUrl && '' !== $baseUrl) {
                 $docs['servers'] = [['url' => $context[self::BASE_URL] ?? $this->defaultContext[self::BASE_URL]]];
             }
         } else {
diff --git a/tests/Swagger/Serializer/DocumentationNormalizerV3Test.php b/tests/Swagger/Serializer/DocumentationNormalizerV3Test.php
@@ -350,6 +350,8 @@ public function testNormalize()
         ];
 
         $this->assertEquals($expected, $normalizer->normalize($documentation, DocumentationNormalizer::FORMAT, ['base_url' => '/app_dev.php/']));
+        $this->assertArrayNotHasKey('servers', (array) $normalizer->normalize($documentation, DocumentationNormalizer::FORMAT, ['base_url' => '/']));
+        $this->assertArrayNotHasKey('servers', (array) $normalizer->normalize($documentation, DocumentationNormalizer::FORMAT, ['base_url' => '']));
     }
 
     public function testNormalizeWithNameConverter()

Original file line number	Diff line number	Diff line change
`@@ -702,7 +702,7 @@ private function computeDoc(bool $v3, Documentation $documentation, \ArrayObject`
`702`	`702`
`703`	`703`	`if ($v3) {`
`704`	`704`	`$docs = ['openapi' => self::OPENAPI_VERSION];`
`705`		`- if ('/' !== $baseUrl) {`
	`705`	`+ if ('/' !== $baseUrl && '' !== $baseUrl) {`
`706`	`706`	`$docs['servers'] = [['url' => $context[self::BASE_URL] ?? $this->defaultContext[self::BASE_URL]]];`
`707`	`707`	`}`
`708`	`708`	`} else {`
Original file line number	Diff line number	Diff line change
`@@ -350,6 +350,8 @@ public function testNormalize()`
`350`	`350`	`];`
`351`	`351`
`352`	`352`	`$this->assertEquals($expected, $normalizer->normalize($documentation, DocumentationNormalizer::FORMAT, ['base_url' => '/app_dev.php/']));`
	`353`	`+ $this->assertArrayNotHasKey('servers', (array) $normalizer->normalize($documentation, DocumentationNormalizer::FORMAT, ['base_url' => '/']));`
	`354`	`+ $this->assertArrayNotHasKey('servers', (array) $normalizer->normalize($documentation, DocumentationNormalizer::FORMAT, ['base_url' => '']));`
`353`	`355`	`}`
`354`	`356`
`355`	`357`	`public function testNormalizeWithNameConverter()`