Use NullLogger if no logger available

ezpublishlegacy · Feb 9, 2017 · 148de05 · 148de05
1 parent 3c67713
commit 148de05
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 11 deletions.
diff --git a/EventListener/RouterListener.php b/EventListener/RouterListener.php
@@ -5,6 +5,7 @@
 use eZ\Bundle\EzPublishLegacyBundle\Routing\FallbackRouter;
 use Netgen\TagsBundle\Routing\Generator\TagUrlGenerator;
 use Psr\Log\LoggerInterface;
+use Psr\Log\NullLogger;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\HttpKernel\Event\GetResponseEvent;
 use Symfony\Component\HttpKernel\KernelEvents;
@@ -28,7 +29,7 @@ class RouterListener implements EventSubscriberInterface
      */
     public function __construct(LoggerInterface $logger = null)
     {
-        $this->logger = $logger;
+        $this->logger = $logger ?: new NullLogger();
     }
 
     /**
@@ -71,9 +72,7 @@ public function onKernelRequest(GetResponseEvent $event)
             return;
         }
 
-        if ($this->logger instanceof LoggerInterface) {
-            $this->logger->info('Falling back to tag legacy route as specified in config.');
-        }
+        $this->logger->info('Falling back to tag legacy route as specified in config.');
 
         $request->attributes->set('_route', FallbackRouter::ROUTE_NAME);
         $request->attributes->set('_controller', 'ezpublish_legacy.controller:indexAction');

diff --git a/Routing/TagRouter.php b/Routing/TagRouter.php
@@ -9,6 +9,7 @@
 use Netgen\TagsBundle\API\Repository\Values\Tags\Tag;
 use Netgen\TagsBundle\Routing\Generator\TagUrlGenerator;
 use Psr\Log\LoggerInterface;
+use Psr\Log\NullLogger;
 use RuntimeException;
 use Symfony\Cmf\Component\Routing\ChainedRouterInterface;
 use Symfony\Cmf\Component\Routing\RouteObjectInterface;
@@ -68,8 +69,8 @@ public function __construct(
     ) {
         $this->tagsService = $tagsService;
         $this->generator = $generator;
-        $this->requestContext = $requestContext !== null ? $requestContext : new RequestContext();
-        $this->logger = $logger;
+        $this->requestContext = $requestContext ?: new RequestContext();
+        $this->logger = $logger ?: new NullLogger();
     }
 
     /**
@@ -132,11 +133,9 @@ function (TagsService $tagsService) use ($requestedPath, $languages) {
 
         $request->attributes->set('tagId', $tag->id);
 
-        if ($this->logger !== null) {
-            $this->logger->info(
-                "TagRouter matched tag #{$tag->id}. Forwarding to tag view controller"
-            );
-        }
+        $this->logger->info(
+            "TagRouter matched tag #{$tag->id}. Forwarding to tag view controller"
+        );
 
         return $params;
     }