moved from ControllerArgumentsEvent to ControllerEvent

Author: ViniTou

src/lib/EventListener/PerformAccessCheckSubscriber.php

@@ -11,7 +11,7 @@
 use Ibexa\Contracts\User\Controller\RestrictedControllerInterface;
 use Symfony\Component\DependencyInjection\Attribute\AutowireIterator;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
-use Symfony\Component\HttpKernel\Event\ControllerArgumentsEvent;
+use Symfony\Component\HttpKernel\Event\ControllerEvent;
 
 final class PerformAccessCheckSubscriber implements EventSubscriberInterface
 {
@@ -24,7 +24,7 @@ public function __construct(
     ) {
     }
 
-    public function onControllerArgumentsEvent(ControllerArgumentsEvent $event): void
+    public function onControllerEvent(ControllerEvent $event): void
     {
         $controller = $event->getController();
         if (is_array($controller) && $controller[0] instanceof RestrictedControllerInterface) {
@@ -54,7 +54,7 @@ public function onControllerArgumentsEvent(ControllerArgumentsEvent $event): voi
     public static function getSubscribedEvents(): array
     {
         return [
-            ControllerArgumentsEvent::class => 'onControllerArgumentsEvent',
+            ControllerEvent::class => 'onControllerEvent',
         ];
     }
 }

tests/lib/EventListener/PerformAccessCheckSubscriberTest.php

@@ -12,7 +12,7 @@
 use Ibexa\User\EventListener\PerformAccessCheckSubscriber;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpKernel\Event\ControllerArgumentsEvent;
+use Symfony\Component\HttpKernel\Event\ControllerEvent;
 use Symfony\Component\HttpKernel\HttpKernelInterface;
 
 final class PerformAccessCheckSubscriberTest extends TestCase
@@ -33,31 +33,29 @@ protected function setUp(): void
     public function testArrayController(): void
     {
         $controller = new MockControllerInterface();
-        $event = new ControllerArgumentsEvent(
+        $event = new ControllerEvent(
             $this->kernel,
             [$controller, 'action'],
-            [],
             $this->request,
             HttpKernelInterface::MAIN_REQUEST
         );
 
-        $this->subscriber->onControllerArgumentsEvent($event);
+        $this->subscriber->onControllerEvent($event);
 
         self::assertTrue($controller->wasCheckPerformed());
     }
 
     public function testInvokableController(): void
     {
         $controller = new MockControllerInterface();
-        $event = new ControllerArgumentsEvent(
+        $event = new ControllerEvent(
             $this->kernel,
             $controller,
-            [],
             $this->request,
             HttpKernelInterface::MAIN_REQUEST
         );
 
-        $this->subscriber->onControllerArgumentsEvent($event);
+        $this->subscriber->onControllerEvent($event);
 
         self::assertTrue($controller->wasCheckPerformed());
     }
@@ -67,15 +65,14 @@ public function testStringControllerWithServiceLookup(): void
         $controller = new MockControllerInterface();
         $this->subscriber = new PerformAccessCheckSubscriber([$controller]);
 
-        $event = new ControllerArgumentsEvent(
+        $event = new ControllerEvent(
             $this->kernel,
             MockControllerInterface::class . '::staticAction',
-            [],
             $this->request,
             HttpKernelInterface::MAIN_REQUEST
         );
 
-        $this->subscriber->onControllerArgumentsEvent($event);
+        $this->subscriber->onControllerEvent($event);
 
         self::assertTrue($controller->wasCheckPerformed());
     }