Upgraded twig/twig to v3.10.2 release

opencart · May 14, 2024 · fb33564 · fb33564
1 parent ddccf79
commit fb33564
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 25 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/upload/system/storage/vendor/composer/installed.json b/upload/system/storage/vendor/composer/installed.json
@@ -1368,17 +1368,17 @@
         },
         {
             "name": "twig/twig",
-            "version": "v3.10.1",
-            "version_normalized": "3.10.1.0",
+            "version": "v3.10.2",
+            "version_normalized": "3.10.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/twigphp/Twig.git",
-                "reference": "3af5ab2e52279e5e23dc192b1a26db3b8cffa4e7"
+                "reference": "7aaed0b8311a557cc8c4047a71fd03153a00e755"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/twigphp/Twig/zipball/3af5ab2e52279e5e23dc192b1a26db3b8cffa4e7",
-                "reference": "3af5ab2e52279e5e23dc192b1a26db3b8cffa4e7",
+                "url": "https://api.github.com/repos/twigphp/Twig/zipball/7aaed0b8311a557cc8c4047a71fd03153a00e755",
+                "reference": "7aaed0b8311a557cc8c4047a71fd03153a00e755",
                 "shasum": ""
             },
             "require": {
@@ -1392,7 +1392,7 @@
                 "psr/container": "^1.0|^2.0",
                 "symfony/phpunit-bridge": "^5.4.9|^6.4|^7.0"
             },
-            "time": "2024-05-12T06:16:18+00:00",
+            "time": "2024-05-14T06:04:16+00:00",
             "type": "library",
             "installation-source": "dist",
             "autoload": {
@@ -1434,7 +1434,7 @@
             ],
             "support": {
                 "issues": "https://github.com/twigphp/Twig/issues",
-                "source": "https://github.com/twigphp/Twig/tree/v3.10.1"
+                "source": "https://github.com/twigphp/Twig/tree/v3.10.2"
             },
             "funding": [
                 {

diff --git a/upload/system/storage/vendor/composer/installed.php b/upload/system/storage/vendor/composer/installed.php
@@ -3,7 +3,7 @@
         'name' => 'opencart/opencart-3',
         'pretty_version' => 'dev-main',
         'version' => 'dev-main',
-        'reference' => '51b9d650c6227cc07a542e1636ed3eac528a79e7',
+        'reference' => 'ddccf79445f32010c18c63f2b2a037a41e34b99e',
         'type' => 'project',
         'install_path' => __DIR__ . '/../../../../../',
         'aliases' => array(),
@@ -67,7 +67,7 @@
         'opencart/opencart-3' => array(
             'pretty_version' => 'dev-main',
             'version' => 'dev-main',
-            'reference' => '51b9d650c6227cc07a542e1636ed3eac528a79e7',
+            'reference' => 'ddccf79445f32010c18c63f2b2a037a41e34b99e',
             'type' => 'project',
             'install_path' => __DIR__ . '/../../../../../',
             'aliases' => array(),
@@ -200,9 +200,9 @@
             'dev_requirement' => false,
         ),
         'twig/twig' => array(
-            'pretty_version' => 'v3.10.1',
-            'version' => '3.10.1.0',
-            'reference' => '3af5ab2e52279e5e23dc192b1a26db3b8cffa4e7',
+            'pretty_version' => 'v3.10.2',
+            'version' => '3.10.2.0',
+            'reference' => '7aaed0b8311a557cc8c4047a71fd03153a00e755',
             'type' => 'library',
             'install_path' => __DIR__ . '/../twig/twig',
             'aliases' => array(),

diff --git a/upload/system/storage/vendor/twig/twig/CHANGELOG b/upload/system/storage/vendor/twig/twig/CHANGELOG
@@ -1,3 +1,7 @@
+# 3.10.2 (2024-05-14)
+
+ * Fix support for the deprecated escaper signature
+
 # 3.10.1 (2024-05-12)
 
  * Fix BC break on escaper extension

diff --git a/upload/system/storage/vendor/twig/twig/src/Environment.php b/upload/system/storage/vendor/twig/twig/src/Environment.php
@@ -43,11 +43,11 @@
  */
 class Environment
 {
-    public const VERSION = '3.10.1';
-    public const VERSION_ID = 301001;
+    public const VERSION = '3.10.2';
+    public const VERSION_ID = 301002;
     public const MAJOR_VERSION = 3;
     public const MINOR_VERSION = 10;
-    public const RELEASE_VERSION = 1;
+    public const RELEASE_VERSION = 2;
     public const EXTRA_VERSION = '';
 
     private $charset;

diff --git a/upload/system/storage/vendor/twig/twig/src/Extension/EscaperExtension.php b/upload/system/storage/vendor/twig/twig/src/Extension/EscaperExtension.php
@@ -117,8 +117,8 @@ public function getDefaultStrategy(string $name)
     /**
      * Defines a new escaper to be used via the escape filter.
      *
-     * @param string                        $strategy The strategy name that should be used as a strategy in the escape call
-     * @param callable(Environment, string) $callable A valid PHP callable
+     * @param string                                $strategy The strategy name that should be used as a strategy in the escape call
+     * @param callable(Environment, string, string) $callable A valid PHP callable
      *
      * @deprecated since Twig 3.10
      */
@@ -132,7 +132,7 @@ public function setEscaper($strategy, callable $callable)
 
         $this->escapers[$strategy] = $callable;
         $callable = function ($string, $charset) use ($callable) {
-            return $callable($this->environment, $string);
+            return $callable($this->environment, $string, $charset);
         };
 
         $this->escaper->setEscaper($strategy, $callable);
@@ -141,7 +141,7 @@ public function setEscaper($strategy, callable $callable)
     /**
      * Gets all defined escapers.
      *
-     * @return array<callable(Environment, string)> An array of escapers
+     * @return array<callable(Environment, string, string)> An array of escapers
      *
      * @deprecated since Twig 3.10
      */