From ad1848cf0c1aee338c2fb4bd3354fab2757a9689 Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Tue, 7 Nov 2023 15:57:07 +0100 Subject: [PATCH] [WebProfilerBundle][TwigBundle] Add conflicts with 7.0 --- src/Symfony/Bundle/TwigBundle/composer.json | 2 +- src/Symfony/Bundle/WebProfilerBundle/composer.json | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/Symfony/Bundle/TwigBundle/composer.json b/src/Symfony/Bundle/TwigBundle/composer.json index 9d7cc32a2ee15..9094536e3ba82 100644 --- a/src/Symfony/Bundle/TwigBundle/composer.json +++ b/src/Symfony/Bundle/TwigBundle/composer.json @@ -20,7 +20,7 @@ "composer-runtime-api": ">=2.1", "symfony/config": "^6.1|^7.0", "symfony/dependency-injection": "^6.1|^7.0", - "symfony/twig-bridge": "^6.4|^7.0", + "symfony/twig-bridge": "^6.4", "symfony/http-foundation": "^5.4|^6.0|^7.0", "symfony/http-kernel": "^6.2", "twig/twig": "^2.13|^3.0.4" diff --git a/src/Symfony/Bundle/WebProfilerBundle/composer.json b/src/Symfony/Bundle/WebProfilerBundle/composer.json index 9a6a8c357d4e4..29c07e65866cb 100644 --- a/src/Symfony/Bundle/WebProfilerBundle/composer.json +++ b/src/Symfony/Bundle/WebProfilerBundle/composer.json @@ -21,7 +21,7 @@ "symfony/framework-bundle": "^6.4|^7.0", "symfony/http-kernel": "^6.4|^7.0", "symfony/routing": "^5.4|^6.0|^7.0", - "symfony/twig-bundle": "^5.4|^6.0|^7.0", + "symfony/twig-bundle": "^5.4|^6.0", "twig/twig": "^2.13|^3.0.4" }, "require-dev": { @@ -33,7 +33,8 @@ "conflict": { "symfony/form": "<5.4", "symfony/mailer": "<5.4", - "symfony/messenger": "<5.4" + "symfony/messenger": "<5.4", + "symfony/twig-bundle": ">=7.0" }, "autoload": { "psr-4": { "Symfony\\Bundle\\WebProfilerBundle\\": "" },