minor #52484 [TwigBundle][WebProfilerBundle] Add conflicts with 7.0 (nicolas-grekas)

nicolas-grekas · nicolas-grekas · commit e434a546caf9 · 2023-11-07T16:08:13.000+01:00
This PR was merged into the 6.4 branch. Discussion ---------- [TwigBundle][WebProfilerBundle] Add conflicts with 7.0 | Q | A | ------------- | --- | Branch? | 6.4 | Bug fix? | no | New feature? | no | Deprecations? | no | Issues | - | License | MIT Preparing for #52483 Commits ------- ad1848c [WebProfilerBundle][TwigBundle] Add conflicts with 7.0
diff --git 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
@@ -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\\": "" },
