From c0baaff59765dcecfdc1f0a15e4e57bab64e962e Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Tue, 7 Nov 2023 15:08:13 +0100 Subject: [PATCH] Move CodeExtension from TwigBridge to WebProfilerBundle --- src/Symfony/Bundle/TwigBundle/Resources/config/twig.php | 5 ----- .../WebProfilerBundle/Profiler}/CodeExtension.php | 4 ++-- .../Bundle/WebProfilerBundle/Resources/config/profiler.php | 5 +++++ 3 files changed, 7 insertions(+), 7 deletions(-) rename src/Symfony/{Bridge/Twig/Extension => Bundle/WebProfilerBundle/Profiler}/CodeExtension.php (99%) diff --git a/src/Symfony/Bundle/TwigBundle/Resources/config/twig.php b/src/Symfony/Bundle/TwigBundle/Resources/config/twig.php index a5602265e245c..e1b47de245580 100644 --- a/src/Symfony/Bundle/TwigBundle/Resources/config/twig.php +++ b/src/Symfony/Bundle/TwigBundle/Resources/config/twig.php @@ -17,7 +17,6 @@ use Symfony\Bridge\Twig\ErrorRenderer\TwigErrorRenderer; use Symfony\Bridge\Twig\EventListener\TemplateAttributeListener; use Symfony\Bridge\Twig\Extension\AssetExtension; -use Symfony\Bridge\Twig\Extension\CodeExtension; use Symfony\Bridge\Twig\Extension\ExpressionExtension; use Symfony\Bridge\Twig\Extension\HtmlSanitizerExtension; use Symfony\Bridge\Twig\Extension\HttpFoundationExtension; @@ -106,10 +105,6 @@ ->set('twig.extension.assets', AssetExtension::class) ->args([service('assets.packages')]) - ->set('twig.extension.code', CodeExtension::class) - ->args([service('debug.file_link_formatter')->ignoreOnInvalid(), param('kernel.project_dir'), param('kernel.charset')]) - ->tag('twig.extension') - ->set('twig.extension.routing', RoutingExtension::class) ->args([service('router')]) diff --git a/src/Symfony/Bridge/Twig/Extension/CodeExtension.php b/src/Symfony/Bundle/WebProfilerBundle/Profiler/CodeExtension.php similarity index 99% rename from src/Symfony/Bridge/Twig/Extension/CodeExtension.php rename to src/Symfony/Bundle/WebProfilerBundle/Profiler/CodeExtension.php index 96ded292f141c..c59beaf1999d5 100644 --- a/src/Symfony/Bridge/Twig/Extension/CodeExtension.php +++ b/src/Symfony/Bundle/WebProfilerBundle/Profiler/CodeExtension.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace Symfony\Bridge\Twig\Extension; +namespace Symfony\Bundle\WebProfilerBundle\Profiler; use Symfony\Component\ErrorHandler\ErrorRenderer\FileLinkFormatter; use Twig\Extension\AbstractExtension; @@ -23,7 +23,7 @@ * * @author Fabien Potencier * - * @internal since Symfony 6.4 + * @internal */ final class CodeExtension extends AbstractExtension { diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/config/profiler.php b/src/Symfony/Bundle/WebProfilerBundle/Resources/config/profiler.php index 7b28de9c40ac2..edb464158045f 100644 --- a/src/Symfony/Bundle/WebProfilerBundle/Resources/config/profiler.php +++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/config/profiler.php @@ -16,6 +16,7 @@ use Symfony\Bundle\WebProfilerBundle\Controller\RouterController; use Symfony\Bundle\WebProfilerBundle\Csp\ContentSecurityPolicyHandler; use Symfony\Bundle\WebProfilerBundle\Csp\NonceGenerator; +use Symfony\Bundle\WebProfilerBundle\Profiler\CodeExtension; use Symfony\Bundle\WebProfilerBundle\Twig\WebProfilerExtension; use Symfony\Component\ErrorHandler\ErrorRenderer\FileLinkFormatter; use Symfony\Component\VarDumper\Dumper\HtmlDumper; @@ -79,5 +80,9 @@ '_profiler_open_file', '?file=%%f&line=%%l#line%%l', ]) + + ->set('twig.extension.code', CodeExtension::class) + ->args([service('debug.file_link_formatter'), param('kernel.project_dir'), param('kernel.charset')]) + ->tag('twig.extension') ; };