Merge branch '3.x' into 4.x

* 3.x: Fix EscaperExtension constructor to not change from previous releases (will be the same in 4.x as well)
twigphp · May 4, 2024 · 0093bbf · 0093bbf
2 parents c872976 + 78466e8
commit 0093bbf
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/src/Environment.php b/src/Environment.php
@@ -138,7 +138,7 @@ public function __construct(LoaderInterface $loader, $options = [])
         ]);
 
         $this->addExtension(new CoreExtension());
-        $this->addExtension(new EscaperExtension($this->getRuntime(EscaperRuntime::class), $options['autoescape']));
+        $this->addExtension(new EscaperExtension($options['autoescape']));
         $this->addExtension(new OptimizerExtension($options['optimizations']));
     }
 

diff --git a/src/Extension/EscaperExtension.php b/src/Extension/EscaperExtension.php
@@ -11,7 +11,6 @@
 
 namespace Twig\Extension;
 
-use Twig\Environment;
 use Twig\FileExtensionEscapingStrategy;
 use Twig\Node\Expression\ConstantExpression;
 use Twig\Node\Node;
@@ -30,10 +29,9 @@ final class EscaperExtension extends AbstractExtension
      *
      * @see setDefaultStrategy()
      */
-    public function __construct(EscaperRuntime $escaper, $defaultStrategy = 'html')
+    public function __construct($defaultStrategy = 'html')
     {
         $this->setDefaultStrategy($defaultStrategy);
-        $this->escaper = $escaper;
     }
 
     public function getTokenParsers(): array

diff --git a/tests/EnvironmentTest.php b/tests/EnvironmentTest.php
@@ -332,7 +332,7 @@ public function testAddRuntimeLoader()
             'func_string_named_args' => '{{ from_runtime_string(name="foo") }}',
         ]);
 
-        $twig = new Environment($loader);
+        $twig = new Environment($loader, ['autoescape' => false]);
         $twig->addExtension(new EnvironmentTest_ExtensionWithoutRuntime());
         $twig->addRuntimeLoader($runtimeLoader);