Skip to content

Commit df9e72d

Browse files
ymhuang0808DarkaOnLine
authored andcommitted
Make @OA\Server annotation be compatible with L5_SWAGGER_BASE_PATH environment variable (#239)
1 parent e5d4441 commit df9e72d

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

src/Generator.php

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -139,9 +139,11 @@ protected function populateServers()
139139
{
140140
if (config('l5-swagger.paths.base') !== null) {
141141
if ($this->isOpenApi()) {
142-
$this->swagger->servers = [
143-
new \OpenApi\Annotations\Server(['url' => config('l5-swagger.paths.base')]),
144-
];
142+
if (! is_array($this->swagger->servers)) {
143+
$this->swagger->servers = [];
144+
}
145+
146+
$this->swagger->servers[] = new \OpenApi\Annotations\Server(['url' => config('l5-swagger.paths.base')]);
145147
}
146148

147149
if (! $this->isOpenApi()) {

tests/GeneratorTest.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,11 +91,13 @@ public function canGenerateApiJsonFileWithChangedBaseServer()
9191

9292
$this->get(route('l5-swagger.docs'))
9393
->assertSee('https://test-server.url')
94+
->assertSee('https://projects.dev/api/v1')
9495
->assertDontSee('basePath')
9596
->assertStatus(200);
9697

9798
$this->get(route('l5-swagger.docs', ['jsonFile' => config('l5-swagger.paths.docs_yaml')]))
9899
->assertSee('https://test-server.url')
100+
->assertSee('https://projects.dev/api/v1')
99101
->assertDontSee('basePath')
100102
->assertStatus(200);
101103
}

0 commit comments

Comments
 (0)