Fix nullable OpenApiFactoryInterface (#4856)

Author: dannyvw

src/Documentation/Action/DocumentationAction.php

@@ -17,7 +17,6 @@
 use ApiPlatform\Documentation\DocumentationInterface;
 use ApiPlatform\Metadata\Resource\Factory\ResourceNameCollectionFactoryInterface;
 use ApiPlatform\OpenApi\Factory\OpenApiFactoryInterface;
-use ApiPlatform\Util\RequestAttributesExtractor;
 use Symfony\Component\HttpFoundation\Request;
 
 /**
@@ -31,7 +30,7 @@ final class DocumentationAction
     private string $title;
     private string $description;
     private string $version;
-    private OpenApiFactoryInterface $openApiFactory;
+    private OpenApiFactoryInterface|null $openApiFactory;
 
     public function __construct(ResourceNameCollectionFactoryInterface $resourceNameCollectionFactory, string $title = '', string $description = '', string $version = '', OpenApiFactoryInterface $openApiFactory = null)
     {
@@ -50,8 +49,6 @@ public function __invoke(Request $request = null): DocumentationInterface
                 $context['api_gateway'] = true;
             }
             $request->attributes->set('_api_normalization_context', $request->attributes->get('_api_normalization_context', []) + $context);
-
-            $attributes = RequestAttributesExtractor::extractAttributes($request);
         }
 
         if ('json' === $request->getRequestFormat() && null !== $this->openApiFactory) {

src/Symfony/Bundle/Resources/config/api.xml

@@ -91,7 +91,7 @@
             <argument>%api_platform.title%</argument>
             <argument>%api_platform.description%</argument>
             <argument>%api_platform.version%</argument>
-            <argument type="service" id="api_platform.openapi.factory" on-invalid="null"></argument>
+            <argument type="service" id="api_platform.openapi.factory" on-invalid="null" />
         </service>
 
         <service id="api_platform.action.exception" class="ApiPlatform\Action\ExceptionAction" public="true">

tests/Documentation/Action/DocumentationActionTest.php

@@ -14,7 +14,9 @@
 namespace ApiPlatform\Tests\Documentation\Action;
 
 use ApiPlatform\Documentation\Action\DocumentationAction;
+use ApiPlatform\Documentation\Documentation;
 use ApiPlatform\Metadata\Resource\Factory\ResourceNameCollectionFactoryInterface;
+use ApiPlatform\Metadata\Resource\ResourceNameCollection;
 use ApiPlatform\OpenApi\Factory\OpenApiFactoryInterface;
 use ApiPlatform\OpenApi\Model\Info;
 use ApiPlatform\OpenApi\Model\Paths;
@@ -46,11 +48,31 @@ public function testDocumentationAction(): void
         $requestProphecy->query = $queryProphecy->reveal();
         $requestProphecy->getBaseUrl()->willReturn('/api')->shouldBeCalledTimes(1);
         $queryProphecy->getBoolean('api_gateway')->willReturn(true)->shouldBeCalledTimes(1);
-        $attributesProphecy->all()->willReturn(['_api_normalization_context' => ['foo' => 'bar', 'base_url' => '/api', 'api_gateway' => true]])->shouldBeCalledTimes(1);
         $attributesProphecy->get('_api_normalization_context', [])->willReturn(['foo' => 'bar'])->shouldBeCalledTimes(1);
         $attributesProphecy->set('_api_normalization_context', ['foo' => 'bar', 'base_url' => '/api', 'api_gateway' => true])->shouldBeCalledTimes(1);
 
         $documentation = new DocumentationAction($this->prophesize(ResourceNameCollectionFactoryInterface::class)->reveal(), 'my api', '', '1.0.0', $openApiFactoryProphecy->reveal());
         $this->assertInstanceOf(OpenApi::class, $documentation($requestProphecy->reveal()));
     }
+
+    public function testDocumentationActionWithoutOpenApiFactory(): void
+    {
+        $openApiFactoryProphecy = $this->prophesize(OpenApiFactoryInterface::class);
+        $openApiFactoryProphecy->__invoke(Argument::any())->shouldNotBeCalled();
+        $requestProphecy = $this->prophesize(Request::class);
+        $requestProphecy->getRequestFormat()->willReturn('json');
+        $attributesProphecy = $this->prophesize(ParameterBagInterface::class);
+        $queryProphecy = $this->prophesize(ParameterBag::class);
+        $requestProphecy->attributes = $attributesProphecy->reveal();
+        $requestProphecy->query = $queryProphecy->reveal();
+        $requestProphecy->getBaseUrl()->willReturn('/api')->shouldBeCalledTimes(1);
+        $queryProphecy->getBoolean('api_gateway')->willReturn(true)->shouldBeCalledTimes(1);
+        $attributesProphecy->get('_api_normalization_context', [])->willReturn(['foo' => 'bar'])->shouldBeCalledTimes(1);
+        $attributesProphecy->set('_api_normalization_context', ['foo' => 'bar', 'base_url' => '/api', 'api_gateway' => true])->shouldBeCalledTimes(1);
+        $resourceNameCollectionFactoryProphecy = $this->prophesize(ResourceNameCollectionFactoryInterface::class);
+        $resourceNameCollectionFactoryProphecy->create()->willReturn(new ResourceNameCollection(['dummies']))->shouldBeCalled();
+
+        $documentation = new DocumentationAction($resourceNameCollectionFactoryProphecy->reveal(), 'my api', '', '1.0.0');
+        $this->assertInstanceOf(Documentation::class, $documentation($requestProphecy->reveal()));
+    }
 }