fix(token): fix getUsername calls only if there is no getUserIdentifi…

…er method available (#71) Co-authored-by: Emmanuel Drouet <[email protected]>
BedrockStreaming · Aug 9, 2022 · c406a5b · c406a5b
1 parent 194de71
commit c406a5b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/src/M6Web/Bundle/LogBridgeBundle/Formatter/DefaultFormatter.php b/src/M6Web/Bundle/LogBridgeBundle/Formatter/DefaultFormatter.php
@@ -127,7 +127,8 @@ protected function getUsername(): string
         }
 
         // compatibility Symfony < 6
-        if (method_exists($token, 'getUsername')) {
+        if (!method_exists($token, 'getUserIdentifier') &&
+            method_exists($token, 'getUsername')) {
             return $token->getUsername();
         }
 

diff --git a/src/M6Web/Bundle/LogBridgeBundle/Tests/Units/Formatter/DefaultFormatter.php b/src/M6Web/Bundle/LogBridgeBundle/Tests/Units/Formatter/DefaultFormatter.php
@@ -31,7 +31,8 @@ private function getUser(): UserInterface
     private function getMockedToken()
     {
         $usernameMethod = 'getUserIdentifier';
-        if (method_exists(\Symfony\Component\Security\Core\Authentication\Token\TokenInterface::class, 'getUsername')) {
+        if (!method_exists(\Symfony\Component\Security\Core\Authentication\Token\TokenInterface::class, $usernameMethod) &&
+            method_exists(\Symfony\Component\Security\Core\Authentication\Token\TokenInterface::class, 'getUsername')) {
             // compatibility Symfony < 6
             $usernameMethod = 'getUsername';
         }

diff --git a/src/M6Web/Bundle/LogBridgeBundle/Tests/Units/Formatter/ExceptionFormatter.php b/src/M6Web/Bundle/LogBridgeBundle/Tests/Units/Formatter/ExceptionFormatter.php
@@ -38,7 +38,8 @@ private function getUser(): UserInterface
     private function getMockedToken()
     {
         $usernameMethod = 'getUserIdentifier';
-        if (method_exists(\Symfony\Component\Security\Core\Authentication\Token\TokenInterface::class, 'getUsername')) {
+        if (!method_exists(\Symfony\Component\Security\Core\Authentication\Token\TokenInterface::class, $usernameMethod) &&
+            method_exists(\Symfony\Component\Security\Core\Authentication\Token\TokenInterface::class, 'getUsername')) {
             // compatibility Symfony < 6
             $usernameMethod = 'getUsername';
         }