fix compatibility with Twig 3.10

xabbuh · xabbuh · commit 60ac8459bb2b · 2024-05-02T09:51:45.000+02:00
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Tests/Twig/WebProfilerExtensionTest.php b/src/Symfony/Bundle/WebProfilerBundle/Tests/Twig/WebProfilerExtensionTest.php
@@ -15,6 +15,7 @@
 use Symfony\Bundle\WebProfilerBundle\Twig\WebProfilerExtension;
 use Symfony\Component\VarDumper\Cloner\VarCloner;
 use Twig\Environment;
+use Twig\Loader\ArrayLoader;
 
 class WebProfilerExtensionTest extends TestCase
 {
@@ -23,7 +24,7 @@ class WebProfilerExtensionTest extends TestCase
      */
     public function testDumpHeaderIsDisplayed(string $message, array $context, bool $dump1HasHeader, bool $dump2HasHeader)
     {
-        $twigEnvironment = $this->mockTwigEnvironment();
+        $twigEnvironment = new Environment(new ArrayLoader());
         $varCloner = new VarCloner();
 
         $webProfilerExtension = new WebProfilerExtension();
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Twig/WebProfilerExtension.php b/src/Symfony/Bundle/WebProfilerBundle/Twig/WebProfilerExtension.php
@@ -17,6 +17,7 @@
 use Twig\Extension\EscaperExtension;
 use Twig\Extension\ProfilerExtension;
 use Twig\Profiler\Profile;
+use Twig\Runtime\EscaperRuntime;
 use Twig\TwigFunction;
 
 /**
@@ -114,6 +115,12 @@ public function getName()
 
     private static function escape(Environment $env, string $s): string
     {
+        // Twig 3.10 and above
+        if (class_exists(EscaperRuntime::class) && null !== $escaperRuntime = $env->getRuntime(EscaperRuntime::class)) {
+            return $escaperRuntime->escape($s);
+        }
+
+        // Twig 3.9
         if (method_exists(EscaperExtension::class, 'escape')) {
             return EscaperExtension::escape($env, $s);
         }

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@`
`15`	`15`	`use Symfony\Bundle\WebProfilerBundle\Twig\WebProfilerExtension;`
`16`	`16`	`use Symfony\Component\VarDumper\Cloner\VarCloner;`
`17`	`17`	`use Twig\Environment;`
	`18`	`+use Twig\Loader\ArrayLoader;`
`18`	`19`
`19`	`20`	`class WebProfilerExtensionTest extends TestCase`
`20`	`21`	`{`
`@@ -23,7 +24,7 @@ class WebProfilerExtensionTest extends TestCase`
`23`	`24`	`*/`
`24`	`25`	`public function testDumpHeaderIsDisplayed(string $message, array $context, bool $dump1HasHeader, bool $dump2HasHeader)`
`25`	`26`	`{`
`26`		`- $twigEnvironment = $this->mockTwigEnvironment();`
	`27`	`+ $twigEnvironment = new Environment(new ArrayLoader());`
`27`	`28`	`$varCloner = new VarCloner();`
`28`	`29`
`29`	`30`	`$webProfilerExtension = new WebProfilerExtension();`