Fix more tests

Author: Jean85

src/DependencyInjection/SentryExtension.php

@@ -19,6 +19,7 @@
 use Symfony\Component\DependencyInjection\Loader;
 use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\HttpKernel\DependencyInjection\Extension;
+use Symfony\Component\HttpKernel\Event\ControllerEvent;
 use Symfony\Component\HttpKernel\Event\ExceptionEvent;
 use Symfony\Component\HttpKernel\Event\RequestEvent;
 use Symfony\Component\HttpKernel\KernelEvents;
@@ -181,12 +182,18 @@ private function tagExceptionListener(ContainerBuilder $container): void
         ]);
 
         $requestListener = $container->getDefinition(RequestListener::class);
-        $method = class_exists(RequestEvent::class)
-            ? 'onRequest'
-            : 'onKernelRequest';
         $requestListener->addTag(self::KERNEL_EVENT_LISTENER, [
             'event' => KernelEvents::REQUEST,
-            'method' => $method,
+            'method' => class_exists(RequestEvent::class)
+                ? 'onRequest'
+                : 'onKernelRequest',
+            'priority' => '%sentry.listener_priorities.request%',
+        ]);
+        $requestListener->addTag(self::KERNEL_EVENT_LISTENER, [
+            'event' => KernelEvents::CONTROLLER,
+            'method' => class_exists(ControllerEvent::class)
+                ? 'onController'
+                : 'onKernelController',
             'priority' => '%sentry.listener_priorities.request%',
         ]);
 

test/EventListener/SubRequestListenerTest.php

@@ -48,7 +48,7 @@ public function testOnKernelRequestWithSubRequest(): void
         $listener->onKernelRequest($subRequestEvent);
     }
 
-    public function testOnKernelFinishRequestWithMasterRequest(): void
+    public function testonFinishRequestWithMasterRequest(): void
     {
         $listener = new SubRequestListener();
 
@@ -57,10 +57,10 @@ public function testOnKernelFinishRequestWithMasterRequest(): void
         $this->currentHub->popScope()
             ->shouldNotBeCalled();
 
-        $listener->onKernelFinishRequest($masterRequestEvent);
+        $listener->onFinishRequest($masterRequestEvent);
     }
 
-    public function testOnKernelFinishRequestWithSubRequest(): void
+    public function testonFinishRequestWithSubRequest(): void
     {
         $listener = new SubRequestListener();
 
@@ -70,7 +70,7 @@ public function testOnKernelFinishRequestWithSubRequest(): void
             ->shouldBeCalledTimes(1)
             ->willReturn(true);
 
-        $listener->onKernelFinishRequest($subRequestEvent);
+        $listener->onFinishRequest($subRequestEvent);
     }
 
     private function createFinishRequestEvent(int $type): FinishRequestEvent

test/SentryBundleTest.php

@@ -20,6 +20,7 @@
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\HttpKernel\Event\ExceptionEvent;
+use Symfony\Component\HttpKernel\Event\RequestEvent;
 use Symfony\Component\HttpKernel\KernelEvents;
 
 class SentryBundleTest extends TestCase
@@ -49,16 +50,24 @@ public function testContainerHasRequestListenerConfiguredCorrectly(): void
 
         $consoleListener = $container->getDefinition(RequestListener::class);
 
+        if (class_exists(RequestEvent::class)) {
+            $requestMethod = 'onRequest';
+            $controllerMethod = 'onController';
+        } else {
+            $requestMethod = 'onKernelRequest';
+            $controllerMethod = 'onKernelController';
+        }
+
         $expectedTag = [
             'kernel.event_listener' => [
                 [
                     'event' => KernelEvents::REQUEST,
-                    'method' => 'onKernelRequest',
+                    'method' => $requestMethod,
                     'priority' => '%sentry.listener_priorities.request%',
                 ],
                 [
                     'event' => KernelEvents::CONTROLLER,
-                    'method' => 'onKernelController',
+                    'method' => $controllerMethod,
                     'priority' => '%sentry.listener_priorities.request%',
                 ],
             ],
@@ -73,16 +82,22 @@ public function testContainerHasSubRequestListenerConfiguredCorrectly(): void
 
         $consoleListener = $container->getDefinition(SubRequestListener::class);
 
+        if (class_exists(RequestEvent::class)) {
+            $requestMethod = 'onRequest';
+        } else {
+            $requestMethod = 'onKernelRequest';
+        }
+
         $expectedTag = [
             'kernel.event_listener' => [
                 [
-                    'event' => KernelEvents::REQUEST,
-                    'method' => 'onKernelRequest',
+                    'event' => KernelEvents::FINISH_REQUEST,
+                    'method' => 'onFinishRequest',
                     'priority' => '%sentry.listener_priorities.sub_request%',
                 ],
                 [
-                    'event' => KernelEvents::FINISH_REQUEST,
-                    'method' => 'onKernelFinishRequest',
+                    'event' => KernelEvents::REQUEST,
+                    'method' => $requestMethod,
                     'priority' => '%sentry.listener_priorities.sub_request%',
                 ],
             ],