avoid empty impersonator_username

symfony · gharlan · Aug 29, 2017 · Aug 30, 2017 · Aug 31, 2017 · Aug 31, 2017
commit 7de58d4f26cbdd37d0d8b609175a1a7e116586d7
diff --git a/src/Symfony/Component/Security/Http/Firewall/ContextListener.php b/src/Symfony/Component/Security/Http/Firewall/ContextListener.php
@@ -173,19 +173,16 @@ protected function refreshUser(TokenInterface $token)
                $token->setUser($refreshedUser);

                if (null !== $this->logger) {
-                    $impersonatorUsername = null;
+                    $context = array('provider' => get_class($provider), 'username' => $refreshedUser->getUsername());
+
                    foreach ($token->getRoles() as $role) {
                        if ($role instanceof SwitchUserRole) {
-                            $impersonatorUsername = $role->getSource()->getUsername();
+                            $context['impersonator_username'] = $role->getSource()->getUsername();
                            break;
                        }
                    }

-                    $this->logger->debug('User was reloaded from a user provider.', array(
-                        'provider' => get_class($provider),
-                        'username' => $refreshedUser->getUsername(),
-                        'impersonator_username' => $impersonatorUsername,
-                    ));
+                    $this->logger->debug('User was reloaded from a user provider.', $context);
                }

                return $token;