Move CodeExtension from TwigBridge to WebProfilerBundle

nicolas-grekas · nicolas-grekas · commit c0baaff59765 · 2023-11-07T15:10:15.000+01:00
diff --git 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/Bundle/WebProfilerBundle/Profiler/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 <fabien@symfony.com>
  *
- * @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
@@ -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')
     ;
 };

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`* file that was distributed with this source code.`
`10`	`10`	`*/`
`11`	`11`
`12`		`-namespace Symfony\Bridge\Twig\Extension;`
	`12`	`+namespace Symfony\Bundle\WebProfilerBundle\Profiler;`
`13`	`13`
`14`	`14`	`use Symfony\Component\ErrorHandler\ErrorRenderer\FileLinkFormatter;`
`15`	`15`	`use Twig\Extension\AbstractExtension;`
`@@ -23,7 +23,7 @@`
`23`	`23`	`*`
`24`	`24`	`* @author Fabien Potencier <fabien@symfony.com>`
`25`	`25`	`*`
`26`		`- * @internal since Symfony 6.4`
	`26`	`+ * @internal`
`27`	`27`	`*/`
`28`	`28`	`final class CodeExtension extends AbstractExtension`
`29`	`29`	`{`