Skip to content

Commit ad1848c

Browse files
[WebProfilerBundle][TwigBundle] Add conflicts with 7.0
1 parent 2196b67 commit ad1848c

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

src/Symfony/Bundle/TwigBundle/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"composer-runtime-api": ">=2.1",
2121
"symfony/config": "^6.1|^7.0",
2222
"symfony/dependency-injection": "^6.1|^7.0",
23-
"symfony/twig-bridge": "^6.4|^7.0",
23+
"symfony/twig-bridge": "^6.4",
2424
"symfony/http-foundation": "^5.4|^6.0|^7.0",
2525
"symfony/http-kernel": "^6.2",
2626
"twig/twig": "^2.13|^3.0.4"

src/Symfony/Bundle/WebProfilerBundle/composer.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"symfony/framework-bundle": "^6.4|^7.0",
2222
"symfony/http-kernel": "^6.4|^7.0",
2323
"symfony/routing": "^5.4|^6.0|^7.0",
24-
"symfony/twig-bundle": "^5.4|^6.0|^7.0",
24+
"symfony/twig-bundle": "^5.4|^6.0",
2525
"twig/twig": "^2.13|^3.0.4"
2626
},
2727
"require-dev": {
@@ -33,7 +33,8 @@
3333
"conflict": {
3434
"symfony/form": "<5.4",
3535
"symfony/mailer": "<5.4",
36-
"symfony/messenger": "<5.4"
36+
"symfony/messenger": "<5.4",
37+
"symfony/twig-bundle": ">=7.0"
3738
},
3839
"autoload": {
3940
"psr-4": { "Symfony\\Bundle\\WebProfilerBundle\\": "" },

0 commit comments

Comments
 (0)