Merge c31c9d9 into bcf2a46

api-platform · Nov 26, 2020 · ec5ba1b · ec5ba1b
2 parents bcf2a46 + c31c9d9
commit ec5ba1b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/Documentation/Action/DocumentationAction.php b/src/Documentation/Action/DocumentationAction.php
@@ -85,7 +85,7 @@ public function __invoke(Request $request = null): DocumentationInterface
             $this->formats = $this->formatsProvider->getFormatsFromAttributes($attributes ?? []);
         }
 
-        if (null !== $this->openApiFactory && isset($context) && 3 === $context['spec_version']) {
+        if ('json' === $request->getRequestFormat() && null !== $this->openApiFactory && 3 === ($context['spec_version'] ?? null)) {
             return $this->openApiFactory->__invoke($context ?? []);
         }
 

diff --git a/tests/Documentation/Action/DocumentationActionTest.php b/tests/Documentation/Action/DocumentationActionTest.php
@@ -43,6 +43,7 @@ class DocumentationActionTest extends TestCase
     public function testDocumentationAction(): void
     {
         $requestProphecy = $this->prophesize(Request::class);
+        $requestProphecy->getRequestFormat()->willReturn('json');
         $attributesProphecy = $this->prophesize(ParameterBagInterface::class);
         $queryProphecy = $this->prophesize(ParameterBag::class);
         $resourceNameCollectionFactoryProphecy = $this->prophesize(ResourceNameCollectionFactoryInterface::class);
@@ -63,6 +64,7 @@ public function testDocumentationAction(): void
     public function testLegacyDocumentationAction(): void
     {
         $requestProphecy = $this->prophesize(Request::class);
+        $requestProphecy->getRequestFormat()->willReturn('json');
         $attributesProphecy = $this->prophesize(ParameterBagInterface::class);
         $queryProphecy = $this->prophesize(ParameterBag::class);
         $resourceNameCollectionFactoryProphecy = $this->prophesize(ResourceNameCollectionFactoryInterface::class);
@@ -97,6 +99,7 @@ public function testDocumentationActionV2(): void
     {
         $openApiFactoryProphecy = $this->prophesize(OpenApiFactoryInterface::class);
         $requestProphecy = $this->prophesize(Request::class);
+        $requestProphecy->getRequestFormat()->willReturn('json');
         $attributesProphecy = $this->prophesize(ParameterBagInterface::class);
         $queryProphecy = $this->prophesize(ParameterBag::class);
         $resourceNameCollectionFactoryProphecy = $this->prophesize(ResourceNameCollectionFactoryInterface::class);
@@ -120,6 +123,7 @@ public function testDocumentationActionV3(): void
         $openApiFactoryProphecy = $this->prophesize(OpenApiFactoryInterface::class);
         $openApiFactoryProphecy->__invoke(Argument::any())->shouldBeCalled()->willReturn($openApi);
         $requestProphecy = $this->prophesize(Request::class);
+        $requestProphecy->getRequestFormat()->willReturn('json');
         $attributesProphecy = $this->prophesize(ParameterBagInterface::class);
         $queryProphecy = $this->prophesize(ParameterBag::class);
         $resourceNameCollectionFactoryProphecy = $this->prophesize(ResourceNameCollectionFactoryInterface::class);