Various improvements to the tests

Author: ste93cry

phpstan-baseline.neon

@@ -20,6 +20,11 @@ parameters:
 			count: 1
 			path: src/EventListener/ErrorListener.php
 
+		-
+			message: "#^Method Symfony\\\\Component\\\\Security\\\\Core\\\\Authentication\\\\Token\\\\TokenInterface\\:\\:isAuthenticated\\(\\) invoked with 1 parameter, 0 required\\.$#"
+			count: 1
+			path: src/EventListener/RequestListener.php
+
 		-
 			message: "#^Method Sentry\\\\SentryBundle\\\\Tracing\\\\Doctrine\\\\DBAL\\\\TracingDriverConnection\\:\\:errorInfo\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
@@ -107,7 +112,7 @@ parameters:
 
 		-
 			message: "#^Instantiated class Symfony\\\\Component\\\\HttpKernel\\\\Event\\\\GetResponseEvent not found\\.$#"
-			count: 8
+			count: 9
 			path: tests/EventListener/RequestListenerTest.php
 
 		-

psalm-baseline.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="4.11.1@e33492398bd4e5e2ab60e331d445979bd83feecd">
+<files psalm-version="4.12.0@e42bc4a23f67acba28a23bb09c348e2ff38a1d87">
   <file src="src/DependencyInjection/SentryExtension.php">
     <UndefinedClass occurrences="1">
       <code>FatalErrorException</code>
@@ -13,6 +13,24 @@
       <code>public function __construct(HubInterface $hub, bool $captureErrors = true)</code>
     </MethodSignatureMismatch>
   </file>
+  <file src="src/EventListener/ErrorListener.php">
+    <RedundantCondition occurrences="1">
+      <code>$event instanceof ExceptionEvent</code>
+    </RedundantCondition>
+    <UndefinedMethod occurrences="1">
+      <code>getException</code>
+    </UndefinedMethod>
+  </file>
+  <file src="src/EventListener/RequestListener.php">
+    <TooManyArguments occurrences="1">
+      <code>isAuthenticated</code>
+    </TooManyArguments>
+  </file>
+  <file src="src/Tracing/Cache/TraceableCacheAdapterTrait.php">
+    <ImplementedReturnTypeMismatch occurrences="1">
+      <code>iterable</code>
+    </ImplementedReturnTypeMismatch>
+  </file>
   <file src="src/Tracing/Doctrine/DBAL/TracingDriverForV2.php">
     <UndefinedClass occurrences="1">
       <code>ExceptionConverterDriver</code>

src/EventListener/ErrorListener.php

@@ -34,7 +34,6 @@ public function __construct(HubInterface $hub)
      */
     public function handleExceptionEvent(ErrorListenerExceptionEvent $event): void
     {
-        /** @psalm-suppress RedundantCondition */
         if ($event instanceof ExceptionEvent) {
             $this->hub->captureException($event->getThrowable());
         } else {

src/EventListener/RequestListener.php

@@ -8,6 +8,7 @@
 use Sentry\State\Scope;
 use Sentry\UserDataBag;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
+use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 use Symfony\Component\Security\Core\User\UserInterface;
 
 /**
@@ -67,10 +68,7 @@ public function handleKernelRequestEvent(RequestListenerRequestEvent $event): vo
             $token = $this->tokenStorage->getToken();
         }
 
-        if (null !== $token
-            && (!method_exists($token, 'isAuthenticated') || $token->isAuthenticated(false))
-            && null !== $token->getUser()
-        ) {
+        if ($this->isTokenAuthenticated($token)) {
             $userData->setUsername($this->getUsername($token->getUser()));
         }
 
@@ -127,4 +125,17 @@ private function getUsername($user): ?string
 
         return null;
     }
+
+    private function isTokenAuthenticated(?TokenInterface $token): bool
+    {
+        if (null === $token) {
+            return false;
+        }
+
+        if (method_exists($token, 'isAuthenticated') && !$token->isAuthenticated(false)) {
+            return false;
+        }
+
+        return null !== $token->getUser();
+    }
 }