8000 [TwigBridge][TwigBundle] Drop support for Twig 2 by derrabus · Pull Request #51626 · symfony/symfony · GitHub
[go: up one dir, main page]
Skip to content

[TwigBridge][TwigBundle] Drop support for Twig 2 #51626

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 11, 2023
Merged

[TwigBridge][TwigBundle] Drop support for Twig 2 #51626

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions UPGRADE-7.0.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -462,6 +462,7 @@ TwigBundle
* Remove option `twig.autoescape`; create a class that implements your escaping strategy
(check `FileExtensionEscapingStrategy::guess()` for inspiration) and reference it using
the `twig.autoescape_service` option instead
* Drop support for Twig 2

Validator
---------
Expand Down
2 changes: 1 addition & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
"ext-xml": "*",
"doctrine/event-manager": "^2",
"doctrine/persistence": "^3.1",
"twig/twig": "^2.13|^3.0.4",
"twig/twig": "^3.0.4",
"psr/cache": "^2.0|^3.0",
"psr/clock": "^1.0",
"psr/container": "^1.1|^2.0",
Expand Down
5 changes: 5 additions & 0 deletions src/Symfony/Bridge/Twig/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
CHANGELOG
=========

7.0
---

* Drop support for Twig 2

6.3
---

Expand Down
2 changes: 1 addition & 1 deletion src/Symfony/Bridge/Twig/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"require": {
"php": ">=8.2",
"symfony/translation-contracts": "^2.5|^3",
"twig/twig": "^2.13|^3.0.4"
"twig/twig": "^3.0.4"
},
"require-dev": {
"egulias/email-validator": "^2.1.10|^3|^4",
Expand Down
2 changes: 1 addition & 1 deletion src/Symfony/Bundle/FrameworkBundle/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
"symfony/uid": "^6.4|^7.0",
"symfony/web-link": "^6.4|^7.0",
"phpdocumentor/reflection-docblock": "^3.0|^4.0|^5.0",
"twig/twig": "^2.10|^3.0"
"twig/twig": "^3.0.4"
},
"conflict": {
"doctrine/persistence": "<1.3",
Expand Down
2 changes: 1 addition & 1 deletion src/Symfony/Bundle/SecurityBundle/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
"symfony/twig-bridge": "^6.4|^7.0",
"symfony/validator": "^6.4|^7.0",
"symfony/yaml": "^6.4|^7.0",
"twig/twig": "^2.13|^3.0.4",
"twig/twig": "^3.0.4",
"web-token/jwt-checker": "^3.1",
"web-token/jwt-signature-algorithm-hmac": "^3.1",
"web-token/jwt-signature-algorithm-ecdsa": "^3.1",
Expand Down
1 change: 1 addition & 0 deletions src/Symfony/Bundle/TwigBundle/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ CHANGELOG
* Remove option `twig.autoescape`; create a class that implements your escaping strategy
(check `FileExtensionEscapingStrategy::guess()` for inspiration) and reference it using
the `twig.autoescape_service` option instead
* Drop support for Twig 2

6.4
---
Expand Down
2 changes: 1 addition & 1 deletion src/Symfony/Bundle/TwigBundle/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"symfony/twig-bridge": "^6.4|^7.0",
"symfony/http-foundation": "^6.4|^7.0",
"symfony/http-kernel": "^6.4|^7.0",
"twig/twig": "^2.13|^3.0.4"
"twig/twig": "^3.0.4"
},
"require-dev": {
"symfony/asset": "^6.4|^7.0",
Expand Down
2 changes: 1 addition & 1 deletion src/Symfony/Bundle/WebProfilerBundle/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"symfony/http-kernel": "^6.4|^7.0",
"symfony/routing": "^6.4|^7.0",
"symfony/twig-bundle": "^6.4|^7.0",
"twig/twig": "^2.13|^3.0.4"
"twig/twig": "^3.0.4"
},
"require-dev": {
"symfony/browser-kit": "^6.4|^7.0",
Expand Down
4 changes: 2 additions & 2 deletions src/Symfony/Component/HttpKernel/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
"symfony/validator": "^6.4|^7.0",
"symfony/var-exporter": "^6.4|^7.0",
"psr/cache": "^1.0|^2.0|^3.0",
"twig/twig": "^2.13|^3.0.4"
"twig/twig": "^3.0.4"
},
"provide": {
"psr/log-implementation": "1.0|2.0|3.0"
Expand All @@ -67,7 +67,7 @@
"symfony/twig-bridge": "<6.4",
"symfony/validator": "<6.4",
"symfony/var-dumper": "<6.4",
"twig/twig": "<2.13"
"twig/twig": "<3.0.4"
},
"autoload": {
"psr-4": { "Symfony\\Component\\HttpKernel\\": "" },
Expand Down
2 changes: 1 addition & 1 deletion src/Symfony/Component/VarDumper/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"symfony/http-kernel": "^6.4|^7.0",
"symfony/process": "^6.4|^7.0",
"symfony/uid": "^6.4|^7.0",
"twig/twig": "^2.13|^3.0.4"
"twig/twig": "^3.0.4"
Copy link
Member

Choose a reason for hiding this comment

The reason will be display BD40 ed to describe this comment to others. Learn more.

should this add the conflict rule ?

Copy link
Member Author
@derrabus derrabus Sep 11, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure. It didn't have one before and I don't know why that is.

Copy link
Member
@GromNaN GromNaN Sep 11, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The code that depends on twig is very robust.

symfony/src/Symfony/Component/VarDumper/Caster/ExceptionCaster.php

Line 238 in d8a4b3c

if (!empty($f['class']) && (is_subclass_of($f['class'], 'Twig\Template') || is_subclass_of($f['class'], 'Twig_Template')) && method_exists($f['class'], 'getDebugInfo')) {

},
"conflict": {
"symfony/console": "<6.4"
Expand Down
0