Review fixes 2

nelmio · Apr 18, 2024 · 9e84ef5 · 9e84ef5
1 parent 2813942
commit 9e84ef5
Show file tree

Hide file tree

Showing 4 changed files with 55 additions and 15 deletions.
diff --git a/src/Command/DumpCommand.php b/src/Command/DumpCommand.php
@@ -68,7 +68,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         $options = [];
         if (RenderOpenApi::HTML === $format) {
             $rawHtmlConfig = json_decode($input->getOption('html-config'), true);
-            $options = is_array($rawHtmlConfig) ? $rawHtmlConfig : $this->defaultHtmlConfig;
+            $options = is_array($rawHtmlConfig) ? $rawHtmlConfig + $this->defaultHtmlConfig : $this->defaultHtmlConfig;
         } elseif (RenderOpenApi::JSON === $format) {
             $options = [
                 'no-pretty' => $input->hasParameterOption(['--no-pretty']),

diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php
@@ -58,14 +58,17 @@ public function getConfigTreeBuilder(): TreeBuilder
                 ->end()
                 ->arrayNode('html_config')
                     ->info('UI configuration options')
+                    ->addDefaultsIfNotSet()
                     ->children()
                         ->scalarNode('assets_mode')
                             ->defaultValue(AssetsMode::CDN)
                         ->end()
                         ->arrayNode('swagger_ui_config')
+                            ->addDefaultsIfNotSet()
                             ->ignoreExtraKeys(false)
                         ->end()
                         ->arrayNode('redocly_config')
+                            ->addDefaultsIfNotSet()
                             ->ignoreExtraKeys(false)
                         ->end()
                     ->end()

diff --git a/src/Render/Html/HtmlOpenApiRenderer.php b/src/Render/Html/HtmlOpenApiRenderer.php
@@ -44,11 +44,7 @@ public function getFormat(): string
 
     public function render(OpenApi $spec, array $options = []): string
     {
-        $options += $this->htmlConfig + [
-            'assets_mode' => AssetsMode::CDN,
-            'swagger_ui_config' => [],
-            'redocly_config' => [],
-        ];
+        $options += $this->htmlConfig;
 
         if (isset($options['ui_renderer']) && Renderer::REDOCLY === $options['ui_renderer']) {
             return $this->twig->render(

diff --git a/tests/DependencyInjection/NelmioApiDocExtensionTest.php b/tests/DependencyInjection/NelmioApiDocExtensionTest.php
@@ -301,23 +301,64 @@ public static function provideCacheConfig(): \Generator
         ];
     }
 
-    public function testHtmlOpenApiRendererWithHtmlConfig()
+    /**
+     * @dataProvider provideOpenApiRendererWithHtmlConfig
+     */
+    public function testHtmlOpenApiRendererWithHtmlConfig(array $htmlConfig, array $expectedHtmlConfig): void
     {
         $container = new ContainerBuilder();
         $container->setParameter('kernel.bundles', [
             'TwigBundle' => TwigBundle::class,
         ]);
 
         $extension = new NelmioApiDocExtension();
-        $extension->load([['html_config' => $htmlConfig = [
-            'assets_mode' => 'cdn',
-            'redocly_config' => [
-                'expandResponses' => '200,201',
-                'hideDownloadButton' => true,
-            ],
-        ]]], $container);
+        $extension->load([['html_config' => $htmlConfig]], $container);
 
         $argument = $container->getDefinition('nelmio_api_doc.render_docs.html')->getArgument(1);
-        self::assertSame($htmlConfig, $argument);
+        self::assertSame($expectedHtmlConfig, $argument);
+    }
+
+    public static function provideOpenApiRendererWithHtmlConfig(): iterable
+    {
+        yield 'default' => [
+            [],
+            [
+                'assets_mode' => 'cdn',
+                'swagger_ui_config' => [],
+                'redocly_config' => [],
+            ],
+        ];
+        yield 'swagger_ui' => [
+            [
+                'assets_mode' => 'bundle',
+                'swagger_ui_config' => [
+                    'deepLinking' => true,
+                ],
+            ],
+            [
+                'assets_mode' => 'bundle',
+                'swagger_ui_config' => [
+                    'deepLinking' => true,
+                ],
+                'redocly_config' => [],
+            ],
+        ];
+        yield 'redocly' => [
+            [
+                'assets_mode' => 'cdn',
+                'redocly_config' => [
+                    'expandResponses' => '200,201',
+                    'hideDownloadButton' => true,
+                ],
+            ],
+            [
+                'assets_mode' => 'cdn',
+                'redocly_config' => [
+                    'expandResponses' => '200,201',
+                    'hideDownloadButton' => true,
+                ],
+                'swagger_ui_config' => [],
+            ],
+        ];
     }
 }