From 66b42a5474c0c62873c85988f96c1d9b36997daa Mon Sep 17 00:00:00 2001 From: TheCartpenter Date: Thu, 16 May 2024 10:24:16 -0400 Subject: [PATCH] Upgraded twig/twig vendor to v3.10.3 release --- composer.lock | 12 ++++++------ .../system/storage/vendor/composer/installed.json | 14 +++++++------- .../system/storage/vendor/composer/installed.php | 10 +++++----- upload/system/storage/vendor/twig/twig/CHANGELOG | 4 ++++ .../storage/vendor/twig/twig/src/Environment.php | 6 +++--- .../vendor/twig/twig/src/Node/CaptureNode.php | 2 ++ 6 files changed, 27 insertions(+), 21 deletions(-) diff --git a/composer.lock b/composer.lock index a8ee144f1..b36cae086 100644 --- a/composer.lock +++ b/composer.lock @@ -1324,16 +1324,16 @@ }, { "name": "twig/twig", - "version": "v3.10.2", + "version": "v3.10.3", "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "7aaed0b8311a557cc8c4047a71fd03153a00e755" + "reference": "67f29781ffafa520b0bbfbd8384674b42db04572" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/7aaed0b8311a557cc8c4047a71fd03153a00e755", - "reference": "7aaed0b8311a557cc8c4047a71fd03153a00e755", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/67f29781ffafa520b0bbfbd8384674b42db04572", + "reference": "67f29781ffafa520b0bbfbd8384674b42db04572", "shasum": "" }, "require": { @@ -1387,7 +1387,7 @@ ], "support": { "issues": "https://github.com/twigphp/Twig/issues", - "source": "https://github.com/twigphp/Twig/tree/v3.10.2" + "source": "https://github.com/twigphp/Twig/tree/v3.10.3" }, "funding": [ { @@ -1399,7 +1399,7 @@ "type": "tidelift" } ], - "time": "2024-05-14T06:04:16+00:00" + "time": "2024-05-16T10:04:27+00:00" }, { "name": "zoujingli/wechat-developer", diff --git a/upload/system/storage/vendor/composer/installed.json b/upload/system/storage/vendor/composer/installed.json index 3f670cb68..067985337 100644 --- 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.2", - "version_normalized": "3.10.2.0", + "version": "v3.10.3", + "version_normalized": "3.10.3.0", "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "7aaed0b8311a557cc8c4047a71fd03153a00e755" + "reference": "67f29781ffafa520b0bbfbd8384674b42db04572" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/7aaed0b8311a557cc8c4047a71fd03153a00e755", - "reference": "7aaed0b8311a557cc8c4047a71fd03153a00e755", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/67f29781ffafa520b0bbfbd8384674b42db04572", + "reference": "67f29781ffafa520b0bbfbd8384674b42db04572", "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-14T06:04:16+00:00", + "time": "2024-05-16T10:04:27+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.2" + "source": "https://github.com/twigphp/Twig/tree/v3.10.3" }, "funding": [ { diff --git a/upload/system/storage/vendor/composer/installed.php b/upload/system/storage/vendor/composer/installed.php index aabf87d02..74137d160 100644 --- 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' => 'fb3356495459cd6a8e18d6b24484bfc35603aa5d', + 'reference' => '2b75a6b07442b051b64c400319fbf238b5e1c496', 'type' => 'project', 'install_path' => __DIR__ . '/../../../../../', 'aliases' => array(), @@ -67,7 +67,7 @@ 'opencart/opencart-3' => array( 'pretty_version' => 'dev-main', 'version' => 'dev-main', - 'reference' => 'fb3356495459cd6a8e18d6b24484bfc35603aa5d', + 'reference' => '2b75a6b07442b051b64c400319fbf238b5e1c496', 'type' => 'project', 'install_path' => __DIR__ . '/../../../../../', 'aliases' => array(), @@ -200,9 +200,9 @@ 'dev_requirement' => false, ), 'twig/twig' => array( - 'pretty_version' => 'v3.10.2', - 'version' => '3.10.2.0', - 'reference' => '7aaed0b8311a557cc8c4047a71fd03153a00e755', + 'pretty_version' => 'v3.10.3', + 'version' => '3.10.3.0', + 'reference' => '67f29781ffafa520b0bbfbd8384674b42db04572', '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 index 1d68f7c80..aecaab239 100644 --- a/upload/system/storage/vendor/twig/twig/CHANGELOG +++ b/upload/system/storage/vendor/twig/twig/CHANGELOG @@ -1,3 +1,7 @@ +# 3.10.3 (2024-05-16) + + * Fix missing ; in generated code + # 3.10.2 (2024-05-14) * Fix support for the deprecated escaper signature diff --git a/upload/system/storage/vendor/twig/twig/src/Environment.php b/upload/system/storage/vendor/twig/twig/src/Environment.php index d3f7763e2..b035249b0 100644 --- 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.2'; - public const VERSION_ID = 301002; + public const VERSION = '3.10.3'; + public const VERSION_ID = 301003; public const MAJOR_VERSION = 3; public const MINOR_VERSION = 10; - public const RELEASE_VERSION = 2; + public const RELEASE_VERSION = 3; public const EXTRA_VERSION = ''; private $charset; diff --git a/upload/system/storage/vendor/twig/twig/src/Node/CaptureNode.php b/upload/system/storage/vendor/twig/twig/src/Node/CaptureNode.php index 2b2bc0970..b1cb357f5 100644 --- a/upload/system/storage/vendor/twig/twig/src/Node/CaptureNode.php +++ b/upload/system/storage/vendor/twig/twig/src/Node/CaptureNode.php @@ -50,6 +50,8 @@ public function compile(Compiler $compiler): void } if (!$this->getAttribute('raw')) { $compiler->raw(") ? '' : new Markup(\$tmp, \$this->env->getCharset());"); + } else { + $compiler->raw(';'); } } }