Skip to content

Commit

Permalink
Updated twig/twig vendor to v3.10.3 release
Browse files Browse the repository at this point in the history
  • Loading branch information
TheCartpenter committed May 16, 2024
1 parent 0d5881f commit b40eb3f
Show file tree
Hide file tree
Showing 6 changed files with 27 additions and 21 deletions.
12 changes: 6 additions & 6 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 7 additions & 7 deletions upload/system/storage/vendor/composer/installed.json
Original file line number Diff line number Diff line change
Expand Up @@ -1177,17 +1177,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": {
Expand All @@ -1201,7 +1201,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": {
Expand Down Expand Up @@ -1243,7 +1243,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": [
{
Expand Down
10 changes: 5 additions & 5 deletions upload/system/storage/vendor/composer/installed.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
'name' => 'opencart/opencart',
'pretty_version' => 'dev-master',
'version' => 'dev-master',
'reference' => 'cab10efdf22995f2ba706ea9e25462ab85c7ea25',
'reference' => '0d5881f2ba0b205986429f588bd61964f55ee7a2',
'type' => 'project',
'install_path' => __DIR__ . '/../../../../../',
'aliases' => array(),
Expand Down Expand Up @@ -67,7 +67,7 @@
'opencart/opencart' => array(
'pretty_version' => 'dev-master',
'version' => 'dev-master',
'reference' => 'cab10efdf22995f2ba706ea9e25462ab85c7ea25',
'reference' => '0d5881f2ba0b205986429f588bd61964f55ee7a2',
'type' => 'project',
'install_path' => __DIR__ . '/../../../../../',
'aliases' => array(),
Expand Down Expand Up @@ -173,9 +173,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(),
Expand Down
4 changes: 4 additions & 0 deletions upload/system/storage/vendor/twig/twig/CHANGELOG
Original file line number Diff line number Diff line change
@@ -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
Expand Down
6 changes: 3 additions & 3 deletions upload/system/storage/vendor/twig/twig/src/Environment.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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(';');
}
}
}

0 comments on commit b40eb3f

Please sign in to comment.