Skip to content

Commit 3185864

Browse files
trampgeektrampgeek
committed
Update Twig to 3.19.0 (security fix)
1 parent 16bdcd6 commit 3185864

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+552
-212
lines changed

‎vendor/composer/installed.json‎

Lines changed: 41 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -2,31 +2,31 @@
22
"packages": [
33
{
44
"name": "symfony/deprecation-contracts",
5-
"version": "v3.5.1",
6-
"version_normalized": "3.5.1.0",
5+
"version": "v3.6.0",
6+
"version_normalized": "3.6.0.0",
77
"source": {
88
"type": "git",
99
"url": "https://github.com/symfony/deprecation-contracts.git",
10-
"reference": "74c71c939a79f7d5bf3c1ce9f5ea37ba0114c6f6"
10+
"reference": "63afe740e99a13ba87ec199bb07bbdee937a5b62"
1111
},
1212
"dist": {
1313
"type": "zip",
14-
"url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/74c71c939a79f7d5bf3c1ce9f5ea37ba0114c6f6",
15-
"reference": "74c71c939a79f7d5bf3c1ce9f5ea37ba0114c6f6",
14+
"url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/63afe740e99a13ba87ec199bb07bbdee937a5b62",
15+
"reference": "63afe740e99a13ba87ec199bb07bbdee937a5b62",
1616
"shasum": ""
1717
},
1818
"require": {
1919
"php": ">=8.1"
2020
},
21-
"time": "2024-09-25T14:20:29+00:00",
21+
"time": "2024-09-25T14:21:43+00:00",
2222
"type": "library",
2323
"extra": {
2424
"thanks": {
2525
"url": "https://github.com/symfony/contracts",
2626
"name": "symfony/contracts"
2727
},
2828
"branch-alias": {
29-
"dev-main": "3.5-dev"
29+
"dev-main": "3.6-dev"
3030
}
3131
},
3232
"installation-source": "dist",
@@ -52,7 +52,7 @@
5252
"description": "A generic function and convention to trigger deprecation notices",
5353
"homepage": "https://symfony.com",
5454
"support": {
55-
"source": "https://github.com/symfony/deprecation-contracts/tree/v3.5.1"
55+
"source": "https://github.com/symfony/deprecation-contracts/tree/v3.6.0"
5656
},
5757
"funding": [
5858
{
@@ -72,8 +72,8 @@
7272
},
7373
{
7474
"name": "symfony/polyfill-ctype",
75-
"version": "v1.31.0",
76-
"version_normalized": "1.31.0.0",
75+
"version": "v1.33.0",
76+
"version_normalized": "1.33.0.0",
7777
"source": {
7878
"type": "git",
7979
"url": "https://github.com/symfony/polyfill-ctype.git",
@@ -134,7 +134,7 @@
134134
"portable"
135135
],
136136
"support": {
137-
"source": "https://github.com/symfony/polyfill-ctype/tree/v1.31.0"
137+
"source": "https://github.com/symfony/polyfill-ctype/tree/v1.33.0"
138138
},
139139
"funding": [
140140
{
@@ -145,6 +145,10 @@
145145
"url": "https://github.com/fabpot",
146146
"type": "github"
147147
},
148+
{
149+
"url": "https://github.com/nicolas-grekas",
150+
"type": "github"
151+
},
148152
{
149153
"url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
150154
"type": "tidelift"
@@ -154,20 +158,21 @@
154158
},
155159
{
156160
"name": "symfony/polyfill-mbstring",
157-
"version": "v1.31.0",
158-
"version_normalized": "1.31.0.0",
161+
"version": "v1.33.0",
162+
"version_normalized": "1.33.0.0",
159163
"source": {
160164
"type": "git",
161165
"url": "https://github.com/symfony/polyfill-mbstring.git",
162-
"reference": "85181ba99b2345b0ef10ce42ecac37612d9fd341"
166+
"reference": "6d857f4d76bd4b343eac26d6b539585d2bc56493"
163167
},
164168
"dist": {
165169
"type": "zip",
166-
"url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/85181ba99b2345b0ef10ce42ecac37612d9fd341",
167-
"reference": "85181ba99b2345b0ef10ce42ecac37612d9fd341",
170+
"url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/6d857f4d76bd4b343eac26d6b539585d2bc56493",
171+
"reference": "6d857f4d76bd4b343eac26d6b539585d2bc56493",
168172
"shasum": ""
169173
},
170174
"require": {
175+
"ext-iconv": "*",
171176
"php": ">=7.2"
172177
},
173178
"provide": {
@@ -176,7 +181,7 @@
176181
"suggest": {
177182
"ext-mbstring": "For best performance"
178183
},
179-
"time": "2024-09-09T11:45:10+00:00",
184+
"time": "2024-12-23T08:48:59+00:00",
180185
"type": "library",
181186
"extra": {
182187
"thanks": {
@@ -217,7 +222,7 @@
217222
"shim"
218223
],
219224
"support": {
220-
"source": "https://github.com/symfony/polyfill-mbstring/tree/v1.31.0"
225+
"source": "https://github.com/symfony/polyfill-mbstring/tree/v1.33.0"
221226
},
222227
"funding": [
223228
{
@@ -228,6 +233,10 @@
228233
"url": "https://github.com/fabpot",
229234
"type": "github"
230235
},
236+
{
237+
"url": "https://github.com/nicolas-grekas",
238+
"type": "github"
239+
},
231240
{
232241
"url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
233242
"type": "tidelift"
@@ -237,8 +246,8 @@
237246
},
238247
{
239248
"name": "symfony/polyfill-php81",
240-
"version": "v1.31.0",
241-
"version_normalized": "1.31.0.0",
249+
"version": "v1.33.0",
250+
"version_normalized": "1.33.0.0",
242251
"source": {
243252
"type": "git",
244253
"url": "https://github.com/symfony/polyfill-php81.git",
@@ -296,7 +305,7 @@
296305
"shim"
297306
],
298307
"support": {
299-
"source": "https://github.com/symfony/polyfill-php81/tree/v1.31.0"
308+
"source": "https://github.com/symfony/polyfill-php81/tree/v1.33.0"
300309
},
301310
"funding": [
302311
{
@@ -307,6 +316,10 @@
307316
"url": "https://github.com/fabpot",
308317
"type": "github"
309318
},
319+
{
320+
"url": "https://github.com/nicolas-grekas",
321+
"type": "github"
322+
},
310323
{
311324
"url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
312325
"type": "tidelift"
@@ -316,17 +329,17 @@
316329
},
317330
{
318331
"name": "twig/twig",
319-
"version": "v3.18.0",
320-
"version_normalized": "3.18.0.0",
332+
"version": "v3.19.0",
333+
"version_normalized": "3.19.0.0",
321334
"source": {
322335
"type": "git",
323336
"url": "https://github.com/twigphp/Twig.git",
324-
"reference": "acffa88cc2b40dbe42eaf3a5025d6c0d4600cc50"
337+
"reference": "d4f8c2b86374f08efc859323dbcd95c590f7124e"
325338
},
326339
"dist": {
327340
"type": "zip",
328-
"url": "https://api.github.com/repos/twigphp/Twig/zipball/acffa88cc2b40dbe42eaf3a5025d6c0d4600cc50",
329-
"reference": "acffa88cc2b40dbe42eaf3a5025d6c0d4600cc50",
341+
"url": "https://api.github.com/repos/twigphp/Twig/zipball/d4f8c2b86374f08efc859323dbcd95c590f7124e",
342+
"reference": "d4f8c2b86374f08efc859323dbcd95c590f7124e",
330343
"shasum": ""
331344
},
332345
"require": {
@@ -341,7 +354,7 @@
341354
"psr/container": "^1.0|^2.0",
342355
"symfony/phpunit-bridge": "^5.4.9|^6.4|^7.0"
343356
},
344-
"time": "2024-12-29T10:51:50+00:00",
357+
"time": "2025-01-29T07:06:14+00:00",
345358
"type": "library",
346359
"installation-source": "dist",
347360
"autoload": {
@@ -383,7 +396,7 @@
383396
],
384397
"support": {
385398
"issues": "https://github.com/twigphp/Twig/issues",
386-
"source": "https://github.com/twigphp/Twig/tree/v3.18.0"
399+
"source": "https://github.com/twigphp/Twig/tree/v3.19.0"
387400
},
388401
"funding": [
389402
{

‎vendor/composer/installed.php‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
'name' => '__root__',
44
'pretty_version' => 'dev-master',
55
'version' => 'dev-master',
6-
'reference' => 'dba567fd852f1adc30041ddab8d623ddff8eb29e',
6+
'reference' => '16bdcd6be1a445519fe0d1ca44fd87f2ad925cef',
77
'type' => 'library',
88
'install_path' => __DIR__ . '/../../',
99
'aliases' => array(),
@@ -13,52 +13,52 @@
1313
'__root__' => array(
1414
'pretty_version' => 'dev-master',
1515
'version' => 'dev-master',
16-
'reference' => 'dba567fd852f1adc30041ddab8d623ddff8eb29e',
16+
'reference' => '16bdcd6be1a445519fe0d1ca44fd87f2ad925cef',
1717
'type' => 'library',
1818
'install_path' => __DIR__ . '/../../',
1919
'aliases' => array(),
2020
'dev_requirement' => false,
2121
),
2222
'symfony/deprecation-contracts' => array(
23-
'pretty_version' => 'v3.5.1',
24-
'version' => '3.5.1.0',
25-
'reference' => '74c71c939a79f7d5bf3c1ce9f5ea37ba0114c6f6',
23+
'pretty_version' => 'v3.6.0',
24+
'version' => '3.6.0.0',
25+
'reference' => '63afe740e99a13ba87ec199bb07bbdee937a5b62',
2626
'type' => 'library',
2727
'install_path' => __DIR__ . '/../symfony/deprecation-contracts',
2828
'aliases' => array(),
2929
'dev_requirement' => false,
3030
),
3131
'symfony/polyfill-ctype' => array(
32-
'pretty_version' => 'v1.31.0',
33-
'version' => '1.31.0.0',
32+
'pretty_version' => 'v1.33.0',
33+
'version' => '1.33.0.0',
3434
'reference' => 'a3cc8b044a6ea513310cbd48ef7333b384945638',
3535
'type' => 'library',
3636
'install_path' => __DIR__ . '/../symfony/polyfill-ctype',
3737
'aliases' => array(),
3838
'dev_requirement' => false,
3939
),
4040
'symfony/polyfill-mbstring' => array(
41-
'pretty_version' => 'v1.31.0',
42-
'version' => '1.31.0.0',
43-
'reference' => '85181ba99b2345b0ef10ce42ecac37612d9fd341',
41+
'pretty_version' => 'v1.33.0',
42+
'version' => '1.33.0.0',
43+
'reference' => '6d857f4d76bd4b343eac26d6b539585d2bc56493',
4444
'type' => 'library',
4545
'install_path' => __DIR__ . '/../symfony/polyfill-mbstring',
4646
'aliases' => array(),
4747
'dev_requirement' => false,
4848
),
4949
'symfony/polyfill-php81' => array(
50-
'pretty_version' => 'v1.31.0',
51-
'version' => '1.31.0.0',
50+
'pretty_version' => 'v1.33.0',
51+
'version' => '1.33.0.0',
5252
'reference' => '4a4cfc2d253c21a5ad0e53071df248ed48c6ce5c',
5353
'type' => 'library',
5454
'install_path' => __DIR__ . '/../symfony/polyfill-php81',
5555
'aliases' => array(),
5656
'dev_requirement' => false,
5757
),
5858
'twig/twig' => array(
59-
'pretty_version' => 'v3.18.0',
60-
'version' => '3.18.0.0',
61-
'reference' => 'acffa88cc2b40dbe42eaf3a5025d6c0d4600cc50',
59+
'pretty_version' => 'v3.19.0',
60+
'version' => '3.19.0.0',
61+
'reference' => 'd4f8c2b86374f08efc859323dbcd95c590f7124e',
6262
'type' => 'library',
6363
'install_path' => __DIR__ . '/../twig/twig',
6464
'aliases' => array(),

‎vendor/symfony/deprecation-contracts/composer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"minimum-stability": "dev",
2626
"extra": {
2727
"branch-alias": {
28-
"dev-main": "3.5-dev"
28+
"dev-main": "3.6-dev"
2929
},
3030
"thanks": {
3131
"name": "symfony/contracts",

‎vendor/symfony/polyfill-mbstring/Mbstring.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -983,7 +983,7 @@ public static function mb_ltrim(string $string, ?string $characters = null, ?str
983983

984984
public static function mb_rtrim(string $string, ?string $characters = null, ?string $encoding = null): string
985985
{
986-
return self::mb_internal_trim('{[%s]+$}D', $string, $characters, $encoding, __FUNCTION__);
986+
return self::mb_internal_trim('{[%s]+$}Du', $string, $characters, $encoding, __FUNCTION__);
987987
}
988988

989989
private static function mb_internal_trim(string $regex, string $string, ?string $characters, ?string $encoding, string $function): string

‎vendor/symfony/polyfill-mbstring/bootstrap80.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,11 +133,11 @@ function mb_str_pad(string $string, int $length, string $pad_string = ' ', int $
133133
}
134134

135135
if (!function_exists('mb_ucfirst')) {
136-
function mb_ucfirst($string, ?string $encoding = null): string { return p\Mbstring::mb_ucfirst($string, $encoding); }
136+
function mb_ucfirst(string $string, ?string $encoding = null): string { return p\Mbstring::mb_ucfirst($string, $encoding); }
137137
}
138138

139139
if (!function_exists('mb_lcfirst')) {
140-
function mb_lcfirst($string, ?string $encoding = null): string { return p\Mbstring::mb_lcfirst($string, $encoding); }
140+
function mb_lcfirst(string $string, ?string $encoding = null): string { return p\Mbstring::mb_lcfirst($string, $encoding); }
141141
}
142142

143143
if (!function_exists('mb_trim')) {

‎vendor/symfony/polyfill-mbstring/composer.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@
1616
}
1717
],
1818
"require": {
19-
"php": ">=7.2"
19+
"php": ">=7.2",
20+
"ext-iconv": "*"
2021
},
2122
"provide": {
2223
"ext-mbstring": "*"

‎vendor/twig/twig/CHANGELOG‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,18 @@
1+
# 3.19.0 (2025-01-28)
2+
3+
* Fix a security issue where escaping was missing when using `??`
4+
* Deprecate `Token::getType()`, use `Token::test()` instead
5+
* Add `Token::toEnglish()`
6+
* Add `ForElseNode`
7+
* Deprecate `Twig\ExpressionParser::parseOnlyArguments()` and
8+
`Twig\ExpressionParser::parseArguments()` (use
9+
`Twig\ExpressionParser::parseNamedArguments()` instead)
10+
* Fix `constant()` behavior when used with `??`
11+
* Add the `invoke` filter
12+
* Make `{}` optional for the `types` tag
13+
* Add `LastModifiedExtensionInterface` and implementation in `AbstractExtension` to track modification of runtime classes
14+
* Ignore static properties when using the dot operator
15+
116
# 3.18.0 (2024-12-29)
217

318
* Fix unary operator precedence change

‎vendor/twig/twig/phpstan-baseline.neon‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,6 @@ parameters:
66
count: 1
77
path: src/Extension/CoreExtension.php
88

9-
- # Avoid BC-break
10-
message: '#^Constructor of class Twig\\Node\\ForNode has an unused parameter \$ifexpr\.$#'
11-
identifier: constructor.unusedParameter
12-
count: 1
13-
path: src/Node/ForNode.php
14-
159
- # 2 parameters will be required
1610
message: '#^Method Twig\\Node\\IncludeNode\:\:addGetTemplate\(\) invoked with 2 parameters, 1 required\.$#'
1711
identifier: arguments.count

‎vendor/twig/twig/src/AbstractTwigCallable.php‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,9 @@ public function getDynamicName(): string
7979
return $this->dynamicName;
8080
}
8181

82+
/**
83+
* @return callable|array{class-string, string}|null
84+
*/
8285
public function getCallable()
8386
{
8487
return $this->callable;

0 commit comments

Comments
 (0)