Define Twig runtime extension with attributes

GromNaN · GromNaN · commit edbf868e1a78 · 2023-12-10T22:54:17.000+01:00
diff --git a/src/Symfony/Bundle/TwigBundle/CHANGELOG.md b/src/Symfony/Bundle/TwigBundle/CHANGELOG.md
@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+7.1
+---
+
+ * Enable `#[AsTwigFilter]`, `#[AsTwigFunction]` and `#[AsTwigTest]` attributes to configure runtime extensions
+
 7.0
 ---
 
diff --git a/src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/RuntimeLoaderPass.php b/src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/RuntimeLoaderPass.php
@@ -35,5 +35,10 @@ public function process(ContainerBuilder $container): void
         }
 
         $definition->replaceArgument(0, ServiceLocatorTagPass::register($container, $mapping));
+
+        // Scan all Twig runtimes for attributes
+        if ($container->hasDefinition('twig.extension.runtime')) {
+            $container->getDefinition('twig.extension.runtime')->replaceArgument(0, array_keys($mapping));
+        }
     }
 }
diff --git a/src/Symfony/Bundle/TwigBundle/DependencyInjection/TwigExtension.php b/src/Symfony/Bundle/TwigBundle/DependencyInjection/TwigExtension.php
@@ -25,6 +25,7 @@
 use Symfony\Component\Translation\LocaleSwitcher;
 use Symfony\Component\Translation\Translator;
 use Symfony\Contracts\Service\ResetInterface;
+use Twig\Extension\AttributeExtension;
 use Twig\Extension\ExtensionInterface;
 use Twig\Extension\RuntimeExtensionInterface;
 use Twig\Loader\LoaderInterface;
@@ -177,6 +178,11 @@ public function load(array $configs, ContainerBuilder $container): void
         if (false === $config['cache']) {
             $container->removeDefinition('twig.template_cache_warmer');
         }
+
+        // Attributes declaration requires Twig 3.9+
+        if (!class_exists(AttributeExtension::class)) {
+            $container->removeDefinition('twig.extension.runtime');
+        }
     }
 
     private function getBundleTemplatePaths(ContainerBuilder $container, array $config): array
diff --git a/src/Symfony/Bundle/TwigBundle/Resources/config/twig.php b/src/Symfony/Bundle/TwigBundle/Resources/config/twig.php
@@ -37,6 +37,7 @@
 use Symfony\Bundle\TwigBundle\TemplateIterator;
 use Twig\Cache\FilesystemCache;
 use Twig\Environment;
+use Twig\Extension\AttributeExtension;
 use Twig\Extension\CoreExtension;
 use Twig\Extension\DebugExtension;
 use Twig\Extension\EscaperExtension;
@@ -151,6 +152,10 @@
         ->set('twig.runtime_loader', ContainerRuntimeLoader::class)
             ->args([abstract_arg('runtime locator')])
 
+        ->set('twig.extension.runtime', AttributeExtension::class)
+            ->args([abstract_arg('runtime classes')])
+            ->tag('twig.extension')
+
         ->set('twig.error_renderer.html', TwigErrorRenderer::class)
             ->decorate('error_renderer.html')
             ->args([

Original file line number	Diff line number	Diff line change
`@@ -35,5 +35,10 @@ public function process(ContainerBuilder $container): void`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`$definition->replaceArgument(0, ServiceLocatorTagPass::register($container, $mapping));`
	`38`	`+`
	`39`	`+ // Scan all Twig runtimes for attributes`
	`40`	`+ if ($container->hasDefinition('twig.extension.runtime')) {`
	`41`	`+ $container->getDefinition('twig.extension.runtime')->replaceArgument(0, array_keys($mapping));`
	`42`	`+ }`
`38`	`43`	`}`
`39`	`44`	`}`