feat(state): fixes

Author: LaurentHuzard

src/Laravel/ApiPlatformProvider.php

@@ -382,15 +382,23 @@ public function register(): void
         $this->app->bind(ProviderInterface::class, ContentNegotiationProvider::class);
 
         $this->app->singleton(RespondProcessor::class, function () {
-            return new AddLinkHeaderProcessor(new RespondProcessor(), new HttpHeaderSerializer());
+            return new RespondProcessor();
         });
 
-        $this->app->singleton(RespondProcessor::class, function (Application $app) {
-            return new LinkedDataPlatformProcessor(new RespondProcessor(), $app->make(ResourceClassResolverInterface::class), $app->make(ResourceMetadataCollectionFactoryInterface::class));
+        $this->app->singleton(AddLinkHeaderProcessor::class, function (Application $app) {
+            return new AddLinkHeaderProcessor($app->make(RespondProcessor::class), new HttpHeaderSerializer());
+        });
+
+        $this->app->singleton(LinkedDataPlatformProcessor::class, function (Application $app) {
+            return new LinkedDataPlatformProcessor(
+                $app->make(AddLinkHeaderProcessor::class), // Original service
+                $app->make(ResourceClassResolverInterface::class),
+                $app->make(ResourceMetadataCollectionFactoryInterface::class)
+            );
         });
 
         $this->app->singleton(SerializeProcessor::class, function (Application $app) {
-            return new SerializeProcessor($app->make(RespondProcessor::class), $app->make(Serializer::class), $app->make(SerializerContextBuilderInterface::class));
+            return new SerializeProcessor($app->make(LinkedDataPlatformProcessor::class), $app->make(Serializer::class), $app->make(SerializerContextBuilderInterface::class));
         });
 
         $this->app->singleton(WriteProcessor::class, function (Application $app) {

src/State/Processor/LinkedDataPlatformProcessor.php

@@ -29,15 +29,15 @@
  */
 final class LinkedDataPlatformProcessor implements ProcessorInterface
 {
-    private const DEFAULT_ALLOWED_METHOD = ['OPTIONS', 'HEAD'];
+    private const DEFAULT_ALLOWED_METHODS = ['OPTIONS', 'HEAD'];
 
     /**
      * @param ProcessorInterface<T1, T2> $decorated
      */
     public function __construct(
-        private readonly ProcessorInterface $decorated, // todo is processor interface nullable
+        private readonly ProcessorInterface $decorated,
         private readonly ?ResourceClassResolverInterface $resourceClassResolver = null,
-        private readonly ?ResourceMetadataCollectionFactoryInterface $resourceCollectionMetadataFactory = null,
+        private readonly ?ResourceMetadataCollectionFactoryInterface $resourceMetadataCollectionFactory = null,
     ) {
     }
 
@@ -48,22 +48,21 @@ public function process(mixed $data, Operation $operation, array $uriVariables =
             !$response instanceof Response
             || !$operation instanceof HttpOperation
             || $operation instanceof Error
-            || null === $this->resourceCollectionMetadataFactory
+            || !$this->resourceMetadataCollectionFactory
             || !($context['resource_class'] ?? null)
-            || null === $operation->getUriTemplate()
+            || !$operation->getUriTemplate()
             || !$this->resourceClassResolver?->isResourceClass($context['resource_class'])
         ) {
             return $response;
         }
 
-        $allowedMethods = self::DEFAULT_ALLOWED_METHOD;
-        $resourceMetadataCollection = $this->resourceCollectionMetadataFactory->create($context['resource_class']);
-        foreach ($resourceMetadataCollection as $resource) {
-            foreach ($resource->getOperations() as $resourceOperation) {
-                if ($resourceOperation->getUriTemplate() === $operation->getUriTemplate()) {
-                    $operationMethod = $resourceOperation->getMethod();
-                    $allowedMethods[] = $operationMethod;
-                    if ('POST' === $operationMethod && \is_array($outputFormats = $operation->getOutputFormats())) {
+        $allowedMethods = self::DEFAULT_ALLOWED_METHODS;
+        $resourceCollection = $this->resourceMetadataCollectionFactory->create($context['resource_class']);
+        foreach ($resourceCollection as $resource) {
+            foreach ($resource->getOperations() as $op) {
+                if ($op->getUriTemplate() === $operation->getUriTemplate()) {
+                    $allowedMethods[] = $method = $op->getMethod();
+                    if ('POST' === $method && \is_array($outputFormats = $op->getOutputFormats())) {
                         $response->headers->set('Accept-Post', implode(', ', array_merge(...array_values($outputFormats))));
                     }
                 }

src/State/Tests/Processor/LinkedDataPlatformProcessorTest.php

@@ -53,7 +53,7 @@ protected function setUp(): void
                     new ApiResource(operations: [
                         new Get(uriTemplate: '/dummy_resources/{dummyResourceId}{._format}', name: 'get'),
                         new GetCollection(uriTemplate: '/dummy_resources{._format}', name: 'get_collections'),
-                        new Post(uriTemplate: '/dummy_resources{._format}', name: 'post'),
+                        new Post(uriTemplate: '/dummy_resources{._format}', outputFormats: ['jsonld' => ['application/ld+json'], 'text/turtle' => ['text/turtle']], name: 'post'),
                         new Delete(uriTemplate: '/dummy_resources/{dummyResourceId}{._format}', name: 'delete'),
                         new Put(uriTemplate: '/dummy_resources/{dummyResourceId}{._format}', name: 'put'),
                     ]),
@@ -66,7 +66,7 @@ protected function setUp(): void
 
     public function testHeadersAcceptPostIsReturnWhenPostAllowed(): void
     {
-        $operation = (new HttpOperation('GET', '/dummy_resources{._format}', outputFormats: ['jsonld' => ['application/ld+json'], 'text/turtle' => ['text/turtle']]));
+        $operation = (new HttpOperation('GET', '/dummy_resources{._format}'));
 
         $context = $this->getContext();
 

src/Symfony/Bundle/Resources/config/symfony/events.xml

@@ -69,6 +69,8 @@
 
         <service id="api_platform.state_processor.linked_data_platform" class="ApiPlatform\State\Processor\LinkedDataPlatformProcessor" decorates="api_platform.state_processor.respond">
             <argument type="service"  id="api_platform.state_processor.linked_data_platform.inner" />
+            <argument type="service" id="api_platform.resource_class_resolver" />
+            <argument type="service" id="api_platform.metadata.resource.metadata_collection_factory" />
         </service>
 
         <service id="api_platform.listener.view.write" class="ApiPlatform\Symfony\EventListener\WriteListener">

tests/Functional/State/RespondProcessorTest.php renamed to tests/Functional/LinkDataPlatformTest.php

@@ -11,13 +11,13 @@
 
 declare(strict_types=1);
 
-namespace ApiPlatform\Tests\Functional\State;
+namespace ApiPlatform\Tests\Functional;
 
 use ApiPlatform\Symfony\Bundle\Test\ApiTestCase;
 use ApiPlatform\Tests\Fixtures\TestBundle\ApiResource\DummyGetPostDeleteOperation;
 use ApiPlatform\Tests\SetupClassResourcesTrait;
 
-class RespondProcessorTest extends ApiTestCase
+class LinkDataPlatformTest extends ApiTestCase
 {
     use SetupClassResourcesTrait;