bug #43801 [TwigBundle] fix auto-enabling assets/expression/routing/yaml/workflow extensions (nicolas-grekas)

nicolas-grekas · nicolas-grekas · commit 66fcfba0fce6 · 2021-10-28T16:40:00.000+02:00
This PR was merged into the 5.3 branch. Discussion ---------- [TwigBundle] fix auto-enabling assets/expression/routing/yaml/workflow extensions | Q | A | ------------- | --- | Branch? | 5.3 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | Fix #41672 | License | MIT | Doc PR | - Since there is no config option to force-enable those extension, we cannot register them conditionally using `$container::willBeAvailable()`. (As a general rule of thumb, `$container::willBeAvailable()` should not be used in a compiler pass.) Commits ------- bd8256d [TwigBundle] fix auto-enabling assets/expression/routing/yaml/workflow extensions
diff --git a/src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/ExtensionPass.php b/src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/ExtensionPass.php
@@ -27,19 +27,19 @@ class ExtensionPass implements CompilerPassInterface
 {
     public function process(ContainerBuilder $container)
     {
-        if (!$container::willBeAvailable('symfony/asset', Packages::class, ['symfony/twig-bundle'])) {
+        if (!class_exists(Packages::class)) {
             $container->removeDefinition('twig.extension.assets');
         }
 
-        if (!$container::willBeAvailable('symfony/expression-language', Expression::class, ['symfony/twig-bundle'])) {
+        if (!class_exists(Expression::class)) {
             $container->removeDefinition('twig.extension.expression');
         }
 
-        if (!$container::willBeAvailable('symfony/routing', UrlGeneratorInterface::class, ['symfony/twig-bundle'])) {
+        if (!interface_exists(UrlGeneratorInterface::class)) {
             $container->removeDefinition('twig.extension.routing');
         }
 
-        if (!$container::willBeAvailable('symfony/yaml', Yaml::class, ['symfony/twig-bundle'])) {
+        if (!class_exists(Yaml::class)) {
             $container->removeDefinition('twig.extension.yaml');
         }
 
@@ -115,7 +115,7 @@ public function process(ContainerBuilder $container)
             $container->getDefinition('twig.extension.expression')->addTag('twig.extension');
         }
 
-        if (!$container::willBeAvailable('symfony/workflow', Workflow::class, ['symfony/twig-bundle']) || !$container->has('workflow.registry')) {
+        if (!class_exists(Workflow::class) || !$container->has('workflow.registry')) {
             $container->removeDefinition('workflow.twig_extension');
         } else {
             $container->getDefinition('workflow.twig_extension')->addTag('twig.extension');

Original file line number	Diff line number	Diff line change
`@@ -27,19 +27,19 @@ class ExtensionPass implements CompilerPassInterface`
`27`	`27`	`{`
`28`	`28`	`public function process(ContainerBuilder $container)`
`29`	`29`	`{`
`30`		`- if (!$container::willBeAvailable('symfony/asset', Packages::class, ['symfony/twig-bundle'])) {`
	`30`	`+ if (!class_exists(Packages::class)) {`
`31`	`31`	`$container->removeDefinition('twig.extension.assets');`
`32`	`32`	`}`
`33`	`33`
`34`		`- if (!$container::willBeAvailable('symfony/expression-language', Expression::class, ['symfony/twig-bundle'])) {`
	`34`	`+ if (!class_exists(Expression::class)) {`
`35`	`35`	`$container->removeDefinition('twig.extension.expression');`
`36`	`36`	`}`
`37`	`37`
`38`		`- if (!$container::willBeAvailable('symfony/routing', UrlGeneratorInterface::class, ['symfony/twig-bundle'])) {`
	`38`	`+ if (!interface_exists(UrlGeneratorInterface::class)) {`
`39`	`39`	`$container->removeDefinition('twig.extension.routing');`
`40`	`40`	`}`
`41`	`41`
`42`		`- if (!$container::willBeAvailable('symfony/yaml', Yaml::class, ['symfony/twig-bundle'])) {`
	`42`	`+ if (!class_exists(Yaml::class)) {`
`43`	`43`	`$container->removeDefinition('twig.extension.yaml');`
`44`	`44`	`}`
`45`	`45`
`@@ -115,7 +115,7 @@ public function process(ContainerBuilder $container)`
`115`	`115`	`$container->getDefinition('twig.extension.expression')->addTag('twig.extension');`
`116`	`116`	`}`
`117`	`117`
`118`		`- if (!$container::willBeAvailable('symfony/workflow', Workflow::class, ['symfony/twig-bundle']) \|\| !$container->has('workflow.registry')) {`
	`118`	`+ if (!class_exists(Workflow::class) \|\| !$container->has('workflow.registry')) {`
`119`	`119`	`$container->removeDefinition('workflow.twig_extension');`
`120`	`120`	`} else {`
`121`	`121`	`$container->getDefinition('workflow.twig_extension')->addTag('twig.extension');`