OXDEV-9925 Fix deprecations

Author: moritzdemmer

CHANGELOG-3.x.md

@@ -2,8 +2,13 @@
 
 ## v3.0.0-alpha.2 - Unreleased
 
+### Removed
+- Deprecated Twig APIs
+
 ### Changed
-- `TemplateChain` DTO `getByModuleId` and `getParent` methods returns `null` when no matching result is found
+- `TemplateChain` DTO `getByModuleId` and `getParent` methods return `null` when no matching result is found
+- Escaper registration uses `EscaperRuntime`
+- Token parsing aligned with Twig deprecations
 
 ## v3.0.0-alpha.1 - 2025-02-03
 

services.yaml

@@ -253,8 +253,8 @@ services:
     class: OxidEsales\Twig\TwigEngine
     arguments:
       $engine: '@twig'
-      $twigExtensions: !tagged twig.extension
-      $twigEscaper: !tagged twig.escaper
+      $twigExtensions: !tagged_iterator twig.extension
+      $twigEscaper: !tagged_iterator twig.escaper
     public: false
 
   OxidEsales\Twig\Resolver\TemplateChain\TemplateChainResolverInterface:

src/Escaper/DecEntityEscaper.php

@@ -9,8 +9,6 @@
 
 namespace OxidEsales\Twig\Escaper;
 
-use Twig\Environment;
-
 class DecEntityEscaper implements EscaperInterface
 {
     /**
@@ -21,14 +19,7 @@ public function getStrategy(): string
         return 'decentity';
     }
 
-    /**
-     * @param Environment $environment
-     * @param string      $string
-     * @param string      $charset
-     *
-     * @return string
-     */
-    public function escape(Environment $environment, $string, $charset): string
+    public function escape(string $string, string $charset): string
     {
         $return = '';
 

src/Escaper/EscaperInterface.php

@@ -9,8 +9,6 @@
 
 namespace OxidEsales\Twig\Escaper;
 
-use Twig\Environment;
-
 interface EscaperInterface
 {
     /**
@@ -19,11 +17,8 @@ interface EscaperInterface
     public function getStrategy(): string;
 
     /**
-     * @param Environment $environment
-     * @param string      $string
-     * @param string      $charset
-     *
-     * @return string
+     * Escape a string for the given strategy.
+     * Matches Twig 3.10+ escaper callable signature (no Environment argument).
      */
-    public function escape(Environment $environment, $string, $charset): string;
+    public function escape(string $string, string $charset): string;
 }

src/Escaper/HexEntityEscaper.php

@@ -9,8 +9,6 @@
 
 namespace OxidEsales\Twig\Escaper;
 
-use Twig\Environment;
-
 class HexEntityEscaper implements EscaperInterface
 {
     /**
@@ -21,14 +19,7 @@ public function getStrategy(): string
         return 'hexentity';
     }
 
-    /**
-     * @param Environment $environment
-     * @param string      $string
-     * @param string      $charset
-     *
-     * @return string
-     */
-    public function escape(Environment $environment, $string, $charset): string
+    public function escape(string $string, string $charset): string
     {
         $return = '';
 

src/Escaper/HexEscaper.php

@@ -9,8 +9,6 @@
 
 namespace OxidEsales\Twig\Escaper;
 
-use Twig\Environment;
-
 class HexEscaper implements EscaperInterface
 {
     /**
@@ -23,14 +21,8 @@ public function getStrategy(): string
 
     /**
      * Escape every character into hex
-     *
-     * @param Environment $environment
-     * @param string      $string
-     * @param string      $charset
-     *
-     * @return string
      */
-    public function escape(Environment $environment, $string, $charset): string
+    public function escape(string $string, string $charset): string
     {
         $return = '';
 

src/Escaper/HtmlAllEscaper.php

@@ -9,8 +9,6 @@
 
 namespace OxidEsales\Twig\Escaper;
 
-use Twig\Environment;
-
 class HtmlAllEscaper implements EscaperInterface
 {
     /**
@@ -21,14 +19,7 @@ public function getStrategy(): string
         return 'htmlall';
     }
 
-    /**
-     * @param Environment $environment
-     * @param string      $string
-     * @param string      $charset
-     *
-     * @return string
-     */
-    public function escape(Environment $environment, $string, $charset): string
+    public function escape(string $string, string $charset): string
     {
         return htmlentities($string, ENT_QUOTES, $charset);
     }

src/Escaper/MailEscaper.php

@@ -9,8 +9,6 @@
 
 namespace OxidEsales\Twig\Escaper;
 
-use Twig\Environment;
-
 class MailEscaper implements EscaperInterface
 {
     /**
@@ -21,14 +19,7 @@ public function getStrategy(): string
         return 'mail';
     }
 
-    /**
-     * @param Environment $environment
-     * @param string      $string
-     * @param string      $charset
-     *
-     * @return string
-     */
-    public function escape(Environment $environment, $string, $charset): string
+    public function escape(string $string, string $charset): string
     {
         return str_replace(['@', '.'], [' [AT] ', ' [DOT] '], $string);
     }

src/Escaper/NonStdEscaper.php

@@ -9,8 +9,6 @@
 
 namespace OxidEsales\Twig\Escaper;
 
-use Twig\Environment;
-
 /**
  * Escape non-standard chars, such as ms document quotes
  */
@@ -26,14 +24,8 @@ public function getStrategy(): string
 
     /**
      * Escape non-standard chars, such as ms document quotes
-     *
-     * @param Environment $environment
-     * @param string      $string
-     * @param string      $charset
-     *
-     * @return string
      */
-    public function escape(Environment $environment, $string, $charset): string
+    public function escape(string $string, string $charset): string
     {
         $return = '';
 

src/Escaper/QuotesEscaper.php

@@ -9,8 +9,6 @@
 
 namespace OxidEsales\Twig\Escaper;
 
-use Twig\Environment;
-
 /**
  * Escape unescaped single quotes
  */
@@ -26,14 +24,8 @@ public function getStrategy(): string
 
     /**
      * Escape unescaped single quotes
-     *
-     * @param Environment $environment
-     * @param string      $string
-     * @param string      $charset
-     *
-     * @return string
      */
-    public function escape(Environment $environment, $string, $charset): string
+    public function escape(string $string, string $charset): string
     {
         return preg_replace("%(?<!\\\\)'%", "\\'", $string);
     }