feature #50883 [TwigBundle] Allow omitting the autoescape_service_method option when autoescape_service is set to an invokable service id (nicolas-grekas)

fabpot · fabpot · commit 3688c1b10fe8 · 2023-07-13T14:33:24.000+02:00
This PR was merged into the 6.4 branch. Discussion ---------- [TwigBundle] Allow omitting the `autoescape_service_method` option when `autoescape_service` is set to an invokable service id | Q | A | ------------- | --- | Branch? | 6.4 | Bug fix? | no | New feature? | yes | Deprecations? | no | Tickets | - | License | MIT | Doc PR | - Commits ------- d3b3d28 [TwigBundle] Allow omitting the `autoescape_service_method` option when `autoescape_service` is set to an invokable service id
diff --git 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
@@ -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, [

Original file line number	Diff line number	Diff line change
`@@ -151,8 +151,8 @@ public function load(array $configs, ContainerBuilder $container)`
`151`	`151`	`}`
`152`	`152`	`}`
`153`	`153`
`154`		`- if (isset($config['autoescape_service']) && isset($config['autoescape_service_method'])) {`
`155`		`- $config['autoescape'] = [new Reference($config['autoescape_service']), $config['autoescape_service_method']];`
	`154`	`+ if (isset($config['autoescape_service'])) {`
	`155`	`+ $config['autoescape'] = [new Reference($config['autoescape_service']), $config['autoescape_service_method'] ?? '__invoke'];`
`156`	`156`	`}`
`157`	`157`
`158`	`158`	`$container->getDefinition('twig')->replaceArgument(1, array_intersect_key($config, [`