Make @OA\Server annotation be compatible with L5_SWAGGER_BASE_PATH en…

…vironment variable (#239)
DarkaOnLine · Nov 8, 2019 · df9e72d · df9e72d
1 parent e5d4441
commit df9e72d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/Generator.php b/src/Generator.php
@@ -139,9 +139,11 @@ protected function populateServers()
     {
         if (config('l5-swagger.paths.base') !== null) {
             if ($this->isOpenApi()) {
-                $this->swagger->servers = [
-                    new \OpenApi\Annotations\Server(['url' => config('l5-swagger.paths.base')]),
-                ];
+                if (! is_array($this->swagger->servers)) {
+                    $this->swagger->servers = [];
+                }
+
+                $this->swagger->servers[] = new \OpenApi\Annotations\Server(['url' => config('l5-swagger.paths.base')]);
             }
 
             if (! $this->isOpenApi()) {

diff --git a/tests/GeneratorTest.php b/tests/GeneratorTest.php
@@ -91,11 +91,13 @@ public function canGenerateApiJsonFileWithChangedBaseServer()
 
         $this->get(route('l5-swagger.docs'))
             ->assertSee('https://test-server.url')
+            ->assertSee('https://projects.dev/api/v1')
             ->assertDontSee('basePath')
             ->assertStatus(200);
 
         $this->get(route('l5-swagger.docs', ['jsonFile' => config('l5-swagger.paths.docs_yaml')]))
             ->assertSee('https://test-server.url')
+            ->assertSee('https://projects.dev/api/v1')
             ->assertDontSee('basePath')
             ->assertStatus(200);
     }