Fix deprecations triggered by Symfony 5.3

Author: derrabus

CHANGELOG.md

@@ -5,7 +5,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
 ## Unreleased
- - ...
+ - Fix deprecations triggered by Symfony 5.3 (#490)
 
 ## 3.5.4
  - CLI commands registration policy changed to lazy load (#373, thanks to @kefzce)

phpstan-baseline.neon

@@ -0,0 +1,21 @@
+<?php
+
+namespace Sentry\SentryBundle\EventListener;
+
+use Symfony\Component\HttpKernel\Event\KernelEvent;
+
+/**
+ * Provides forward compatibility with newer Symfony versions.
+ *
+ * @internal
+ */
+trait KernelEventForwardCompatibilityTrait
+{
+    private function isMainRequest(KernelEvent $event): bool
+    {
+        return method_exists($event, 'isMainRequest')
+            ? $event->isMainRequest()
+            : $event->isMasterRequest()
+        ;
+    }
+}

src/EventListener/KernelEventForwardCompatibilityTrait.php

@@ -35,6 +35,8 @@ class_alias(FilterControllerEvent::class, RequestListenerControllerEvent::class)
  */
 final class RequestListener
 {
+    use KernelEventForwardCompatibilityTrait;
+
     /** @var HubInterface */
     private $hub;
 
@@ -61,7 +63,7 @@ public function __construct(
      */
     public function onKernelRequest(RequestListenerRequestEvent $event): void
     {
-        if (! $event->isMasterRequest()) {
+        if (! $this->isMainRequest($event)) {
             return;
         }
 
@@ -96,7 +98,7 @@ public function onKernelRequest(RequestListenerRequestEvent $event): void
 
     public function onKernelController(RequestListenerControllerEvent $event): void
     {
-        if (! $event->isMasterRequest()) {
+        if (! $this->isMainRequest($event)) {
             return;
         }
 
@@ -120,7 +122,7 @@ private function getUserData($user): array
     {
         if ($user instanceof UserInterface) {
             return [
-                'username' => $user->getUsername(),
+                'username' => method_exists($user, 'getUserIdentifier') ? $user->getUserIdentifier() : $user->getUsername(),
             ];
         }
 

src/EventListener/RequestListener.php

@@ -20,14 +20,16 @@ class_alias(GetResponseEvent::class, SubRequestListenerRequestEvent::class);
 
 final class SubRequestListener
 {
+    use KernelEventForwardCompatibilityTrait;
+
     /**
      * Pushes a new {@see Scope} for each SubRequest
      *
      * @param SubRequestListenerRequestEvent $event
      */
     public function onKernelRequest(SubRequestListenerRequestEvent $event): void
     {
-        if ($event->isMasterRequest()) {
+        if ($this->isMainRequest($event)) {
             return;
         }
 
@@ -41,7 +43,7 @@ public function onKernelRequest(SubRequestListenerRequestEvent $event): void
      */
     public function onKernelFinishRequest(FinishRequestEvent $event): void
     {
-        if ($event->isMasterRequest()) {
+        if ($this->isMainRequest($event)) {
             return;
         }
 

src/EventListener/SubRequestListener.php

@@ -353,7 +353,12 @@ public function getSalt()
         return null;
     }
 
-    public function getUsername()
+    public function getUsername(): string
+    {
+        return $this->getUserIdentifier();
+    }
+
+    public function getUserIdentifier(): string
     {
         return $this->username;
     }