10000 feature #51626 [TwigBridge][TwigBundle] Drop support for Twig 2 (derr… · symfony/symfony@0839d5a · GitHub
[go: up one dir, main page]
Skip to content

Commit 0839d5a

Browse files
nicolas-grekasnicolas-grekas
committed
feature #51626 [TwigBridge][TwigBundle] Drop support for Twig 2 (derrabus)
This PR was merged into the 7.0 branch. Discussion ---------- [TwigBridge][TwigBundle] Drop support for Twig 2 | Q | A | ------------- | --- | Branch? | 7.0 | Bug fix? | no | New feature? | yes | Deprecations? | no | Tickets | N/A | License | MIT | Doc PR | N/A Let's make our lives easier and only support one major version of Twig in the future. Upgrading projects from Twig 2 to 3 shouldn't be much trouble anyway. Commits ------- 2746e9a Drop support for Twig 2
2 parents cc2a148 + 2746e9a commit 0839d5a

File tree

11 files changed

+16
-9
lines changed

11 files changed

+16
-9
lines changed

‎UPGRADE-7.0.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -462,6 +462,7 @@ TwigBundle
462462
* Remove option `twig.autoescape`; create a class that implements your escaping strategy
463463
(check `FileExtensionEscapingStrategy::guess()` for inspiration) and reference it using
464464
the `twig.autoescape_service` option instead
465+
* Drop support for Twig 2
465466

466467
Validator
467468
---------

‎composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
"ext-xml": "*",
3939
"doctrine/event-manager": "^2",
4040
"doctrine/persistence": "^3.1",
41-
"twig/twig": "^2.13|^3.0.4",
41+
"twig/twig": "^3.0.4",
4242
"psr/cache": "^2.0|^3.0",
4343
"psr/clock": "^1.0",
4444
"psr/container": "^1.1|^2.0",

‎src/Symfony/Bridge/Twig/CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
1 8000 1
CHANGELOG
22
=========
33

4+
7.0
5+
---
6+
7+
* Drop support for Twig 2
8+
49
6.3
510
---
611

‎src/Symfony/Bridge/Twig/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"require": {
1919
"php": ">=8.2",
2020
"symfony/translation-contracts": "^2.5|^3",
21-
"twig/twig": "^2.13|^3.0.4"
21+
"twig/twig": "^3.0.4"
2222
},
2323
"require-dev": {
2424
"egulias/email-validator": "^2.1.10|^3|^4",

‎src/Symfony/Bundle/FrameworkBundle/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
"symfony/uid": "^6.4|^7.0",
7171
"symfony/web-link": "^6.4|^7.0",
7272
"phpdocumentor/reflection-docblock": "^3.0|^4.0|^5.0",
73-
"twig/twig": "^2.10|^3.0"
73+
"twig/twig": "^3.0.4"
7474
},
7575
"conflict": {
7676
"doctrine/persistence": "<1.3",

‎src/Symfony/Bundle/SecurityBundle/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
"symfony/twig-bridge": "^6.4|^7.0",
5050
"symfony/validator": "^6.4|^7.0",
5151
"symfony/yaml": "^6.4|^7.0",
52-
"twig/twig": "^2.13|^3.0.4",
52+
"twig/twig": "^3.0.4",
5353
"web-token/jwt-checker": "^3.1",
5454
"web-token/jwt-signature-algorithm-hmac": "^3.1",
5555
"web-token/jwt-signature-algorithm-ecdsa": "^3.1",

‎src/Symfony/Bundle/TwigBundle/CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ CHANGELOG
88
* Remove option `twig.autoescape`; create a class that implements your escaping strategy
99
(check `FileExtensionEscapingStrategy::guess()` for inspiration) and reference it using
1010
the `twig.autoescape_service` option instead
11+
* Drop support for Twig 2
1112

1213
6.4
1314
---

‎src/Symfony/Bundle/TwigBundle/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"symfony/twig-bridge": "^6.4|^7.0",
2424
"symfony/http-foundation": "^6.4|^7.0",
2525
"symfony/http-kernel": "^6.4|^7.0",
26-
"twig/twig": "^2.13|^3.0.4"
26+
"twig/twig": "^3.0.4"
2727
},
2828
"require-dev": {
2929
"symfony/asset": "^6.4|^7.0",

‎src/Symfony/Bundle/WebProfilerBundle/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"symfony/http-kernel": "^6.4|^7.0",
2323
"symfony/routing": "^6.4|^7.0",
2424
"symfony/twig-bundle": "^6.4|^7.0",
25-
"twig/twig": "^2.13|^3.0.4"
25+
"twig/twig": "^3.0.4"
2626
},
2727
"require-dev": {
2828
"symfony/browser-kit": "^6.4|^7.0",

‎src/Symfony/Component/HttpKernel/composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
"symfony/validator": "^6.4|^7.0",
4646
"symfony/var-exporter": "^6.4|^7.0",
4747
"psr/cache": "^1.0|^2.0|^3.0",
48-
"twig/twig": "^2.13|^3.0.4"
48+
"twig/twig": "^3.0.4"
4949
},
5050
"provide": {
5151
"psr/log-implementation": "1.0|2.0|3.0"
@@ -67,7 +67,7 @@
6767
"symfony/twig-bridge": "<6.4",
6868
"symfony/validator": "<6.4",
6969
"symfony/var-dumper": "<6.4",
70-
"twig/twig": "<2.13"
70+
"twig/twig": "<3.0.4"
7171
},
7272
"autoload": {
7373
"psr-4": { "Symfony\\Component\\HttpKernel\\": "" },

‎src/Symfony/Component/VarDumper/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"symfony/http-kernel": "^6.4|^7.0",
2626
"symfony/process": "^6.4|^7.0",
2727
"symfony/uid": "^6.4|^7.0",
28-
"twig/twig": "^2.13|^3.0.4"
28+
"twig/twig": "^3.0.4"
2929
},
3030
"conflict": {
3131
"symfony/console": "<6.4"

0 commit comments

Comments
 (0)
0