fix: reorder early return QueryParameterValidateListener

Author: louismariegaborit

src/Symfony/EventListener/QueryParameterValidateListener.php

@@ -15,7 +15,7 @@
 
 use ApiPlatform\Doctrine\Odm\State\Options as ODMOptions;
 use ApiPlatform\Doctrine\Orm\State\Options;
-use ApiPlatform\Metadata\CollectionOperationInterface;
+use ApiPlatform\Metadata\HttpOperation;
 use ApiPlatform\Metadata\Resource\Factory\ResourceMetadataCollectionFactoryInterface;
 use ApiPlatform\ParameterValidator\ParameterValidator;
 use ApiPlatform\State\ProviderInterface;
@@ -54,20 +54,6 @@ public function onKernelRequest(RequestEvent $event): void
         $request = $event->getRequest();
         $operation = $this->initializeOperation($request);
 
-        if ($operation && $this->provider instanceof ProviderInterface) {
-            if (null === $operation->getQueryParameterValidationEnabled()) {
-                $operation = $operation->withQueryParameterValidationEnabled($request->isMethodSafe() && 'GET' === $request->getMethod() && $operation instanceof CollectionOperationInterface);
-            }
-
-            $this->provider->provide($operation, $request->attributes->get('_api_uri_variables') ?? [], [
-                'request' => $request,
-                'uri_variables' => $request->attributes->get('_api_uri_variables') ?? [],
-                'resource_class' => $operation->getClass(),
-            ]);
-
-            return;
-        }
-
         if (
             !$request->isMethodSafe()
             || !($attributes = RequestAttributesExtractor::extractAttributes($request))
@@ -81,7 +67,21 @@ public function onKernelRequest(RequestEvent $event): void
             return;
         }
 
-        if (!($operation?->getQueryParameterValidationEnabled() ?? true) || !$operation instanceof CollectionOperationInterface) {
+        if (!($operation?->getQueryParameterValidationEnabled() ?? true) || !$operation instanceof HttpOperation) {
+            return;
+        }
+
+        if ($this->provider instanceof ProviderInterface) {
+            if (null === $operation->getQueryParameterValidationEnabled()) {
+                $operation = $operation->withQueryParameterValidationEnabled('GET' === $request->getMethod());
+            }
+
+            $this->provider->provide($operation, $request->attributes->get('_api_uri_variables') ?? [], [
+                'request' => $request,
+                'uri_variables' => $request->attributes->get('_api_uri_variables') ?? [],
+                'resource_class' => $operation->getClass(),
+            ]);
+
             return;
         }
 

tests/Symfony/EventListener/QueryParameterValidateListenerTest.php

@@ -0,0 +1,70 @@
+<?php
+
+/*
+ * This file is part of the API Platform project.
+ *
+ * (c) Kévin Dunglas <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace ApiPlatform\Tests\Symfony\EventListener;
+use ApiPlatform\Metadata\ApiResource;
+use ApiPlatform\Metadata\Get;
+use ApiPlatform\Metadata\Resource\Factory\ResourceMetadataCollectionFactoryInterface;
+use ApiPlatform\Metadata\Resource\ResourceMetadataCollection;
+use ApiPlatform\State\ProviderInterface;
+use ApiPlatform\Symfony\EventListener\QueryParameterValidateListener;
+use ApiPlatform\Tests\Fixtures\TestBundle\Entity\Dummy;
+use PHPUnit\Framework\TestCase;
+use Prophecy\PhpUnit\ProphecyTrait;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpKernel\Event\RequestEvent;
+use Symfony\Component\HttpKernel\HttpKernelInterface;
+
+class QueryParameterValidateListenerTest extends TestCase
+{
+    use ProphecyTrait;
+
+    public function testOnKernelRequest(): void
+    {
+        $request = new Request([], [], ['_api_resource_class' => Dummy::class, '_api_operation_name' => 'get']);
+        $parameterValidator = $this->prophesize(ProviderInterface::class);
+        $parameterValidator->provide(new Get(name: 'get', queryParameterValidationEnabled: true), [], ['request' => $request, 'uri_variables' => [], 'resource_class' => null])->shouldBeCalled();
+
+        $factory = $this->prophesize(ResourceMetadataCollectionFactoryInterface::class);
+        $factory->create(Dummy::class)->willReturn(new ResourceMetadataCollection(Dummy::class, [new ApiResource(operations: ['get' => new Get(name: 'get')])]))->shouldBeCalled();
+
+        $listener = new QueryParameterValidateListener($parameterValidator->reveal(), $factory->reveal());
+
+        $event = new RequestEvent(
+            $this->prophesize(HttpKernelInterface::class)->reveal(),
+            $request,
+            \defined(HttpKernelInterface::class.'::MAIN_REQUEST') ? HttpKernelInterface::MAIN_REQUEST : HttpKernelInterface::MASTER_REQUEST,
+        );
+
+        $listener->onKernelRequest($event);
+    }
+
+    public function testDoNothingWhenListenersDisabled(): void
+    {
+        $parameterValidator = $this->prophesize(ProviderInterface::class);
+        $parameterValidator->provide()->shouldNotBeCalled();
+
+        $factory = $this->prophesize(ResourceMetadataCollectionFactoryInterface::class);
+        $factory->create(Dummy::class)->willReturn(new ResourceMetadataCollection(Dummy::class, [new ApiResource(operations: ['get' => new Get(name: 'get')])]))->shouldBeCalled();
+
+        $listener = new QueryParameterValidateListener($parameterValidator->reveal(), $factory->reveal());
+
+        $event = new RequestEvent(
+            $this->prophesize(HttpKernelInterface::class)->reveal(),
+            new Request([], [], ['_api_resource_class' => Dummy::class, '_api_operation_name' => 'get', '_api_platform_disable_listeners' => true]),
+            \defined(HttpKernelInterface::class.'::MAIN_REQUEST') ? HttpKernelInterface::MAIN_REQUEST : HttpKernelInterface::MASTER_REQUEST,
+        );
+
+        $listener->onKernelRequest($event);
+    }
+}