fixup! Add payload controller value resolver

Author: julienfalque

CHANGELOG.md

@@ -12,7 +12,7 @@
 * DataProvider: Add `TraversablePaginator` (#3783)
 * JSON:API: Support inclusion of resources from path (#3288)
 * Swagger UI: Add `swagger_ui_extra_configuration` to Swagger / OpenAPI configuration (#3731)
-* Allow controller argument with a name different from `$data` thanks to an argument resolver
+* Allow controller argument with a name different from `$data` thanks to an argument resolver (#3263)
 
 ## 2.6.3
 

src/Bridge/Symfony/Bundle/ArgumentResolver/PayloadArgumentResolver.php

@@ -62,10 +62,6 @@ public function supports(Request $request, ArgumentMetadata $argument): bool
 
     public function resolve(Request $request, ArgumentMetadata $argument): \Generator
     {
-        if (!$this->supports($request, $argument)) {
-            throw new \InvalidArgumentException('Given request and argument not supported.');
-        }
-
         yield $request->attributes->get('data');
     }
 

src/Bridge/Symfony/Bundle/Resources/config/argument_resolver.xml

@@ -5,7 +5,7 @@
            xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
 
     <services>
-        <service id="api_platform.payload_argument_resolver" class="ApiPlatform\Core\Bridge\Symfony\Bundle\ArgumentResolver\PayloadArgumentResolver" public="false">
+        <service id="api_platform.argument_resolver.payload" class="ApiPlatform\Core\Bridge\Symfony\Bundle\ArgumentResolver\PayloadArgumentResolver" public="false">
             <argument type="service" id="api_platform.metadata.resource.metadata_factory" />
             <argument type="service" id="api_platform.serializer.context_builder" />
 

tests/Bridge/Symfony/Bundle/ArgumentResolver/PayloadArgumentResolverTest.php

@@ -22,9 +22,6 @@
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\ControllerMetadata\ArgumentMetadata;
 
-/**
- * @covers \ApiPlatform\Core\Bridge\Symfony\Bundle\ArgumentResolver\PayloadArgumentResolver
- */
 class PayloadArgumentResolverTest extends KernelTestCase
 {
     public function testItSupportsRequestWithPayloadOfExpectedType(): void
@@ -136,38 +133,6 @@ public function testItResolvesArgumentFromRequestWithDataOfChildType(): void
         );
     }
 
-    /**
-     * @dataProvider provideUnsupportedArguments
-     */
-    public function testItDoesNotResolveForUnsupportedArgument(ArgumentMetadata $argument): void
-    {
-        $resolver = $this->createArgumentResolver();
-
-        $request = $this->createRequest('PUT', [
-            '_api_resource_class' => ResourceImplementation::class,
-            '_api_receive' => true,
-            '_api_item_operation_name' => 'update',
-            'data' => new ResourceImplementation(),
-        ]);
-
-        $this->expectException(\InvalidArgumentException::class);
-
-        iterator_to_array($resolver->resolve($request, $argument));
-    }
-
-    /**
-     * @dataProvider provideUnsupportedRequests
-     */
-    public function testItDoesNotResolveForUnsupportedRequest(Request $request): void
-    {
-        $resolver = $this->createArgumentResolver();
-        $argument = $this->createArgumentMetadata(ResourceInterface::class);
-
-        $this->expectException(\InvalidArgumentException::class);
-
-        iterator_to_array($resolver->resolve($request, $argument));
-    }
-
     public function provideUnsupportedRequests(): iterable
     {
         yield 'GET request' => [$this->createRequest('GET', [

tests/Bridge/Symfony/Bundle/DependencyInjection/ApiPlatformExtensionTest.php

@@ -1287,7 +1287,7 @@ private function getBaseContainerBuilderProphecy(array $doctrineIntegrationsToLo
             'api_platform.metadata.resource.name_collection_factory.annotation',
             'api_platform.metadata.resource.name_collection_factory.yaml',
             'api_platform.metadata.subresource.metadata_factory.annotation',
-            'api_platform.payload_argument_resolver',
+            'api_platform.argument_resolver.payload',
             'api_platform.problem.encoder',
             'api_platform.problem.normalizer.constraint_violation_list',
             'api_platform.problem.normalizer.error',