Drop class_alias uses to fix #307

Author: Jean85

src/EventListener/RequestListener.php

@@ -5,21 +5,14 @@
 use Sentry\SentrySdk;
 use Sentry\State\HubInterface;
 use Sentry\State\Scope;
+use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\Event\ControllerEvent;
 use Symfony\Component\HttpKernel\Event\FilterControllerEvent;
 use Symfony\Component\HttpKernel\Event\GetResponseEvent;
 use Symfony\Component\HttpKernel\Event\RequestEvent;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
 use Symfony\Component\Security\Core\User\UserInterface;
 
-if (! class_exists(RequestEvent::class)) {
-    class_alias(GetResponseEvent::class, RequestEvent::class);
-}
-
-if (! class_exists(ControllerEvent::class)) {
-    class_alias(FilterControllerEvent::class, ControllerEvent::class);
-}
-
 /**
  * Class RequestListener
  * @package Sentry\SentryBundle\EventListener
@@ -50,12 +43,29 @@ public function __construct(
      *
      * @param RequestEvent $event
      */
-    public function onKernelRequest(RequestEvent $event): void
+    public function onRequest(RequestEvent $event): void
+    {
+        if (! $event->isMasterRequest()) {
+            return;
+        }
+
+        $this->handleRequestEvent($event->getRequest());
+    }
+
+    /**
+     * BC layer for SF < 4.3
+     */
+    public function onKernelRequest(GetResponseEvent $event): void
     {
         if (! $event->isMasterRequest()) {
             return;
         }
 
+        $this->handleRequestEvent($event->getRequest());
+    }
+
+    private function handleRequestEvent(Request $request): void
+    {
         $currentClient = SentrySdk::getCurrentHub()->getClient();
         if (null === $currentClient || ! $currentClient->getOptions()->shouldSendDefaultPii()) {
             return;
@@ -77,25 +87,42 @@ public function onKernelRequest(RequestEvent $event): void
             $userData = $this->getUserData($token->getUser());
         }
 
-        $userData['ip_address'] = $event->getRequest()->getClientIp();
+        $userData['ip_address'] = $request->getClientIp();
 
         SentrySdk::getCurrentHub()
             ->configureScope(function (Scope $scope) use ($userData): void {
                 $scope->setUser($userData, true);
             });
     }
 
-    public function onKernelController(ControllerEvent $event): void
+    public function onController(ControllerEvent $event): void
+    {
+        if (! $event->isMasterRequest()) {
+            return;
+        }
+
+        $this->handleControllerEvent($event->getRequest());
+    }
+
+    /**
+     * BC layer for SF < 4.3
+     */
+    public function onKernelController(FilterControllerEvent $event): void
     {
         if (! $event->isMasterRequest()) {
             return;
         }
 
-        if (! $event->getRequest()->attributes->has('_route')) {
+        $this->handleControllerEvent($event->getRequest());
+    }
+
+    private function handleControllerEvent(Request $request): void
+    {
+        if (! $request->attributes->has('_route')) {
             return;
         }
 
-        $matchedRoute = (string) $event->getRequest()->attributes->get('_route');
+        $matchedRoute = (string)$request->attributes->get('_route');
 
         SentrySdk::getCurrentHub()
             ->configureScope(function (Scope $scope) use ($matchedRoute): void {

src/EventListener/SubRequestListener.php

@@ -7,18 +7,26 @@
 use Symfony\Component\HttpKernel\Event\GetResponseEvent;
 use Symfony\Component\HttpKernel\Event\RequestEvent;
 
-if (! class_exists(RequestEvent::class)) {
-    class_alias(GetResponseEvent::class, RequestEvent::class);
-}
-
 final class SubRequestListener
 {
     /**
      * Pushes a new {@see Scope} for each SubRequest
      *
      * @param RequestEvent $event
      */
-    public function onKernelRequest(RequestEvent $event): void
+    public function onRequest(RequestEvent $event): void
+    {
+        if ($event->isMasterRequest()) {
+            return;
+        }
+
+        SentrySdk::getCurrentHub()->pushScope();
+    }
+
+    /**
+     * BC layer for SF < 4.3
+     */
+    public function onKernelRequest(GetResponseEvent $event): void
     {
         if ($event->isMasterRequest()) {
             return;
@@ -32,7 +40,7 @@ public function onKernelRequest(RequestEvent $event): void
      *
      * @param FinishRequestEvent $event
      */
-    public function onKernelFinishRequest(FinishRequestEvent $event): void
+    public function onFinishRequest(FinishRequestEvent $event): void
     {
         if ($event->isMasterRequest()) {
             return;