NullLogger added

Author: Spomky

Security/Http/Firewall/TwoFactorListener.php

@@ -5,6 +5,7 @@
 namespace Scheb\TwoFactorBundle\Security\Http\Firewall;
 
 use Psr\Log\LoggerInterface;
+use Psr\Log\NullLogger;
 use Scheb\TwoFactorBundle\DependencyInjection\Factory\Security\TwoFactorFactory;
 use Scheb\TwoFactorBundle\Security\Authentication\Token\TwoFactorTokenFactoryInterface;
 use Scheb\TwoFactorBundle\Security\Authentication\Token\TwoFactorTokenInterface;
@@ -140,7 +141,7 @@ public function __construct(
         $this->twoFactorAccessDecider = $twoFactorAccessDecider;
         $this->eventDispatcher = $eventDispatcher;
         $this->twoFactorTokenFactory = $twoFactorTokenFactory;
-        $this->logger = $logger;
+        $this->logger = $logger === null ? new NullLogger() : $logger;
         $this->trustedDeviceManager = $trustedDeviceManager;
     }
 
@@ -215,19 +216,15 @@ private function attemptAuthentication(Request $request, TwoFactorTokenInterface
 
     private function onFailure(Request $request, AuthenticationException $failed): Response
     {
-        if ($this->logger) {
-            $this->logger->info('Two-factor authentication request failed.', ['exception' => $failed]);
-        }
+        $this->logger->info('Two-factor authentication request failed.', ['exception' => $failed]);
         $this->dispatchTwoFactorAuthenticationEvent(TwoFactorAuthenticationEvents::FAILURE, $request, $this->tokenStorage->getToken());
 
         return $this->failureHandler->onAuthenticationFailure($request, $failed);
     }
 
     private function onSuccess(Request $request, TokenInterface $token, TwoFactorTokenInterface $previousTwoFactorToken): Response
     {
-        if ($this->logger) {
-            $this->logger->info('User has been two-factor authenticated successfully.', ['username' => $token->getUsername()]);
-        }
+        $this->logger->info('User has been two-factor authenticated successfully.', ['username' => $token->getUsername()]);
         $this->tokenStorage->setToken($token);
         $this->dispatchTwoFactorAuthenticationEvent(TwoFactorAuthenticationEvents::SUCCESS, $request, $token);
 

Security/TwoFactor/Provider/TwoFactorProviderPreparationListener.php

@@ -5,6 +5,7 @@
 namespace Scheb\TwoFactorBundle\Security\TwoFactor\Provider;
 
 use Psr\Log\LoggerInterface;
+use Psr\Log\NullLogger;
 use Scheb\TwoFactorBundle\Security\Authentication\Token\TwoFactorTokenInterface;
 use Scheb\TwoFactorBundle\Security\TwoFactor\Event\TwoFactorAuthenticationEvent;
 use Symfony\Component\HttpKernel\Event\FinishRequestEvent;
@@ -29,7 +30,7 @@ class TwoFactorProviderPreparationListener
     private $twoFactorToken;
 
     /**
-     * @var LoggerInterface|null
+     * @var LoggerInterface
      */
     private $logger;
 
@@ -58,7 +59,7 @@ public function __construct(
     ) {
         $this->providerRegistry = $providerRegistry;
         $this->preparationRecorder = $preparationRecorder;
-        $this->logger = $logger;
+        $this->logger = $logger === null ? new NullLogger() : $logger;
         $this->firewallName = $firewallName;
         $this->prepareOnLogin = $prepareOnLogin;
         $this->prepareOnAccessDenied = $prepareOnAccessDenied;
@@ -105,18 +106,14 @@ public function onKernelFinishRequest(FinishRequestEvent $event): void
 
         try {
             if ($this->preparationRecorder->isProviderPrepared($firewallName, $providerName)) {
-                if ($this->logger) {
-                    $this->logger->info(sprintf('Two-factor provider "%s" was already prepared.', $providerName));
-                }
+                $this->logger->info(sprintf('Two-factor provider "%s" was already prepared.', $providerName));
 
                 return;
             }
             $user = $this->twoFactorToken->getUser();
             $this->providerRegistry->getProvider($providerName)->prepareAuthentication($user);
             $this->preparationRecorder->recordProviderIsPrepared($firewallName, $providerName);
-            if ($this->logger) {
-                $this->logger->info(sprintf('Two-factor provider "%s" prepared.', $providerName));
-            }
+            $this->logger->info(sprintf('Two-factor provider "%s" prepared.', $providerName));
         } finally {
             $this->preparationRecorder->saveSession();
         }