From 887996377b12df2102118a6ac0ecd32ec3dd5536 Mon Sep 17 00:00:00 2001 From: "maxime.steinhausser" Date: Mon, 18 May 2015 17:48:38 +0200 Subject: [PATCH] Use NullLogger when available --- .../Bridge/Propel1/Logger/PropelLogger.php | 31 ++++---------- .../Routing/DelegatingLoader.php | 3 +- .../FrameworkBundle/Templating/Debugger.php | 7 ++-- .../Controller/ControllerResolver.php | 7 ++-- .../Debug/TraceableEventDispatcher.php | 13 +++--- .../EventListener/ErrorsLoggerListener.php | 7 ++-- .../EventListener/ExceptionListener.php | 20 +++++---- .../EventListener/RouterListener.php | 7 ++-- .../HttpKernel/Profiler/Profiler.php | 5 ++- .../Component/Security/Acl/Voter/AclVoter.php | 31 ++++---------- .../Security/Core/Util/SecureRandom.php | 11 ++--- .../DefaultAuthenticationFailureHandler.php | 11 ++--- .../DigestAuthenticationEntryPoint.php | 7 ++-- .../AbstractAuthenticationListener.php | 11 ++--- .../AbstractPreAuthenticatedListener.php | 21 +++------- .../AnonymousAuthenticationListener.php | 8 ++-- .../Firewall/BasicAuthenticationListener.php | 11 ++--- .../Http/Firewall/ChannelListener.php | 11 ++--- .../Http/Firewall/ContextListener.php | 12 ++---- .../Firewall/DigestAuthenticationListener.php | 19 +++------ .../Http/Firewall/ExceptionListener.php | 27 ++++-------- .../Http/Firewall/RememberMeListener.php | 20 ++++----- .../Http/Firewall/SwitchUserListener.php | 7 ++-- .../RememberMe/AbstractRememberMeServices.php | 42 ++++++------------- 24 files changed, 126 insertions(+), 223 deletions(-) diff --git a/src/Symfony/Bridge/Propel1/Logger/PropelLogger.php b/src/Symfony/Bridge/Propel1/Logger/PropelLogger.php index b651935afd0e8..6386b0d918742 100644 --- a/src/Symfony/Bridge/Propel1/Logger/PropelLogger.php +++ b/src/Symfony/Bridge/Propel1/Logger/PropelLogger.php @@ -11,6 +11,7 @@ namespace Symfony\Bridge\Propel1\Logger; +use Psr\Log\NullLogger; use Symfony\Component\Stopwatch\Stopwatch; use Psr\Log\LoggerInterface; @@ -47,7 +48,7 @@ class PropelLogger */ public function __construct(LoggerInterface $logger = null, Stopwatch $stopwatch = null) { - $this->logger = $logger; + $this->logger = $logger ?: new NullLogger(); $this->queries = array(); $this->stopwatch = $stopwatch; $this->isPrepared = false; @@ -60,9 +61,7 @@ public function __construct(LoggerInterface $logger = null, Stopwatch $stopwatch */ public function alert($message) { - if (null !== $this->logger) { - $this->logger->alert($message); - } + $this->logger->alert($message); } /** @@ -72,9 +71,7 @@ public function alert($message) */ public function crit($message) { - if (null !== $this->logger) { - $this->logger->critical($message); - } + $this->logger->critical($message); } /** @@ -84,9 +81,7 @@ public function crit($message) */ public function err($message) { - if (null !== $this->logger) { - $this->logger->error($message); - } + $this->logger->error($message); } /** @@ -96,9 +91,7 @@ public function err($message) */ public function warning($message) { - if (null !== $this->logger) { - $this->logger->warning($message); - } + $this->logger->warning($message); } /** @@ -108,9 +101,7 @@ public function warning($message) */ public function notice($message) { - if (null !== $this->logger) { - $this->logger->notice($message); - } + $this->logger->notice($message); } /** @@ -120,9 +111,7 @@ public function notice($message) */ public function info($message) { - if (null !== $this->logger) { - $this->logger->info($message); - } + $this->logger->info($message); } /** @@ -152,9 +141,7 @@ public function debug($message) if ($add) { $this->queries[] = $message; - if (null !== $this->logger) { - $this->logger->debug($message); - } + $this->logger->debug($message); } } diff --git a/src/Symfony/Bundle/FrameworkBundle/Routing/DelegatingLoader.php b/src/Symfony/Bundle/FrameworkBundle/Routing/DelegatingLoader.php index b37bee83d401c..7608cd0eec913 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Routing/DelegatingLoader.php +++ b/src/Symfony/Bundle/FrameworkBundle/Routing/DelegatingLoader.php @@ -11,6 +11,7 @@ namespace Symfony\Bundle\FrameworkBundle\Routing; +use Psr\Log\NullLogger; use Symfony\Bundle\FrameworkBundle\Controller\ControllerNameParser; use Symfony\Component\Config\Exception\FileLoaderLoadException; use Symfony\Component\Config\Loader\DelegatingLoader as BaseDelegatingLoader; @@ -41,7 +42,7 @@ class DelegatingLoader extends BaseDelegatingLoader public function __construct(ControllerNameParser $parser, LoggerInterface $logger = null, LoaderResolverInterface $resolver) { $this->parser = $parser; - $this->logger = $logger; + $this->logger = $logger ?: new NullLogger(); parent::__construct($resolver); } diff --git a/src/Symfony/Bundle/FrameworkBundle/Templating/Debugger.php b/src/Symfony/Bundle/FrameworkBundle/Templating/Debugger.php index 19a59381d0c56..e6a9c9a508769 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Templating/Debugger.php +++ b/src/Symfony/Bundle/FrameworkBundle/Templating/Debugger.php @@ -11,6 +11,7 @@ namespace Symfony\Bundle\FrameworkBundle\Templating; +use Psr\Log\NullLogger; use Symfony\Component\Templating\DebuggerInterface; use Psr\Log\LoggerInterface; @@ -30,7 +31,7 @@ class Debugger implements DebuggerInterface */ public function __construct(LoggerInterface $logger = null) { - $this->logger = $logger; + $this->logger = $logger ?: new NullLogger(); } /** @@ -40,8 +41,6 @@ public function __construct(LoggerInterface $logger = null) */ public function log($message) { - if (null !== $this->logger) { - $this->logger->debug($message); - } + $this->logger->debug($message); } } diff --git a/src/Symfony/Component/HttpKernel/Controller/ControllerResolver.php b/src/Symfony/Component/HttpKernel/Controller/ControllerResolver.php index 3ab8b1ce117a7..383b49d86b0ad 100644 --- a/src/Symfony/Component/HttpKernel/Controller/ControllerResolver.php +++ b/src/Symfony/Component/HttpKernel/Controller/ControllerResolver.php @@ -12,6 +12,7 @@ namespace Symfony\Component\HttpKernel\Controller; use Psr\Log\LoggerInterface; +use Psr\Log\NullLogger; use Symfony\Component\HttpFoundation\Request; /** @@ -36,7 +37,7 @@ class ControllerResolver implements ControllerResolverInterface */ public function __construct(LoggerInterface $logger = null) { - $this->logger = $logger; + $this->logger = $logger ?: new NullLogger(); } /** @@ -57,9 +58,7 @@ public function __construct(LoggerInterface $logger = null) public function getController(Request $request) { if (!$controller = $request->attributes->get('_controller')) { - if (null !== $this->logger) { - $this->logger->warning('Unable to look for the controller as the "_controller" parameter is missing'); - } + $this->logger->warning('Unable to look for the controller as the "_controller" parameter is missing'); return false; } diff --git a/src/Symfony/Component/HttpKernel/Debug/TraceableEventDispatcher.php b/src/Symfony/Component/HttpKernel/Debug/TraceableEventDispatcher.php index 81e17da627eb7..ccce3ee2686b1 100644 --- a/src/Symfony/Component/HttpKernel/Debug/TraceableEventDispatcher.php +++ b/src/Symfony/Component/HttpKernel/Debug/TraceableEventDispatcher.php @@ -11,6 +11,7 @@ namespace Symfony\Component\HttpKernel\Debug; +use Psr\Log\NullLogger; use Symfony\Component\Stopwatch\Stopwatch; use Symfony\Component\HttpKernel\KernelEvents; use Psr\Log\LoggerInterface; @@ -51,7 +52,7 @@ public function __construct(EventDispatcherInterface $dispatcher, Stopwatch $sto { $this->dispatcher = $dispatcher; $this->stopwatch = $stopwatch; - $this->logger = $logger; + $this->logger = $logger ?: new NullLogger(); $this->called = array(); $this->wrappedListeners = array(); $this->firstCalledEvent = array(); @@ -175,9 +176,7 @@ public function getNotCalledListeners() try { $allListeners = $this->getListeners(); } catch (\Exception $e) { - if (null !== $this->logger) { - $this->logger->info(sprintf('An exception was thrown while getting the uncalled listeners (%s)', $e->getMessage()), array('exception' => $e)); - } + $this->logger->info(sprintf('An exception was thrown while getting the uncalled listeners (%s)', $e->getMessage()), array('exception' => $e)); // unable to retrieve the uncalled listeners return array(); @@ -218,7 +217,7 @@ public function __call($method, $arguments) */ public function logSkippedListeners($eventName, $eventId, Event $event, $listener) { - if (null === $this->logger) { + if ($this->logger instanceof NullLogger) { return; } @@ -261,9 +260,7 @@ public function preListenerCall($eventName, $eventId, $listener) $info = $this->getListenerInfo($listener, $eventId, $eventName); - if (null !== $this->logger) { - $this->logger->debug(sprintf('Notified event "%s" to listener "%s".', $eventName, $info['pretty'])); - } + $this->logger->debug(sprintf('Notified event "%s" to listener "%s".', $eventName, $info['pretty'])); $this->called[$eventName.'.'.$info['pretty']] = $info; diff --git a/src/Symfony/Component/HttpKernel/EventListener/ErrorsLoggerListener.php b/src/Symfony/Component/HttpKernel/EventListener/ErrorsLoggerListener.php index ec6b7f9328877..62db98dcaf31d 100644 --- a/src/Symfony/Component/HttpKernel/EventListener/ErrorsLoggerListener.php +++ b/src/Symfony/Component/HttpKernel/EventListener/ErrorsLoggerListener.php @@ -12,6 +12,7 @@ namespace Symfony\Component\HttpKernel\EventListener; use Psr\Log\LoggerInterface; +use Psr\Log\NullLogger; use Symfony\Component\Debug\ErrorHandler; use Symfony\Component\EventDispatcher\EventSubscriberInterface; use Symfony\Component\HttpKernel\KernelEvents; @@ -31,14 +32,12 @@ class ErrorsLoggerListener implements EventSubscriberInterface public function __construct($channel, LoggerInterface $logger = null) { $this->channel = $channel; - $this->logger = $logger; + $this->logger = $logger ?: new NullLogger(); } public function injectLogger() { - if (null !== $this->logger) { - ErrorHandler::setLogger($this->logger, $this->channel); - } + ErrorHandler::setLogger($this->logger, $this->channel); } public static function getSubscribedEvents() diff --git a/src/Symfony/Component/HttpKernel/EventListener/ExceptionListener.php b/src/Symfony/Component/HttpKernel/EventListener/ExceptionListener.php index 9860f3550209c..73a115afdf632 100644 --- a/src/Symfony/Component/HttpKernel/EventListener/ExceptionListener.php +++ b/src/Symfony/Component/HttpKernel/EventListener/ExceptionListener.php @@ -12,6 +12,7 @@ namespace Symfony\Component\HttpKernel\EventListener; use Psr\Log\LoggerInterface; +use Psr\Log\NullLogger; use Symfony\Component\Debug\Exception\FlattenException; use Symfony\Component\HttpKernel\Log\DebugLoggerInterface; use Symfony\Component\HttpKernel\Event\GetResponseForExceptionEvent; @@ -33,7 +34,7 @@ class ExceptionListener implements EventSubscriberInterface public function __construct($controller, LoggerInterface $logger = null) { $this->controller = $controller; - $this->logger = $logger; + $this->logger = $logger ?: new NullLogger(); } public function onKernelException(GetResponseForExceptionEvent $event) @@ -97,14 +98,17 @@ protected function logException(\Exception $exception, $message, $original = tru { $isCritical = !$exception instanceof HttpExceptionInterface || $exception->getStatusCode() >= 500; $context = array('exception' => $exception); - if (null !== $this->logger) { - if ($isCritical) { - $this->logger->critical($message, $context); - } else { - $this->logger->error($message, $context); - } - } elseif (!$original || $isCritical) { + + if ($this->logger instanceof NullLogger && (!$original || $isCritical)) { error_log($message); + + return; + } + + if ($isCritical) { + $this->logger->critical($message, $context); + } else { + $this->logger->error($message, $context); } } } diff --git a/src/Symfony/Component/HttpKernel/EventListener/RouterListener.php b/src/Symfony/Component/HttpKernel/EventListener/RouterListener.php index 2e9cb7b6bb4ed..9bd0d9095f149 100644 --- a/src/Symfony/Component/HttpKernel/EventListener/RouterListener.php +++ b/src/Symfony/Component/HttpKernel/EventListener/RouterListener.php @@ -12,6 +12,7 @@ namespace Symfony\Component\HttpKernel\EventListener; use Psr\Log\LoggerInterface; +use Psr\Log\NullLogger; use Symfony\Component\HttpKernel\Event\GetResponseEvent; use Symfony\Component\HttpKernel\KernelEvents; use Symfony\Component\HttpKernel\Exception\MethodNotAllowedHttpException; @@ -58,7 +59,7 @@ public function __construct($matcher, RequestContext $context = null, LoggerInte $this->matcher = $matcher; $this->context = $context ?: $matcher->getContext(); - $this->logger = $logger; + $this->logger = $logger ?: new NullLogger(); } /** @@ -102,9 +103,7 @@ public function onKernelRequest(GetResponseEvent $event) $parameters = $this->matcher->match($request->getPathInfo()); } - if (null !== $this->logger) { - $this->logger->info(sprintf('Matched route "%s" (parameters: %s)', $parameters['_route'], $this->parametersToString($parameters))); - } + $this->logger->info(sprintf('Matched route "%s" (parameters: %s)', $parameters['_route'], $this->parametersToString($parameters))); $request->attributes->add($parameters); unset($parameters['_route'], $parameters['_controller']); diff --git a/src/Symfony/Component/HttpKernel/Profiler/Profiler.php b/src/Symfony/Component/HttpKernel/Profiler/Profiler.php index fc539bbb12871..2cd50f4f57390 100644 --- a/src/Symfony/Component/HttpKernel/Profiler/Profiler.php +++ b/src/Symfony/Component/HttpKernel/Profiler/Profiler.php @@ -11,6 +11,7 @@ namespace Symfony\Component\HttpKernel\Profiler; +use Psr\Log\NullLogger; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpKernel\DataCollector\DataCollectorInterface; @@ -52,7 +53,7 @@ class Profiler public function __construct(ProfilerStorageInterface $storage, LoggerInterface $logger = null) { $this->storage = $storage; - $this->logger = $logger; + $this->logger = $logger ?: new NullLogger(); } /** @@ -108,7 +109,7 @@ public function loadProfile($token) */ public function saveProfile(Profile $profile) { - if (!($ret = $this->storage->write($profile)) && null !== $this->logger) { + if (!($ret = $this->storage->write($profile))) { $this->logger->warning('Unable to store the profiler information.'); } diff --git a/src/Symfony/Component/Security/Acl/Voter/AclVoter.php b/src/Symfony/Component/Security/Acl/Voter/AclVoter.php index 9657eedb8ddab..a7822ef03490f 100644 --- a/src/Symfony/Component/Security/Acl/Voter/AclVoter.php +++ b/src/Symfony/Component/Security/Acl/Voter/AclVoter.php @@ -12,6 +12,7 @@ namespace Symfony\Component\Security\Acl\Voter; use Psr\Log\LoggerInterface; +use Psr\Log\NullLogger; use Symfony\Component\Security\Acl\Exception\NoAceFoundException; use Symfony\Component\Security\Acl\Exception\AclNotFoundException; use Symfony\Component\Security\Acl\Model\AclProviderInterface; @@ -42,7 +43,7 @@ public function __construct(AclProviderInterface $aclProvider, ObjectIdentityRet $this->permissionMap = $permissionMap; $this->objectIdentityRetrievalStrategy = $oidRetrievalStrategy; $this->securityIdentityRetrievalStrategy = $sidRetrievalStrategy; - $this->logger = $logger; + $this->logger = $logger ?: new NullLogger(); $this->allowIfObjectIdentityUnavailable = $allowIfObjectIdentityUnavailable; } @@ -63,9 +64,7 @@ public function vote(TokenInterface $token, $object, array $attributes) } if (null === $object) { - if (null !== $this->logger) { - $this->logger->debug(sprintf('Object identity unavailable. Voting to %s', $this->allowIfObjectIdentityUnavailable ? 'grant access' : 'abstain')); - } + $this->logger->debug(sprintf('Object identity unavailable. Voting to %s', $this->allowIfObjectIdentityUnavailable ? 'grant access' : 'abstain')); return $this->allowIfObjectIdentityUnavailable ? self::ACCESS_GRANTED : self::ACCESS_ABSTAIN; } elseif ($object instanceof FieldVote) { @@ -78,9 +77,7 @@ public function vote(TokenInterface $token, $object, array $attributes) if ($object instanceof ObjectIdentityInterface) { $oid = $object; } elseif (null === $oid = $this->objectIdentityRetrievalStrategy->getObjectIdentity($object)) { - if (null !== $this->logger) { - $this->logger->debug(sprintf('Object identity unavailable. Voting to %s', $this->allowIfObjectIdentityUnavailable ? 'grant access' : 'abstain')); - } + $this->logger->debug(sprintf('Object identity unavailable. Voting to %s', $this->allowIfObjectIdentityUnavailable ? 'grant access' : 'abstain')); return $this->allowIfObjectIdentityUnavailable ? self::ACCESS_GRANTED : self::ACCESS_ABSTAIN; } @@ -95,34 +92,24 @@ public function vote(TokenInterface $token, $object, array $attributes) $acl = $this->aclProvider->findAcl($oid, $sids); if (null === $field && $acl->isGranted($masks, $sids, false)) { - if (null !== $this->logger) { - $this->logger->debug('ACL found, permission granted. Voting to grant access'); - } + $this->logger->debug('ACL found, permission granted. Voting to grant access'); return self::ACCESS_GRANTED; } elseif (null !== $field && $acl->isFieldGranted($field, $masks, $sids, false)) { - if (null !== $this->logger) { - $this->logger->debug('ACL found, permission granted. Voting to grant access'); - } + $this->logger->debug('ACL found, permission granted. Voting to grant access'); return self::ACCESS_GRANTED; } - if (null !== $this->logger) { - $this->logger->debug('ACL found, insufficient permissions. Voting to deny access.'); - } + $this->logger->debug('ACL found, insufficient permissions. Voting to deny access.'); return self::ACCESS_DENIED; } catch (AclNotFoundException $noAcl) { - if (null !== $this->logger) { - $this->logger->debug('No ACL found for the object identity. Voting to deny access.'); - } + $this->logger->debug('No ACL found for the object identity. Voting to deny access.'); return self::ACCESS_DENIED; } catch (NoAceFoundException $noAce) { - if (null !== $this->logger) { - $this->logger->debug('ACL found, no ACE applicable. Voting to deny access.'); - } + $this->logger->debug('ACL found, no ACE applicable. Voting to deny access.'); return self::ACCESS_DENIED; } diff --git a/src/Symfony/Component/Security/Core/Util/SecureRandom.php b/src/Symfony/Component/Security/Core/Util/SecureRandom.php index c0924df61f1f0..49090a2be30b7 100644 --- a/src/Symfony/Component/Security/Core/Util/SecureRandom.php +++ b/src/Symfony/Component/Security/Core/Util/SecureRandom.php @@ -12,6 +12,7 @@ namespace Symfony\Component\Security\Core\Util; use Psr\Log\LoggerInterface; +use Psr\Log\NullLogger; /** * A secure random number generator implementation. @@ -40,15 +41,13 @@ final class SecureRandom implements SecureRandomInterface public function __construct($seedFile = null, LoggerInterface $logger = null) { $this->seedFile = $seedFile; - $this->logger = $logger; + $this->logger = $logger ?: new NullLogger(); // determine whether to use OpenSSL if ('\\' === DIRECTORY_SEPARATOR && PHP_VERSION_ID < 50304) { $this->useOpenSsl = false; } elseif (!function_exists('openssl_random_pseudo_bytes')) { - if (null !== $this->logger) { - $this->logger->notice('It is recommended that you enable the "openssl" extension for random number generation.'); - } + $this->logger->notice('It is recommended that you enable the "openssl" extension for random number generation.'); $this->useOpenSsl = false; } else { $this->useOpenSsl = true; @@ -68,9 +67,7 @@ public function nextBytes($nbBytes) return $bytes; } - if (null !== $this->logger) { - $this->logger->info('OpenSSL did not produce a secure random number.'); - } + $this->logger->info('OpenSSL did not produce a secure random number.'); } // initialize seed diff --git a/src/Symfony/Component/Security/Http/Authentication/DefaultAuthenticationFailureHandler.php b/src/Symfony/Component/Security/Http/Authentication/DefaultAuthenticationFailureHandler.php index b3c5c4dac9290..e55796ee6e459 100644 --- a/src/Symfony/Component/Security/Http/Authentication/DefaultAuthenticationFailureHandler.php +++ b/src/Symfony/Component/Security/Http/Authentication/DefaultAuthenticationFailureHandler.php @@ -11,6 +11,7 @@ namespace Symfony\Component\Security\Http\Authentication; +use Psr\Log\NullLogger; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpKernel\HttpKernelInterface; use Psr\Log\LoggerInterface; @@ -47,7 +48,7 @@ public function __construct(HttpKernelInterface $httpKernel, HttpUtils $httpUtil { $this->httpKernel = $httpKernel; $this->httpUtils = $httpUtils; - $this->logger = $logger; + $this->logger = $logger ?: new NullLogger(); $this->options = array_merge(array( 'failure_path' => null, @@ -71,9 +72,7 @@ public function onAuthenticationFailure(Request $request, AuthenticationExceptio } if ($this->options['failure_forward']) { - if (null !== $this->logger) { - $this->logger->debug(sprintf('Forwarding to %s', $this->options['failure_path'])); - } + $this->logger->debug(sprintf('Forwarding to %s', $this->options['failure_path'])); $subRequest = $this->httpUtils->createRequest($request, $this->options['failure_path']); $subRequest->attributes->set(SecurityContextInterface::AUTHENTICATION_ERROR, $exception); @@ -81,9 +80,7 @@ public function onAuthenticationFailure(Request $request, AuthenticationExceptio return $this->httpKernel->handle($subRequest, HttpKernelInterface::SUB_REQUEST); } - if (null !== $this->logger) { - $this->logger->debug(sprintf('Redirecting to %s', $this->options['failure_path'])); - } + $this->logger->debug(sprintf('Redirecting to %s', $this->options['failure_path'])); $request->getSession()->set(SecurityContextInterface::AUTHENTICATION_ERROR, $exception); diff --git a/src/Symfony/Component/Security/Http/EntryPoint/DigestAuthenticationEntryPoint.php b/src/Symfony/Component/Security/Http/EntryPoint/DigestAuthenticationEntryPoint.php index 5a7aa1abeed7c..d56c0f6ddc034 100644 --- a/src/Symfony/Component/Security/Http/EntryPoint/DigestAuthenticationEntryPoint.php +++ b/src/Symfony/Component/Security/Http/EntryPoint/DigestAuthenticationEntryPoint.php @@ -11,6 +11,7 @@ namespace Symfony\Component\Security\Http\EntryPoint; +use Psr\Log\NullLogger; use Symfony\Component\Security\Core\Exception\AuthenticationException; use Symfony\Component\Security\Core\Exception\NonceExpiredException; use Symfony\Component\HttpFoundation\Response; @@ -34,7 +35,7 @@ public function __construct($realmName, $key, $nonceValiditySeconds = 300, Logge $this->realmName = $realmName; $this->key = $key; $this->nonceValiditySeconds = $nonceValiditySeconds; - $this->logger = $logger; + $this->logger = $logger ?: new NullLogger(); } /** @@ -53,9 +54,7 @@ public function start(Request $request, AuthenticationException $authException = $authenticateHeader .= ', stale="true"'; } - if (null !== $this->logger) { - $this->logger->debug(sprintf('WWW-Authenticate header sent to user agent: "%s"', $authenticateHeader)); - } + $this->logger->debug(sprintf('WWW-Authenticate header sent to user agent: "%s"', $authenticateHeader)); $response = new Response(); $response->headers->set('WWW-Authenticate', $authenticateHeader); diff --git a/src/Symfony/Component/Security/Http/Firewall/AbstractAuthenticationListener.php b/src/Symfony/Component/Security/Http/Firewall/AbstractAuthenticationListener.php index f71089fe475eb..2802884fc3c0e 100644 --- a/src/Symfony/Component/Security/Http/Firewall/AbstractAuthenticationListener.php +++ b/src/Symfony/Component/Security/Http/Firewall/AbstractAuthenticationListener.php @@ -11,6 +11,7 @@ namespace Symfony\Component\Security\Http\Firewall; +use Psr\Log\NullLogger; use Symfony\Component\Security\Http\Session\SessionAuthenticationStrategyInterface; use Symfony\Component\Security\Http\Authentication\AuthenticationFailureHandlerInterface; use Symfony\Component\Security\Http\Authentication\AuthenticationSuccessHandlerInterface; @@ -102,7 +103,7 @@ public function __construct(SecurityContextInterface $securityContext, Authentic 'failure_forward' => false, 'require_previous_session' => true, ), $options); - $this->logger = $logger; + $this->logger = $logger ?: new NullLogger(); $this->dispatcher = $dispatcher; $this->httpUtils = $httpUtils; } @@ -191,9 +192,7 @@ abstract protected function attemptAuthentication(Request $request); private function onFailure(GetResponseEvent $event, Request $request, AuthenticationException $failed) { - if (null !== $this->logger) { - $this->logger->info(sprintf('Authentication request failed: %s', $failed->getMessage())); - } + $this->logger->info(sprintf('Authentication request failed: %s', $failed->getMessage())); $token = $this->securityContext->getToken(); if ($token instanceof UsernamePasswordToken && $this->providerKey === $token->getProviderKey()) { @@ -211,9 +210,7 @@ private function onFailure(GetResponseEvent $event, Request $request, Authentica private function onSuccess(GetResponseEvent $event, Request $request, TokenInterface $token) { - if (null !== $this->logger) { - $this->logger->info(sprintf('User "%s" has been authenticated successfully', $token->getUsername())); - } + $this->logger->info(sprintf('User "%s" has been authenticated successfully', $token->getUsername())); $this->securityContext->setToken($token); diff --git a/src/Symfony/Component/Security/Http/Firewall/AbstractPreAuthenticatedListener.php b/src/Symfony/Component/Security/Http/Firewall/AbstractPreAuthenticatedListener.php index f040107ac1a73..c94b49b65a743 100644 --- a/src/Symfony/Component/Security/Http/Firewall/AbstractPreAuthenticatedListener.php +++ b/src/Symfony/Component/Security/Http/Firewall/AbstractPreAuthenticatedListener.php @@ -11,6 +11,7 @@ namespace Symfony\Component\Security\Http\Firewall; +use Psr\Log\NullLogger; use Symfony\Component\Security\Core\SecurityContextInterface; use Symfony\Component\Security\Core\Authentication\AuthenticationManagerInterface; use Symfony\Component\Security\Core\Authentication\Token\PreAuthenticatedToken; @@ -43,7 +44,7 @@ public function __construct(SecurityContextInterface $securityContext, Authentic $this->securityContext = $securityContext; $this->authenticationManager = $authenticationManager; $this->providerKey = $providerKey; - $this->logger = $logger; + $this->logger = $logger ?: new NullLogger(); $this->dispatcher = $dispatcher; } @@ -56,9 +57,7 @@ final public function handle(GetResponseEvent $event) { $request = $event->getRequest(); - if (null !== $this->logger) { - $this->logger->debug(sprintf('Checking secure context token: %s', $this->securityContext->getToken())); - } + $this->logger->debug(sprintf('Checking secure context token: %s', $this->securityContext->getToken())); try { list($user, $credentials) = $this->getPreAuthenticatedData($request); @@ -74,16 +73,11 @@ final public function handle(GetResponseEvent $event) } } - if (null !== $this->logger) { - $this->logger->debug(sprintf('Trying to pre-authenticate user "%s"', $user)); - } + $this->logger->debug(sprintf('Trying to pre-authenticate user "%s"', $user)); try { $token = $this->authenticationManager->authenticate(new PreAuthenticatedToken($user, $credentials, $this->providerKey)); - - if (null !== $this->logger) { - $this->logger->info(sprintf('Authentication success: %s', $token)); - } + $this->logger->info(sprintf('Authentication success: %s', $token)); $this->securityContext->setToken($token); if (null !== $this->dispatcher) { @@ -105,10 +99,7 @@ private function clearToken(AuthenticationException $exception) $token = $this->securityContext->getToken(); if ($token instanceof PreAuthenticatedToken && $this->providerKey === $token->getProviderKey()) { $this->securityContext->setToken(null); - - if (null !== $this->logger) { - $this->logger->info(sprintf('Cleared security context due to exception: %s', $exception->getMessage())); - } + $this->logger->info(sprintf('Cleared security context due to exception: %s', $exception->getMessage())); } } diff --git a/src/Symfony/Component/Security/Http/Firewall/AnonymousAuthenticationListener.php b/src/Symfony/Component/Security/Http/Firewall/AnonymousAuthenticationListener.php index 446dfecec7bc5..03849c0b4af67 100644 --- a/src/Symfony/Component/Security/Http/Firewall/AnonymousAuthenticationListener.php +++ b/src/Symfony/Component/Security/Http/Firewall/AnonymousAuthenticationListener.php @@ -11,6 +11,7 @@ namespace Symfony\Component\Security\Http\Firewall; +use Psr\Log\NullLogger; use Symfony\Component\Security\Core\SecurityContextInterface; use Psr\Log\LoggerInterface; use Symfony\Component\HttpKernel\Event\GetResponseEvent; @@ -32,7 +33,7 @@ public function __construct(SecurityContextInterface $context, $key, LoggerInter { $this->context = $context; $this->key = $key; - $this->logger = $logger; + $this->logger = $logger ?: new NullLogger(); } /** @@ -47,9 +48,6 @@ public function handle(GetResponseEvent $event) } $this->context->setToken(new AnonymousToken($this->key, 'anon.', array())); - - if (null !== $this->logger) { - $this->logger->info('Populated SecurityContext with an anonymous Token'); - } + $this->logger->info('Populated SecurityContext with an anonymous Token'); } } diff --git a/src/Symfony/Component/Security/Http/Firewall/BasicAuthenticationListener.php b/src/Symfony/Component/Security/Http/Firewall/BasicAuthenticationListener.php index bfc4abc83455f..f529c0086c6be 100644 --- a/src/Symfony/Component/Security/Http/Firewall/BasicAuthenticationListener.php +++ b/src/Symfony/Component/Security/Http/Firewall/BasicAuthenticationListener.php @@ -11,6 +11,7 @@ namespace Symfony\Component\Security\Http\Firewall; +use Psr\Log\NullLogger; use Symfony\Component\Security\Core\SecurityContextInterface; use Symfony\Component\Security\Core\Authentication\AuthenticationManagerInterface; use Symfony\Component\Security\Http\EntryPoint\AuthenticationEntryPointInterface; @@ -43,7 +44,7 @@ public function __construct(SecurityContextInterface $securityContext, Authentic $this->authenticationManager = $authenticationManager; $this->providerKey = $providerKey; $this->authenticationEntryPoint = $authenticationEntryPoint; - $this->logger = $logger; + $this->logger = $logger ?: new NullLogger(); $this->ignoreFailure = false; } @@ -66,9 +67,7 @@ public function handle(GetResponseEvent $event) } } - if (null !== $this->logger) { - $this->logger->info(sprintf('Basic Authentication Authorization header found for user "%s"', $username)); - } + $this->logger->info(sprintf('Basic Authentication Authorization header found for user "%s"', $username)); try { $token = $this->authenticationManager->authenticate(new UsernamePasswordToken($username, $request->headers->get('PHP_AUTH_PW'), $this->providerKey)); @@ -79,9 +78,7 @@ public function handle(GetResponseEvent $event) $this->securityContext->setToken(null); } - if (null !== $this->logger) { - $this->logger->info(sprintf('Authentication request failed for user "%s": %s', $username, $failed->getMessage())); - } + $this->logger->info(sprintf('Authentication request failed for user "%s": %s', $username, $failed->getMessage())); if ($this->ignoreFailure) { return; diff --git a/src/Symfony/Component/Security/Http/Firewall/ChannelListener.php b/src/Symfony/Component/Security/Http/Firewall/ChannelListener.php index 9e4a6ee453c8c..cf2bce5c5a321 100644 --- a/src/Symfony/Component/Security/Http/Firewall/ChannelListener.php +++ b/src/Symfony/Component/Security/Http/Firewall/ChannelListener.php @@ -11,6 +11,7 @@ namespace Symfony\Component\Security\Http\Firewall; +use Psr\Log\NullLogger; use Symfony\Component\Security\Http\AccessMapInterface; use Symfony\Component\Security\Http\EntryPoint\AuthenticationEntryPointInterface; use Psr\Log\LoggerInterface; @@ -32,7 +33,7 @@ public function __construct(AccessMapInterface $map, AuthenticationEntryPointInt { $this->map = $map; $this->authenticationEntryPoint = $authenticationEntryPoint; - $this->logger = $logger; + $this->logger = $logger ?: new NullLogger(); } /** @@ -47,9 +48,7 @@ public function handle(GetResponseEvent $event) list($attributes, $channel) = $this->map->getPatterns($request); if ('https' === $channel && !$request->isSecure()) { - if (null !== $this->logger) { - $this->logger->info('Redirecting to HTTPS'); - } + $this->logger->info('Redirecting to HTTPS'); $response = $this->authenticationEntryPoint->start($request); @@ -59,9 +58,7 @@ public function handle(GetResponseEvent $event) } if ('http' === $channel && $request->isSecure()) { - if (null !== $this->logger) { - $this->logger->info('Redirecting to HTTP'); - } + $this->logger->info('Redirecting to HTTP'); $response = $this->authenticationEntryPoint->start($request); diff --git a/src/Symfony/Component/Security/Http/Firewall/ContextListener.php b/src/Symfony/Component/Security/Http/Firewall/ContextListener.php index c80fff3317c0e..91ef7327a351f 100644 --- a/src/Symfony/Component/Security/Http/Firewall/ContextListener.php +++ b/src/Symfony/Component/Security/Http/Firewall/ContextListener.php @@ -11,6 +11,7 @@ namespace Symfony\Component\Security\Http\Firewall; +use Psr\Log\NullLogger; use Symfony\Component\HttpKernel\HttpKernelInterface; use Psr\Log\LoggerInterface; use Symfony\Component\HttpKernel\Event\GetResponseEvent; @@ -55,7 +56,7 @@ public function __construct(SecurityContextInterface $context, array $userProvid $this->context = $context; $this->userProviders = $userProviders; $this->contextKey = $contextKey; - $this->logger = $logger; + $this->logger = $logger ?: new NullLogger(); $this->dispatcher = $dispatcher; } @@ -81,17 +82,12 @@ public function handle(GetResponseEvent $event) } $token = unserialize($token); - - if (null !== $this->logger) { - $this->logger->debug('Read SecurityContext from the session'); - } + $this->logger->debug('Read SecurityContext from the session'); if ($token instanceof TokenInterface) { $token = $this->refreshUser($token); } elseif (null !== $token) { - if (null !== $this->logger) { - $this->logger->warning(sprintf('Session includes a "%s" where a security token is expected', is_object($token) ? get_class($token) : gettype($token))); - } + $this->logger->warning(sprintf('Session includes a "%s" where a security token is expected', is_object($token) ? get_class($token) : gettype($token))); $token = null; } diff --git a/src/Symfony/Component/Security/Http/Firewall/DigestAuthenticationListener.php b/src/Symfony/Component/Security/Http/Firewall/DigestAuthenticationListener.php index 358c3c7a7cc34..c0d81305731ab 100644 --- a/src/Symfony/Component/Security/Http/Firewall/DigestAuthenticationListener.php +++ b/src/Symfony/Component/Security/Http/Firewall/DigestAuthenticationListener.php @@ -11,6 +11,7 @@ namespace Symfony\Component\Security\Http\Firewall; +use Psr\Log\NullLogger; use Symfony\Component\Security\Core\SecurityContextInterface; use Symfony\Component\Security\Core\User\UserProviderInterface; use Symfony\Component\Security\Http\EntryPoint\DigestAuthenticationEntryPoint; @@ -47,7 +48,7 @@ public function __construct(SecurityContextInterface $securityContext, UserProvi $this->provider = $provider; $this->providerKey = $providerKey; $this->authenticationEntryPoint = $authenticationEntryPoint; - $this->logger = $logger; + $this->logger = $logger ?: new NullLogger(); } /** @@ -73,9 +74,7 @@ public function handle(GetResponseEvent $event) } } - if (null !== $this->logger) { - $this->logger->debug(sprintf('Digest Authorization header received from user agent: %s', $header)); - } + $this->logger->debug(sprintf('Digest Authorization header received from user agent: %s', $header)); try { $digestAuth->validateAndDecode($this->authenticationEntryPoint->getKey(), $this->authenticationEntryPoint->getRealmName()); @@ -100,9 +99,7 @@ public function handle(GetResponseEvent $event) } if ($serverDigestMd5 !== $digestAuth->getResponse()) { - if (null !== $this->logger) { - $this->logger->debug(sprintf("Expected response: '%s' but received: '%s'; is AuthenticationDao returning clear text passwords?", $serverDigestMd5, $digestAuth->getResponse())); - } + $this->logger->debug(sprintf("Expected response: '%s' but received: '%s'; is AuthenticationDao returning clear text passwords?", $serverDigestMd5, $digestAuth->getResponse())); $this->fail($event, $request, new BadCredentialsException('Incorrect response')); @@ -115,9 +112,7 @@ public function handle(GetResponseEvent $event) return; } - if (null !== $this->logger) { - $this->logger->info(sprintf('Authentication success for user "%s" with response "%s"', $digestAuth->getUsername(), $digestAuth->getResponse())); - } + $this->logger->info(sprintf('Authentication success for user "%s" with response "%s"', $digestAuth->getUsername(), $digestAuth->getResponse())); $this->securityContext->setToken(new UsernamePasswordToken($user, $user->getPassword(), $this->providerKey)); } @@ -129,9 +124,7 @@ private function fail(GetResponseEvent $event, Request $request, AuthenticationE $this->securityContext->setToken(null); } - if (null !== $this->logger) { - $this->logger->info($authException); - } + $this->logger->info($authException); $event->setResponse($this->authenticationEntryPoint->start($request, $authException)); } diff --git a/src/Symfony/Component/Security/Http/Firewall/ExceptionListener.php b/src/Symfony/Component/Security/Http/Firewall/ExceptionListener.php index fac5dc1088968..3e361d0120fc4 100644 --- a/src/Symfony/Component/Security/Http/Firewall/ExceptionListener.php +++ b/src/Symfony/Component/Security/Http/Firewall/ExceptionListener.php @@ -11,6 +11,7 @@ namespace Symfony\Component\Security\Http\Firewall; +use Psr\Log\NullLogger; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\Security\Http\Authorization\AccessDeniedHandlerInterface; use Symfony\Component\Security\Core\SecurityContextInterface; @@ -56,7 +57,7 @@ public function __construct(SecurityContextInterface $context, AuthenticationTru $this->authenticationEntryPoint = $authenticationEntryPoint; $this->authenticationTrustResolver = $trustResolver; $this->errorPage = $errorPage; - $this->logger = $logger; + $this->logger = $logger ?: new NullLogger(); } /** @@ -94,9 +95,7 @@ public function onKernelException(GetResponseForExceptionEvent $event) private function handleAuthenticationException(GetResponseForExceptionEvent $event, AuthenticationException $exception) { - if (null !== $this->logger) { - $this->logger->info(sprintf('Authentication exception occurred; redirecting to authentication entry point (%s)', $exception->getMessage())); - } + $this->logger->info(sprintf('Authentication exception occurred; redirecting to authentication entry point (%s)', $exception->getMessage())); try { $event->setResponse($this->startAuthentication($event->getRequest(), $exception)); @@ -111,9 +110,7 @@ private function handleAccessDeniedException(GetResponseForExceptionEvent $event $token = $this->context->getToken(); if (!$this->authenticationTrustResolver->isFullFledged($token)) { - if (null !== $this->logger) { - $this->logger->debug(sprintf('Access is denied (user is not fully authenticated) by "%s" at line %s; redirecting to authentication entry point', $exception->getFile(), $exception->getLine())); - } + $this->logger->debug(sprintf('Access is denied (user is not fully authenticated) by "%s" at line %s; redirecting to authentication entry point', $exception->getFile(), $exception->getLine())); try { $insufficientAuthenticationException = new InsufficientAuthenticationException('Full authentication is required to access this resource.', 0, $exception); @@ -127,9 +124,7 @@ private function handleAccessDeniedException(GetResponseForExceptionEvent $event return; } - if (null !== $this->logger) { - $this->logger->debug(sprintf('Access is denied (and user is neither anonymous, nor remember-me) by "%s" at line %s', $exception->getFile(), $exception->getLine())); - } + $this->logger->debug(sprintf('Access is denied (and user is neither anonymous, nor remember-me) by "%s" at line %s', $exception->getFile(), $exception->getLine())); try { if (null !== $this->accessDeniedHandler) { @@ -145,9 +140,7 @@ private function handleAccessDeniedException(GetResponseForExceptionEvent $event $event->setResponse($event->getKernel()->handle($subRequest, HttpKernelInterface::SUB_REQUEST, true)); } } catch (\Exception $e) { - if (null !== $this->logger) { - $this->logger->error(sprintf('Exception thrown when handling an exception (%s: %s)', get_class($e), $e->getMessage())); - } + $this->logger->error(sprintf('Exception thrown when handling an exception (%s: %s)', get_class($e), $e->getMessage())); $event->setException(new \RuntimeException('Exception thrown when handling an exception.', 0, $e)); } @@ -155,9 +148,7 @@ private function handleAccessDeniedException(GetResponseForExceptionEvent $event private function handleLogoutException(LogoutException $exception) { - if (null !== $this->logger) { - $this->logger->info(sprintf('Logout exception occurred; wrapping with AccessDeniedHttpException (%s)', $exception->getMessage())); - } + $this->logger->info(sprintf('Logout exception occurred; wrapping with AccessDeniedHttpException (%s)', $exception->getMessage())); } /** @@ -174,9 +165,7 @@ private function startAuthentication(Request $request, AuthenticationException $ throw $authException; } - if (null !== $this->logger) { - $this->logger->debug('Calling Authentication entry point'); - } + $this->logger->debug('Calling Authentication entry point'); $this->setTargetPath($request); diff --git a/src/Symfony/Component/Security/Http/Firewall/RememberMeListener.php b/src/Symfony/Component/Security/Http/Firewall/RememberMeListener.php index beacff301c11f..e55ad7e7a3bca 100644 --- a/src/Symfony/Component/Security/Http/Firewall/RememberMeListener.php +++ b/src/Symfony/Component/Security/Http/Firewall/RememberMeListener.php @@ -12,6 +12,7 @@ namespace Symfony\Component\Security\Http\Firewall; use Psr\Log\LoggerInterface; +use Psr\Log\NullLogger; use Symfony\Component\HttpKernel\Event\GetResponseEvent; use Symfony\Component\Security\Core\Authentication\AuthenticationManagerInterface; use Symfony\Component\Security\Core\Exception\AuthenticationException; @@ -48,7 +49,7 @@ public function __construct(SecurityContextInterface $securityContext, RememberM $this->securityContext = $securityContext; $this->rememberMeServices = $rememberMeServices; $this->authenticationManager = $authenticationManager; - $this->logger = $logger; + $this->logger = $logger ?: new NullLogger(); $this->dispatcher = $dispatcher; } @@ -77,17 +78,14 @@ public function handle(GetResponseEvent $event) $this->dispatcher->dispatch(SecurityEvents::INTERACTIVE_LOGIN, $loginEvent); } - if (null !== $this->logger) { - $this->logger->debug('SecurityContext populated with remember-me token.'); - } + $this->logger->debug('SecurityContext populated with remember-me token.'); + } catch (AuthenticationException $failed) { - if (null !== $this->logger) { - $this->logger->warning( - 'SecurityContext not populated with remember-me token as the' - .' AuthenticationManager rejected the AuthenticationToken returned' - .' by the RememberMeServices: '.$failed->getMessage() - ); - } + $this->logger->warning( + 'SecurityContext not populated with remember-me token as the' + .' AuthenticationManager rejected the AuthenticationToken returned' + .' by the RememberMeServices: '.$failed->getMessage() + ); $this->rememberMeServices->loginFail($request); } diff --git a/src/Symfony/Component/Security/Http/Firewall/SwitchUserListener.php b/src/Symfony/Component/Security/Http/Firewall/SwitchUserListener.php index 77000968e14f7..d0fd7c3bb4c1b 100644 --- a/src/Symfony/Component/Security/Http/Firewall/SwitchUserListener.php +++ b/src/Symfony/Component/Security/Http/Firewall/SwitchUserListener.php @@ -11,6 +11,7 @@ namespace Symfony\Component\Security\Http\Firewall; +use Psr\Log\NullLogger; use Symfony\Component\Security\Core\Exception\AccessDeniedException; use Symfony\Component\Security\Core\SecurityContextInterface; use Symfony\Component\Security\Core\User\UserProviderInterface; @@ -63,7 +64,7 @@ public function __construct(SecurityContextInterface $securityContext, UserProvi $this->accessDecisionManager = $accessDecisionManager; $this->usernameParameter = $usernameParameter; $this->role = $role; - $this->logger = $logger; + $this->logger = $logger ?: new NullLogger(); $this->dispatcher = $dispatcher; } @@ -127,9 +128,7 @@ private function attemptSwitchUser(Request $request) $username = $request->get($this->usernameParameter); - if (null !== $this->logger) { - $this->logger->info(sprintf('Attempt to switch to user "%s"', $username)); - } + $this->logger->info(sprintf('Attempt to switch to user "%s"', $username)); $user = $this->provider->loadUserByUsername($username); $this->userChecker->checkPostAuth($user); diff --git a/src/Symfony/Component/Security/Http/RememberMe/AbstractRememberMeServices.php b/src/Symfony/Component/Security/Http/RememberMe/AbstractRememberMeServices.php index b14e36da4f467..6195e0e23ee7a 100644 --- a/src/Symfony/Component/Security/Http/RememberMe/AbstractRememberMeServices.php +++ b/src/Symfony/Component/Security/Http/RememberMe/AbstractRememberMeServices.php @@ -11,6 +11,7 @@ namespace Symfony\Component\Security\Http\RememberMe; +use Psr\Log\NullLogger; use Symfony\Component\Security\Core\Exception\AuthenticationException; use Symfony\Component\Security\Core\User\UserInterface; use Symfony\Component\Security\Core\Authentication\Token\RememberMeToken; @@ -66,7 +67,7 @@ public function __construct(array $userProviders, $key, $providerKey, array $opt $this->key = $key; $this->providerKey = $providerKey; $this->options = $options; - $this->logger = $logger; + $this->logger = $logger ?: new NullLogger(); } /** @@ -105,10 +106,7 @@ final public function autoLogin(Request $request) return; } - if (null !== $this->logger) { - $this->logger->debug('Remember-me cookie detected.'); - } - + $this->logger->debug('Remember-me cookie detected.'); $cookieParts = $this->decodeCookie($cookie); try { @@ -118,9 +116,7 @@ final public function autoLogin(Request $request) throw new \RuntimeException('processAutoLoginCookie() must return a UserInterface implementation.'); } - if (null !== $this->logger) { - $this->logger->info('Remember-me cookie accepted.'); - } + $this->logger->info('Remember-me cookie accepted.'); return new RememberMeToken($user, $this->providerKey, $this->key); } catch (CookieTheftException $theft) { @@ -128,17 +124,11 @@ final public function autoLogin(Request $request) throw $theft; } catch (UsernameNotFoundException $notFound) { - if (null !== $this->logger) { - $this->logger->info('User for remember-me cookie not found.'); - } + $this->logger->info('User for remember-me cookie not found.'); } catch (UnsupportedUserException $unSupported) { - if (null !== $this->logger) { - $this->logger->warning('User class for remember-me cookie not supported.'); - } + $this->logger->warning('User class for remember-me cookie not supported.'); } catch (AuthenticationException $invalid) { - if (null !== $this->logger) { - $this->logger->debug('Remember-Me authentication failed: '.$invalid->getMessage()); - } + $this->logger->debug('Remember-Me authentication failed: '.$invalid->getMessage()); } $this->cancelCookie($request); @@ -182,24 +172,18 @@ final public function loginSuccess(Request $request, Response $response, TokenIn $this->cancelCookie($request); if (!$token->getUser() instanceof UserInterface) { - if (null !== $this->logger) { - $this->logger->debug('Remember-me ignores token since it does not contain a UserInterface implementation.'); - } + $this->logger->debug('Remember-me ignores token since it does not contain a UserInterface implementation.'); return; } if (!$this->isRememberMeRequested($request)) { - if (null !== $this->logger) { - $this->logger->debug('Remember-me was not requested.'); - } + $this->logger->debug('Remember-me was not requested.'); return; } - if (null !== $this->logger) { - $this->logger->debug('Remember-me was requested; setting cookie.'); - } + $this->logger->debug('Remember-me was requested; setting cookie.'); // Remove attribute from request that sets a NULL cookie. // It was set by $this->cancelCookie() @@ -281,9 +265,7 @@ protected function encodeCookie(array $cookieParts) */ protected function cancelCookie(Request $request) { - if (null !== $this->logger) { - $this->logger->debug(sprintf('Clearing remember-me cookie "%s"', $this->options['name'])); - } + $this->logger->debug(sprintf('Clearing remember-me cookie "%s"', $this->options['name'])); $request->attributes->set(self::COOKIE_ATTR_NAME, new Cookie($this->options['name'], null, 1, $this->options['path'], $this->options['domain'])); } @@ -303,7 +285,7 @@ protected function isRememberMeRequested(Request $request) $parameter = $request->get($this->options['remember_me_parameter'], null, true); - if (null === $parameter && null !== $this->logger) { + if (null === $parameter) { $this->logger->debug(sprintf('Did not send remember-me cookie (remember-me parameter "%s" was not sent).', $this->options['remember_me_parameter'])); }