From d3b3d28f7d65f0b7c39d31d2a18e061899bd455c Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Wed, 5 Jul 2023 09:37:12 +0200 Subject: [PATCH] [TwigBundle] Allow omitting the `autoescape_service_method` option when `autoescape_service` is set to an invokable service id --- src/Symfony/Bundle/TwigBundle/CHANGELOG.md | 5 +++++ .../Bundle/TwigBundle/DependencyInjection/TwigExtension.php | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/Symfony/Bundle/TwigBundle/CHANGELOG.md b/src/Symfony/Bundle/TwigBundle/CHANGELOG.md index ba5a3f08850d8..775f87e6d2d12 100644 --- a/src/Symfony/Bundle/TwigBundle/CHANGELOG.md +++ b/src/Symfony/Bundle/TwigBundle/CHANGELOG.md @@ -1,6 +1,11 @@ CHANGELOG ========= +6.4 +--- + + * Allow omitting the `autoescape_service_method` option when `autoescape_service` is set to an invokable service id + 6.3 --- diff --git a/src/Symfony/Bundle/TwigBundle/DependencyInjection/TwigExtension.php b/src/Symfony/Bundle/TwigBundle/DependencyInjection/TwigExtension.php index f257f60298bb6..deac87b8b62ce 100644 --- a/src/Symfony/Bundle/TwigBundle/DependencyInjection/TwigExtension.php +++ b/src/Symfony/Bundle/TwigBundle/DependencyInjection/TwigExtension.php @@ -151,8 +151,8 @@ public function load(array $configs, ContainerBuilder $container) } } - if (isset($config['autoescape_service']) && isset($config['autoescape_service_method'])) { - $config['autoescape'] = [new Reference($config['autoescape_service']), $config['autoescape_service_method']]; + if (isset($config['autoescape_service'])) { + $config['autoescape'] = [new Reference($config['autoescape_service']), $config['autoescape_service_method'] ?? '__invoke']; } $container->getDefinition('twig')->replaceArgument(1, array_intersect_key($config, [