Fix static analysis due to Symfony 5.3 release (#518)

* Fix static analysis due to Symfony 5.3 release

* Add changelog entry

* Add tests

* Amend changelog entry

Author: Jean85

CHANGELOG.md

@@ -2,9 +2,11 @@
 
 ## Unreleased
 
+- Fix extraction of the username of the logged-in user in Symfony 5.3 (#518)
+
 ## 4.1.3 (2021-05-31)
 
--  Fix missing require of the `symfony/cache-contracts` package (#506)
+- Fix missing require of the `symfony/cache-contracts` package (#506)
 
 ## 4.1.2 (2021-05-17)
 

phpstan.neon

@@ -10,6 +10,7 @@ parameters:
         - tests/End2End/App
     dynamicConstantNames:
         - Symfony\Component\HttpKernel\Kernel::VERSION
+        - Symfony\Component\HttpKernel\Kernel::VERSION_ID
         - Doctrine\DBAL\Version::VERSION
     stubFiles:
         - tests/Stubs/Profile.phpstub

src/EventListener/RequestListener.php

@@ -104,7 +104,13 @@ public function handleKernelControllerEvent(RequestListenerControllerEvent $even
     private function getUsername($user): ?string
     {
         if ($user instanceof UserInterface) {
-            return method_exists($user, 'getUserIdentifier') ? $user->getUserIdentifier() : $user->getUsername();
+            if (method_exists($user, 'getUserIdentifier')) {
+                return $user->getUserIdentifier();
+            }
+
+            if (method_exists($user, 'getUsername')) {
+                return $user->getUsername();
+            }
         }
 
         if (\is_string($user)) {

tests/EventListener/RequestListenerTest.php

@@ -394,52 +394,28 @@ public function getCredentials()
                 HttpKernelInterface::MASTER_REQUEST
             ),
             $this->getMockedClientWithOptions(new Options(['send_default_pii' => true])),
-            new class() extends AbstractToken {
-                public function __construct()
+            new MockToken(new class() extends MockUser {
+                public function getUsername(): string
                 {
-                    parent::__construct();
-
-                    $this->setAuthenticated(true);
-                    $this->setUser(new class() implements UserInterface {
-                        public function getRoles()
-                        {
-                            return [];
-                        }
-
-                        public function getPassword()
-                        {
-                            return null;
-                        }
-
-                        public function getSalt()
-                        {
-                            return null;
-                        }
-
-                        public function getUsername(): string
-                        {
-                            return $this->getUserIdentifier();
-                        }
-
-                        public function getUserIdentifier(): string
-                        {
-                            return 'foo_user';
-                        }
-
-                        public function eraseCredentials(): void
-                        {
-                        }
-                    });
+                    return $this->getUserIdentifier();
                 }
-
-                public function getCredentials()
-                {
-                    return null;
-                }
-            },
+            }),
             new UserDataBag(null, null, '127.0.0.1', 'foo_user'),
         ];
 
+        if (Kernel::VERSION_ID >= 503000) {
+            yield 'token.authenticated = TRUE && token.user INSTANCEOF UserInterface WITHOUT getUsername' => [
+                new RequestEvent(
+                    $this->createMock(HttpKernelInterface::class),
+                    new Request([], [], [], [], [], ['REMOTE_ADDR' => '127.0.0.1']),
+                    HttpKernelInterface::MASTER_REQUEST
+                ),
+                $this->getMockedClientWithOptions(new Options(['send_default_pii' => true])),
+                new MockToken(new class() extends MockUser {}),
+                new UserDataBag(null, null, '127.0.0.1', 'foo_user'),
+            ];
+        }
+
         yield 'token.authenticated = TRUE && token.user INSTANCEOF object && __toString() method EXISTS' => [
             new RequestEvent(
                 $this->createMock(HttpKernelInterface::class),
@@ -594,3 +570,46 @@ private function getMockedClientWithOptions(Options $options): ClientInterface
         return $client;
     }
 }
+
+class MockToken extends AbstractToken
+{
+    public function __construct(UserInterface $user)
+    {
+        parent::__construct();
+
+        $this->setAuthenticated(true);
+        $this->setUser($user);
+    }
+
+    public function getCredentials(): ?string
+    {
+        return null;
+    }
+}
+
+abstract class MockUser implements UserInterface
+{
+    public function getUserIdentifier(): string
+    {
+        return 'foo_user';
+    }
+
+    public function getRoles()
+    {
+        return [];
+    }
+
+    public function getPassword()
+    {
+        return 'fake-pw';
+    }
+
+    public function getSalt()
+    {
+        return 'fake-salt';
+    }
+
+    public function eraseCredentials(): void
+    {
+    }
+}