Keep server_url from Request only in RenderOpenApi

Controller/DocumentationController.php

@@ -32,9 +32,7 @@ final class DocumentationController
     {
         try {
             return JsonResponse::fromJsonString(
-                $this->renderOpenApi->render(RenderOpenApi::JSON, $area, [
+                $this->renderOpenApi->renderFromRequest($request, RenderOpenApi::JSON, $area)
-                    'server_url' => '' !== $request->getBaseUrl() ? $request->getSchemeAndHttpHost().$request->getBaseUrl() : null,
-                ])
             );
         } catch (InvalidArgumentException $e) {
             throw new BadRequestHttpException(sprintf('Area "%s" is not supported as it isn\'t defined in config.', $area));

Controller/SwaggerUiController.php

@@ -34,8 +34,7 @@ final class SwaggerUiController
     {
         try {
             $response = new Response(
-                $this->renderOpenApi->render(RenderOpenApi::HTML, $area, [
+                $this->renderOpenApi->renderFromRequest($request, RenderOpenApi::HTML, $area, [
-                    'server_url' => '' !== $request->getBaseUrl() ? $request->getSchemeAndHttpHost().$request->getBaseUrl() : null,
                     'assets_mode' => AssetsMode::BUNDLE,
                 ]),
                 Response::HTTP_OK,

Controller/YamlDocumentationController.php

@@ -33,9 +33,7 @@ final class YamlDocumentationController
     {
         try {
             $response = new Response(
-                $this->renderOpenApi->render(RenderOpenApi::YAML, $area, [
+                $this->renderOpenApi->renderFromRequest($request, RenderOpenApi::YAML, $area),
-                    'server_url' => '' !== $request->getBaseUrl() ? $request->getSchemeAndHttpHost().$request->getBaseUrl() : null,
-                ]),
                 Response::HTTP_OK,
                 ['Content-Type' => 'text/x-yaml']
             );

Render/Html/HtmlOpenApiRenderer.php

@@ -15,7 +15,6 @@ use InvalidArgumentException;
 use Nelmio\ApiDocBundle\Render\OpenApiRenderer;
 use Nelmio\ApiDocBundle\Render\RenderOpenApi;
 use OpenApi\Annotations\OpenApi;
-use OpenApi\Annotations\Server;
 use Twig\Environment;
 
 class HtmlOpenApiRenderer implements OpenApiRenderer
@@ -43,7 +42,6 @@ class HtmlOpenApiRenderer implements OpenApiRenderer
     public function render(OpenApi $spec, array $options = []): string
     {
         $options += [
-            'server_url' => null,
             'assets_mode' => AssetsMode::CDN,
             'swagger_ui_config' => [],
         ];
@@ -53,19 +51,10 @@ class HtmlOpenApiRenderer implements OpenApiRenderer
         return $this->twig->render(
             '@NelmioApiDoc/SwaggerUi/index.html.twig',
             [
-                'swagger_data' => ['spec' => $this->createJsonSpec($spec, $options['server_url'])],
+                'swagger_data' => ['spec' => json_decode($spec->toJson(), true)],
                 'assets_mode' => $options['assets_mode'],
                 'swagger_ui_config' => $options['swagger_ui_config'],
             ]
         );
     }
-
-    private function createJsonSpec(OpenApi $spec, $serverUrl)
-    {
-        if ($serverUrl) {
-            $spec->servers = [new Server(['url' => $serverUrl])];
-        }
-
-        return json_decode($spec->toJson(), true);
-    }
 }

Render/Json/JsonOpenApiRenderer.php

@@ -14,7 +14,6 @@ namespace Nelmio\ApiDocBundle\Render\Json;
 use Nelmio\ApiDocBundle\Render\OpenApiRenderer;
 use Nelmio\ApiDocBundle\Render\RenderOpenApi;
 use OpenApi\Annotations\OpenApi;
-use OpenApi\Annotations\Server;
 
 class JsonOpenApiRenderer implements OpenApiRenderer
 {
@@ -26,15 +25,10 @@ class JsonOpenApiRenderer implements OpenApiRenderer
     public function render(OpenApi $spec, array $options = []): string
     {
         $options += [
-            'server_url' => null,
             'no-pretty' => false,
         ];
         $flags = $options['no-pretty'] ? 0 : JSON_PRETTY_PRINT;
 
-        if ($options['server_url']) {
-            $spec->servers = [new Server(['url' => $options['server_url']])];
-        }
-
         return json_encode($spec, $flags);
     }
 }

Render/RenderOpenApi.php

@@ -13,7 +13,9 @@ namespace Nelmio\ApiDocBundle\Render;
 
 use InvalidArgumentException;
 use OpenApi\Annotations\OpenApi;
+use OpenApi\Annotations\Server;
 use Psr\Container\ContainerInterface;
+use Symfony\Component\HttpFoundation\Request;
 
 class RenderOpenApi
 {
@@ -40,6 +42,19 @@ class RenderOpenApi
         return array_keys($this->openApiRenderers);
     }
 
+    public function renderFromRequest(Request $request, string $format, $area, array $extraOptions = [])
+    {
+        $options = [];
+        if ('' !== $request->getBaseUrl()) {
+            $options += [
+                'server_url' => $request->getSchemeAndHttpHost().$request->getBaseUrl(),
+            ];
+        }
+        $options += $extraOptions;
+
+        return $this->render($format, $area, $options);
+    }
+
     /**
      * @throws InvalidArgumentException If the area to dump is not valid
      */
@@ -54,6 +69,10 @@ class RenderOpenApi
         /** @var OpenApi $spec */
         $spec = $this->generatorLocator->get($area)->generate();
 
+        if (array_key_exists('server_url', $options) && $options['server_url']) {
+            $spec->servers = [new Server(['url' => $options['server_url']])];
+        }
+
         return $this->openApiRenderers[$format]->render($spec, $options);
     }
 }

Render/Yaml/YamlOpenApiRenderer.php

@@ -14,7 +14,6 @@ namespace Nelmio\ApiDocBundle\Render\Yaml;
 use Nelmio\ApiDocBundle\Render\OpenApiRenderer;
 use Nelmio\ApiDocBundle\Render\RenderOpenApi;
 use OpenApi\Annotations\OpenApi;
-use OpenApi\Annotations\Server;
 
 class YamlOpenApiRenderer implements OpenApiRenderer
 {
@@ -25,14 +24,6 @@ class YamlOpenApiRenderer implements OpenApiRenderer
 
     public function render(OpenApi $spec, array $options = []): string
     {
-        $options += [
-            'server_url' => null,
-        ];
-
-        if ($options['server_url']) {
-            $spec->servers = [new Server(['url' => $options['server_url']])];
-        }
-
         return $spec->toYaml();
     }
 }