Merge pull request #1015 from nelmio/fosrest

Fix docs when using FOSRestBundle format listener
nelmio · Jun 22, 2017 · 6776d78 · 6776d78
2 parents aefdca9 + 91e8af5
commit 6776d78
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 1 deletion.
diff --git a/Controller/SwaggerUiController.php b/Controller/SwaggerUiController.php
@@ -27,6 +27,10 @@ public function __construct(ApiDocGenerator $apiDocGenerator, \Twig_Environment
 
     public function __invoke()
     {
-        return new Response($this->twig->render('@NelmioApiDoc/SwaggerUi/index.html.twig', ['swagger_data' => ['spec' => $this->apiDocGenerator->generate()->toArray()]]));
+        return new Response(
+            $this->twig->render('@NelmioApiDoc/SwaggerUi/index.html.twig', ['swagger_data' => ['spec' => $this->apiDocGenerator->generate()->toArray()]]),
+            Response::HTTP_OK,
+            ['Content-Type' => 'text/html']
+        );
     }
 }
diff --git a/Tests/Functional/SwaggerUiTest.php b/Tests/Functional/SwaggerUiTest.php
@@ -20,6 +20,7 @@ public function testSwaggerUi()
 
         $response = $client->getResponse();
         $this->assertEquals(200, $response->getStatusCode());
+        $this->assertEquals('text/html; charset=UTF-8', $response->headers->get('Content-Type'));
 
         $swaggerUiSpec = json_decode($crawler->filterXPath('//script[@id="swagger-data"]')->text(), true);
         $appSpec = $client->getContainer()->get('nelmio_api_doc.generator')->generate()->toArray();

diff --git a/Tests/Functional/TestKernel.php b/Tests/Functional/TestKernel.php
@@ -12,6 +12,7 @@
 namespace Nelmio\ApiDocBundle\Tests\Functional;
 
 use ApiPlatform\Core\Bridge\Symfony\Bundle\ApiPlatformBundle;
+use FOS\RestBundle\FOSRestBundle;
 use Nelmio\ApiDocBundle\NelmioApiDocBundle;
 use Nelmio\ApiDocBundle\Tests\Functional\TestBundle;
 use Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle;
@@ -38,6 +39,7 @@ public function registerBundles()
             new SensioFrameworkExtraBundle(),
             new ApiPlatformBundle(),
             new NelmioApiDocBundle(),
+            new FOSRestBundle(),
             new TestBundle(),
         ];
     }
@@ -67,6 +69,17 @@ protected function configureContainer(ContainerBuilder $c, LoaderInterface $load
             'serializer' => ['enable_annotations' => true],
         ]);
 
+        $c->loadFromExtension('fos_rest', [
+            'format_listener' => [
+                'rules' => [
+                    [
+                        'path' => '^/',
+                        'fallback_format' => 'json',
+                    ]
+                ],
+            ],
+        ]);
+
         // Filter routes
         $c->loadFromExtension('nelmio_api_doc', [
             'documentation' => [