Merge branch 'master' into feat/apply-rule-ReturnTypeFromReturnDirect…

…ArrayRector
nelmio · Jun 5, 2024 · f9f3efc · f9f3efc
2 parents 543ceab + 9379c44
commit f9f3efc
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/Controller/SwaggerUiController.php b/src/Controller/SwaggerUiController.php
@@ -12,7 +12,6 @@
 namespace Nelmio\ApiDocBundle\Controller;
 
 use Nelmio\ApiDocBundle\Exception\RenderInvalidArgumentException;
-use Nelmio\ApiDocBundle\Render\Html\AssetsMode;
 use Nelmio\ApiDocBundle\Render\RenderOpenApi;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
@@ -35,7 +34,6 @@ public function __invoke(Request $request, string $area = 'default'): Response
         try {
             $response = new Response(
                 $this->renderOpenApi->renderFromRequest($request, RenderOpenApi::HTML, $area, [
-                    'assets_mode' => AssetsMode::BUNDLE,
                     'ui_renderer' => $this->uiRenderer,
                 ]),
                 Response::HTTP_OK,

diff --git a/tests/Functional/TestKernel.php b/tests/Functional/TestKernel.php
@@ -18,6 +18,7 @@
 use Hateoas\Configuration\Embedded;
 use JMS\SerializerBundle\JMSSerializerBundle;
 use Nelmio\ApiDocBundle\NelmioApiDocBundle;
+use Nelmio\ApiDocBundle\Render\Html\AssetsMode;
 use Nelmio\ApiDocBundle\Tests\Functional\Entity\BazingaUser;
 use Nelmio\ApiDocBundle\Tests\Functional\Entity\JMSComplex80;
 use Nelmio\ApiDocBundle\Tests\Functional\Entity\JMSComplex81;
@@ -242,6 +243,9 @@ protected function configureContainer(ContainerBuilder $c, LoaderInterface $load
 
         // Filter routes
         $c->loadFromExtension('nelmio_api_doc', [
+            'html_config' => [
+                'assets_mode' => AssetsMode::BUNDLE,
+            ],
             'use_validation_groups' => boolval(self::USE_VALIDATION_GROUPS === $this->flag),
             'documentation' => [
                 'info' => [