diff --git a/eZ/Bundle/EzPublishCoreBundle/Resources/config/templating.yml b/eZ/Bundle/EzPublishCoreBundle/Resources/config/templating.yml index f0aa4f0fe0..eb9bc89c50 100644 --- a/eZ/Bundle/EzPublishCoreBundle/Resources/config/templating.yml +++ b/eZ/Bundle/EzPublishCoreBundle/Resources/config/templating.yml @@ -124,8 +124,7 @@ services: class: eZ\Publish\Core\MVC\Symfony\Templating\Twig\Extension\RoutingExtension arguments: ["@ezpublish.route_reference.generator", "@router"] tags: - - { name: twig.extension } - - { name: 'monolog.logger', channel: 'ibexa.core' } + - {name: twig.extension} eZ\Publish\Core\MVC\Symfony\Templating\Twig\ResourceProvider: arguments: diff --git a/eZ/Publish/Core/MVC/Symfony/Templating/Twig/Extension/RoutingExtension.php b/eZ/Publish/Core/MVC/Symfony/Templating/Twig/Extension/RoutingExtension.php index 9e30aa4d69..689b9469a4 100644 --- a/eZ/Publish/Core/MVC/Symfony/Templating/Twig/Extension/RoutingExtension.php +++ b/eZ/Publish/Core/MVC/Symfony/Templating/Twig/Extension/RoutingExtension.php @@ -15,23 +15,16 @@ use eZ\Publish\Core\MVC\Symfony\Routing\Generator\RouteReferenceGeneratorInterface; use eZ\Publish\Core\MVC\Symfony\Routing\RouteReference; use eZ\Publish\Core\MVC\Symfony\Routing\UrlAliasRouter; -use Psr\Log\LoggerAwareInterface; -use Psr\Log\LoggerAwareTrait; -use Psr\Log\LoggerInterface; -use Psr\Log\NullLogger; use Symfony\Cmf\Component\Routing\RouteObjectInterface; use Symfony\Component\Routing\Generator\UrlGeneratorInterface; -use Throwable; use Twig\Extension\AbstractExtension; use Twig\Node\Expression\ArrayExpression; use Twig\Node\Expression\ConstantExpression; use Twig\Node\Node; use Twig\TwigFunction; -class RoutingExtension extends AbstractExtension implements LoggerAwareInterface +class RoutingExtension extends AbstractExtension { - use LoggerAwareTrait; - /** @var \eZ\Publish\Core\MVC\Symfony\Routing\Generator\RouteReferenceGeneratorInterface */ private $routeReferenceGenerator; @@ -40,12 +33,10 @@ class RoutingExtension extends AbstractExtension implements LoggerAwareInterface public function __construct( RouteReferenceGeneratorInterface $routeReferenceGenerator, - UrlGeneratorInterface $urlGenerator, - ?LoggerInterface $logger = null + UrlGeneratorInterface $urlGenerator ) { $this->routeReferenceGenerator = $routeReferenceGenerator; $this->urlGenerator = $urlGenerator; - $this->logger = $logger ?? new NullLogger(); } public function getFunctions(): array @@ -103,13 +94,6 @@ private function tryGeneratingUrlForObject(object $object, array $parameters, in try { return $this->generateUrlForObject($object, $parameters, $referenceType); } catch (NotFoundException $e) { - return ''; - } catch (Throwable $e) { - $this->logger->warning( - 'Url could not be generated.', - ['exception' => $e] - ); - return ''; } }