RetailCRM-Mirror/NelmioApiDocBundle
1
0
Fork 0
mirror of https://github.com/retailcrm/NelmioApiDocBundle.git synced 2025-03-12 10:36:09 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1015 from nelmio/fosrest

Browse Source 
Fix docs when using FOSRestBundle format listener
This commit is contained in:
Guilhem Niot 2017-06-22 20:29:28 +00:00 committed by GitHub
commit 6776d7880e
3 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Controller/SwaggerUiController.php
View File

@ -27,6 +27,10 @@ final class SwaggerUiController
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']
);
}
}

1
Tests/Functional/SwaggerUiTest.php
View File

@ -20,6 +20,7 @@ class SwaggerUiTest extends WebTestCase
$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();

13
Tests/Functional/TestKernel.php
View File

@ -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 @@ class TestKernel extends Kernel
new SensioFrameworkExtraBundle(),
new ApiPlatformBundle(),
new NelmioApiDocBundle(),
new FOSRestBundle(),
new TestBundle(),
];
}
@ -67,6 +69,17 @@ class TestKernel extends Kernel
'serializer' => ['enable_annotations' => true],
]);
$c->loadFromExtension('fos_rest', [
'format_listener' => [
'rules' => [
[
'path' => '^/',
'fallback_format' => 'json',
]
],
],
]);
// Filter routes
$c->loadFromExtension('nelmio_api_doc', [
'documentation' => [