From 6ce8173806238778c8fa7aff134dedbe4fa2f891 Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Wed, 27 Nov 2024 10:42:25 +0100 Subject: [PATCH] Remove conflicts with symfony/* from composer.json files --- src/Symfony/Bridge/Doctrine/composer.json | 13 +-------- src/Symfony/Bridge/Monolog/composer.json | 5 ---- .../Bridge/PsrHttpMessage/composer.json | 3 +- src/Symfony/Bridge/Twig/composer.json | 10 +------ src/Symfony/Bundle/DebugBundle/composer.json | 4 --- .../Bundle/FrameworkBundle/composer.json | 29 +------------------ .../Bundle/SecurityBundle/composer.json | 10 ------- src/Symfony/Bundle/TwigBundle/composer.json | 4 --- .../Bundle/WebProfilerBundle/composer.json | 6 ---- src/Symfony/Component/Asset/composer.json | 3 -- .../Component/AssetMapper/composer.json | 3 -- src/Symfony/Component/Cache/composer.json | 5 +--- src/Symfony/Component/Config/composer.json | 4 --- src/Symfony/Component/Console/composer.json | 7 ----- .../DependencyInjection/composer.json | 5 +--- src/Symfony/Component/Dotenv/composer.json | 4 --- .../Component/ErrorHandler/composer.json | 4 --- .../Component/EventDispatcher/composer.json | 4 --- src/Symfony/Component/Form/composer.json | 11 ------- .../Component/HttpClient/composer.json | 3 +- .../Component/HttpFoundation/composer.json | 3 +- .../Component/HttpKernel/composer.json | 16 ---------- src/Symfony/Component/Intl/composer.json | 3 -- src/Symfony/Component/Ldap/composer.json | 4 --- src/Symfony/Component/Lock/composer.json | 3 +- .../Mailer/Bridge/Brevo/composer.json | 3 -- .../Mailer/Bridge/Infobip/composer.json | 3 -- .../Mailer/Bridge/Mailchimp/composer.json | 3 -- .../Mailer/Bridge/Mailgun/composer.json | 3 -- .../Mailer/Bridge/Mailomat/composer.json | 3 -- .../Mailer/Bridge/Mailtrap/composer.json | 3 -- .../Mailer/Bridge/Postmark/composer.json | 3 -- .../Mailer/Bridge/Resend/composer.json | 3 -- .../Mailer/Bridge/Sendgrid/composer.json | 5 ---- .../Mailer/Bridge/Sweego/composer.json | 3 -- src/Symfony/Component/Mailer/composer.json | 7 ----- .../Messenger/Bridge/AmazonSqs/composer.json | 3 -- .../Messenger/Bridge/Doctrine/composer.json | 3 -- src/Symfony/Component/Messenger/composer.json | 8 ----- src/Symfony/Component/Mime/composer.json | 4 +-- .../Notifier/Bridge/Twilio/composer.json | 3 -- .../Notifier/Bridge/Twitter/composer.json | 3 -- src/Symfony/Component/Notifier/composer.json | 6 ---- .../Component/PasswordHasher/composer.json | 3 -- .../Component/PropertyInfo/composer.json | 3 +- src/Symfony/Component/Routing/composer.json | 5 ---- src/Symfony/Component/Runtime/composer.json | 3 -- .../Component/Security/Core/composer.json | 8 ----- .../Component/Security/Csrf/composer.json | 3 -- .../Component/Security/Http/composer.json | 7 ----- src/Symfony/Component/Semaphore/composer.json | 3 -- .../Component/Serializer/composer.json | 8 +---- src/Symfony/Component/String/composer.json | 3 -- .../Component/Translation/composer.json | 10 ------- src/Symfony/Component/TypeInfo/composer.json | 3 +- src/Symfony/Component/Validator/composer.json | 10 +------ src/Symfony/Component/VarDumper/composer.json | 3 -- src/Symfony/Component/WebLink/composer.json | 3 -- src/Symfony/Component/Workflow/composer.json | 3 -- src/Symfony/Component/Yaml/composer.json | 3 -- 60 files changed, 14 insertions(+), 302 deletions(-) diff --git a/src/Symfony/Bridge/Doctrine/composer.json b/src/Symfony/Bridge/Doctrine/composer.json index 1ca2abc4b13c4..96b7c0cc64265 100644 --- a/src/Symfony/Bridge/Doctrine/composer.json +++ b/src/Symfony/Bridge/Doctrine/composer.json @@ -53,18 +53,7 @@ "doctrine/collections": "<1.8", "doctrine/dbal": "<3.6", "doctrine/lexer": "<1.1", - "doctrine/orm": "<2.15", - "symfony/cache": "<6.4", - "symfony/dependency-injection": "<6.4", - "symfony/form": "<6.4.6|>=7,<7.0.6", - "symfony/http-foundation": "<6.4", - "symfony/http-kernel": "<6.4", - "symfony/lock": "<6.4", - "symfony/messenger": "<6.4", - "symfony/property-info": "<6.4", - "symfony/security-bundle": "<6.4", - "symfony/security-core": "<6.4", - "symfony/validator": "<6.4" + "doctrine/orm": "<2.15" }, "autoload": { "psr-4": { "Symfony\\Bridge\\Doctrine\\": "" }, diff --git a/src/Symfony/Bridge/Monolog/composer.json b/src/Symfony/Bridge/Monolog/composer.json index 50a23a5876931..5e46e67b20e01 100644 --- a/src/Symfony/Bridge/Monolog/composer.json +++ b/src/Symfony/Bridge/Monolog/composer.json @@ -30,11 +30,6 @@ "symfony/mime": "^6.4|^7.0", "symfony/messenger": "^6.4|^7.0" }, - "conflict": { - "symfony/console": "<6.4", - "symfony/http-foundation": "<6.4", - "symfony/security-core": "<6.4" - }, "autoload": { "psr-4": { "Symfony\\Bridge\\Monolog\\": "" }, "exclude-from-classmap": [ diff --git a/src/Symfony/Bridge/PsrHttpMessage/composer.json b/src/Symfony/Bridge/PsrHttpMessage/composer.json index a34dfb1008e5e..87dbba7b5a35b 100644 --- a/src/Symfony/Bridge/PsrHttpMessage/composer.json +++ b/src/Symfony/Bridge/PsrHttpMessage/composer.json @@ -31,8 +31,7 @@ "psr/log": "^1.1.4|^2|^3" }, "conflict": { - "php-http/discovery": "<1.15", - "symfony/http-kernel": "<6.4" + "php-http/discovery": "<1.15" }, "config": { "allow-plugins": { diff --git a/src/Symfony/Bridge/Twig/composer.json b/src/Symfony/Bridge/Twig/composer.json index 3af8ccbb7ecce..dca7fa2453aff 100644 --- a/src/Symfony/Bridge/Twig/composer.json +++ b/src/Symfony/Bridge/Twig/composer.json @@ -57,15 +57,7 @@ }, "conflict": { "phpdocumentor/reflection-docblock": "<3.2.2", - "phpdocumentor/type-resolver": "<1.4.0", - "symfony/console": "<6.4", - "symfony/form": "<6.4", - "symfony/http-foundation": "<6.4", - "symfony/http-kernel": "<6.4", - "symfony/mime": "<6.4", - "symfony/serializer": "<6.4", - "symfony/translation": "<6.4", - "symfony/workflow": "<6.4" + "phpdocumentor/type-resolver": "<1.4.0" }, "autoload": { "psr-4": { "Symfony\\Bridge\\Twig\\": "" }, diff --git a/src/Symfony/Bundle/DebugBundle/composer.json b/src/Symfony/Bundle/DebugBundle/composer.json index d00a4db6424c0..5060506bd124b 100644 --- a/src/Symfony/Bundle/DebugBundle/composer.json +++ b/src/Symfony/Bundle/DebugBundle/composer.json @@ -27,10 +27,6 @@ "symfony/config": "^6.4|^7.0", "symfony/web-profiler-bundle": "^6.4|^7.0" }, - "conflict": { - "symfony/config": "<6.4", - "symfony/dependency-injection": "<6.4" - }, "autoload": { "psr-4": { "Symfony\\Bundle\\DebugBundle\\": "" }, "exclude-from-classmap": [ diff --git a/src/Symfony/Bundle/FrameworkBundle/composer.json b/src/Symfony/Bundle/FrameworkBundle/composer.json index 9b3e7c86ea3ff..49c9d7d8a4222 100644 --- a/src/Symfony/Bundle/FrameworkBundle/composer.json +++ b/src/Symfony/Bundle/FrameworkBundle/composer.json @@ -78,34 +78,7 @@ "conflict": { "doctrine/persistence": "<1.3", "phpdocumentor/reflection-docblock": "<3.2.2", - "phpdocumentor/type-resolver": "<1.4.0", - "symfony/asset": "<6.4", - "symfony/asset-mapper": "<6.4", - "symfony/clock": "<6.4", - "symfony/console": "<6.4", - "symfony/dotenv": "<6.4", - "symfony/dom-crawler": "<6.4", - "symfony/http-client": "<6.4", - "symfony/form": "<6.4", - "symfony/lock": "<6.4", - "symfony/mailer": "<6.4", - "symfony/messenger": "<6.4", - "symfony/mime": "<6.4", - "symfony/property-info": "<6.4", - "symfony/property-access": "<6.4", - "symfony/runtime": "<6.4.13|>=7.0,<7.1.6", - "symfony/scheduler": "<6.4.4|>=7.0.0,<7.0.4", - "symfony/security-csrf": "<7.2", - "symfony/security-core": "<6.4", - "symfony/serializer": "<7.1", - "symfony/stopwatch": "<6.4", - "symfony/translation": "<6.4", - "symfony/twig-bridge": "<6.4", - "symfony/twig-bundle": "<6.4", - "symfony/validator": "<6.4", - "symfony/web-profiler-bundle": "<6.4", - "symfony/webhook": "<7.2", - "symfony/workflow": "<6.4" + "phpdocumentor/type-resolver": "<1.4.0" }, "autoload": { "psr-4": { "Symfony\\Bundle\\FrameworkBundle\\": "" }, diff --git a/src/Symfony/Bundle/SecurityBundle/composer.json b/src/Symfony/Bundle/SecurityBundle/composer.json index 8660196a11cf2..704aeb2ad2e11 100644 --- a/src/Symfony/Bundle/SecurityBundle/composer.json +++ b/src/Symfony/Bundle/SecurityBundle/composer.json @@ -53,16 +53,6 @@ "twig/twig": "^3.12", "web-token/jwt-library": "^3.3.2|^4.0" }, - "conflict": { - "symfony/browser-kit": "<6.4", - "symfony/console": "<6.4", - "symfony/framework-bundle": "<6.4", - "symfony/http-client": "<6.4", - "symfony/ldap": "<6.4", - "symfony/serializer": "<6.4", - "symfony/twig-bundle": "<6.4", - "symfony/validator": "<6.4" - }, "autoload": { "psr-4": { "Symfony\\Bundle\\SecurityBundle\\": "" }, "exclude-from-classmap": [ diff --git a/src/Symfony/Bundle/TwigBundle/composer.json b/src/Symfony/Bundle/TwigBundle/composer.json index f6e0e110cc686..6c9b9d24eac85 100644 --- a/src/Symfony/Bundle/TwigBundle/composer.json +++ b/src/Symfony/Bundle/TwigBundle/composer.json @@ -37,10 +37,6 @@ "symfony/framework-bundle": "^6.4|^7.0", "symfony/web-link": "^6.4|^7.0" }, - "conflict": { - "symfony/framework-bundle": "<6.4", - "symfony/translation": "<6.4" - }, "autoload": { "psr-4": { "Symfony\\Bundle\\TwigBundle\\": "" }, "exclude-from-classmap": [ diff --git a/src/Symfony/Bundle/WebProfilerBundle/composer.json b/src/Symfony/Bundle/WebProfilerBundle/composer.json index ce94b4b62ebbb..dec4723743998 100644 --- a/src/Symfony/Bundle/WebProfilerBundle/composer.json +++ b/src/Symfony/Bundle/WebProfilerBundle/composer.json @@ -30,12 +30,6 @@ "symfony/css-selector": "^6.4|^7.0", "symfony/stopwatch": "^6.4|^7.0" }, - "conflict": { - "symfony/form": "<6.4", - "symfony/mailer": "<6.4", - "symfony/messenger": "<6.4", - "symfony/serializer": "<7.2" - }, "autoload": { "psr-4": { "Symfony\\Bundle\\WebProfilerBundle\\": "" }, "exclude-from-classmap": [ diff --git a/src/Symfony/Component/Asset/composer.json b/src/Symfony/Component/Asset/composer.json index e8e1368f0e01c..3f0b1107643c2 100644 --- a/src/Symfony/Component/Asset/composer.json +++ b/src/Symfony/Component/Asset/composer.json @@ -23,9 +23,6 @@ "symfony/http-foundation": "^6.4|^7.0", "symfony/http-kernel": "^6.4|^7.0" }, - "conflict": { - "symfony/http-foundation": "<6.4" - }, "autoload": { "psr-4": { "Symfony\\Component\\Asset\\": "" }, "exclude-from-classmap": [ diff --git a/src/Symfony/Component/AssetMapper/composer.json b/src/Symfony/Component/AssetMapper/composer.json index 4db41cfaa4651..5f0e6e0b52665 100644 --- a/src/Symfony/Component/AssetMapper/composer.json +++ b/src/Symfony/Component/AssetMapper/composer.json @@ -33,9 +33,6 @@ "symfony/http-kernel": "^6.4|^7.0", "symfony/web-link": "^6.4|^7.0" }, - "conflict": { - "symfony/framework-bundle": "<6.4" - }, "autoload": { "psr-4": { "Symfony\\Component\\AssetMapper\\": "" }, "exclude-from-classmap": [ diff --git a/src/Symfony/Component/Cache/composer.json b/src/Symfony/Component/Cache/composer.json index bdb461be8c9e2..beb6e4686a75f 100644 --- a/src/Symfony/Component/Cache/composer.json +++ b/src/Symfony/Component/Cache/composer.json @@ -43,10 +43,7 @@ "symfony/var-dumper": "^6.4|^7.0" }, "conflict": { - "doctrine/dbal": "<3.6", - "symfony/dependency-injection": "<6.4", - "symfony/http-kernel": "<6.4", - "symfony/var-dumper": "<6.4" + "doctrine/dbal": "<3.6" }, "autoload": { "psr-4": { "Symfony\\Component\\Cache\\": "" }, diff --git a/src/Symfony/Component/Config/composer.json b/src/Symfony/Component/Config/composer.json index 37206042aa8b0..b2f268646d989 100644 --- a/src/Symfony/Component/Config/composer.json +++ b/src/Symfony/Component/Config/composer.json @@ -28,10 +28,6 @@ "symfony/service-contracts": "^2.5|^3", "symfony/yaml": "^6.4|^7.0" }, - "conflict": { - "symfony/finder": "<6.4", - "symfony/service-contracts": "<2.5" - }, "autoload": { "psr-4": { "Symfony\\Component\\Config\\": "" }, "exclude-from-classmap": [ diff --git a/src/Symfony/Component/Console/composer.json b/src/Symfony/Component/Console/composer.json index 0ed1bd9af89b2..06799098ccfa4 100644 --- a/src/Symfony/Component/Console/composer.json +++ b/src/Symfony/Component/Console/composer.json @@ -37,13 +37,6 @@ "provide": { "psr/log-implementation": "1.0|2.0|3.0" }, - "conflict": { - "symfony/dependency-injection": "<6.4", - "symfony/dotenv": "<6.4", - "symfony/event-dispatcher": "<6.4", - "symfony/lock": "<6.4", - "symfony/process": "<6.4" - }, "autoload": { "psr-4": { "Symfony\\Component\\Console\\": "" }, "exclude-from-classmap": [ diff --git a/src/Symfony/Component/DependencyInjection/composer.json b/src/Symfony/Component/DependencyInjection/composer.json index b5fda9bdeb990..ab57818be8e1e 100644 --- a/src/Symfony/Component/DependencyInjection/composer.json +++ b/src/Symfony/Component/DependencyInjection/composer.json @@ -28,10 +28,7 @@ "symfony/expression-language": "^6.4|^7.0" }, "conflict": { - "ext-psr": "<1.1|>=2", - "symfony/config": "<6.4", - "symfony/finder": "<6.4", - "symfony/yaml": "<6.4" + "ext-psr": "<1.1|>=2" }, "provide": { "psr/container-implementation": "1.1|2.0", diff --git a/src/Symfony/Component/Dotenv/composer.json b/src/Symfony/Component/Dotenv/composer.json index 34c4718a76aeb..f2df956f0f375 100644 --- a/src/Symfony/Component/Dotenv/composer.json +++ b/src/Symfony/Component/Dotenv/composer.json @@ -22,10 +22,6 @@ "symfony/console": "^6.4|^7.0", "symfony/process": "^6.4|^7.0" }, - "conflict": { - "symfony/console": "<6.4", - "symfony/process": "<6.4" - }, "autoload": { "psr-4": { "Symfony\\Component\\Dotenv\\": "" }, "exclude-from-classmap": [ diff --git a/src/Symfony/Component/ErrorHandler/composer.json b/src/Symfony/Component/ErrorHandler/composer.json index 987a68f641448..ba99ec912eb27 100644 --- a/src/Symfony/Component/ErrorHandler/composer.json +++ b/src/Symfony/Component/ErrorHandler/composer.json @@ -25,10 +25,6 @@ "symfony/serializer": "^6.4|^7.0", "symfony/deprecation-contracts": "^2.5|^3" }, - "conflict": { - "symfony/deprecation-contracts": "<2.5", - "symfony/http-kernel": "<6.4" - }, "autoload": { "psr-4": { "Symfony\\Component\\ErrorHandler\\": "" }, "exclude-from-classmap": [ diff --git a/src/Symfony/Component/EventDispatcher/composer.json b/src/Symfony/Component/EventDispatcher/composer.json index 598bbdc5489a4..643f7fa10a254 100644 --- a/src/Symfony/Component/EventDispatcher/composer.json +++ b/src/Symfony/Component/EventDispatcher/composer.json @@ -29,10 +29,6 @@ "symfony/stopwatch": "^6.4|^7.0", "psr/log": "^1|^2|^3" }, - "conflict": { - "symfony/dependency-injection": "<6.4", - "symfony/service-contracts": "<2.5" - }, "provide": { "psr/event-dispatcher-implementation": "1.0", "symfony/event-dispatcher-implementation": "2.0|3.0" diff --git a/src/Symfony/Component/Form/composer.json b/src/Symfony/Component/Form/composer.json index 40c021d915b22..97060d04a8c54 100644 --- a/src/Symfony/Component/Form/composer.json +++ b/src/Symfony/Component/Form/composer.json @@ -43,17 +43,6 @@ "symfony/var-dumper": "^6.4|^7.0", "symfony/uid": "^6.4|^7.0" }, - "conflict": { - "symfony/console": "<6.4", - "symfony/dependency-injection": "<6.4", - "symfony/doctrine-bridge": "<6.4", - "symfony/error-handler": "<6.4", - "symfony/framework-bundle": "<6.4", - "symfony/http-kernel": "<6.4", - "symfony/translation": "<6.4.3|>=7.0,<7.0.3", - "symfony/translation-contracts": "<2.5", - "symfony/twig-bridge": "<6.4" - }, "autoload": { "psr-4": { "Symfony\\Component\\Form\\": "" }, "exclude-from-classmap": [ diff --git a/src/Symfony/Component/HttpClient/composer.json b/src/Symfony/Component/HttpClient/composer.json index f294e7a577902..cb043e68d98b5 100644 --- a/src/Symfony/Component/HttpClient/composer.json +++ b/src/Symfony/Component/HttpClient/composer.json @@ -46,8 +46,7 @@ }, "conflict": { "amphp/amp": "<2.5", - "php-http/discovery": "<1.15", - "symfony/http-foundation": "<6.4" + "php-http/discovery": "<1.15" }, "autoload": { "psr-4": { "Symfony\\Component\\HttpClient\\": "" }, diff --git a/src/Symfony/Component/HttpFoundation/composer.json b/src/Symfony/Component/HttpFoundation/composer.json index cb2bbf8cbbeed..9bf5abcf4ca5a 100644 --- a/src/Symfony/Component/HttpFoundation/composer.json +++ b/src/Symfony/Component/HttpFoundation/composer.json @@ -32,8 +32,7 @@ "symfony/rate-limiter": "^6.4|^7.0" }, "conflict": { - "doctrine/dbal": "<3.6", - "symfony/cache": "<6.4.12|>=7.0,<7.1.5" + "doctrine/dbal": "<3.6" }, "autoload": { "psr-4": { "Symfony\\Component\\HttpFoundation\\": "" }, diff --git a/src/Symfony/Component/HttpKernel/composer.json b/src/Symfony/Component/HttpKernel/composer.json index 89421417f58f1..1432e9fcf09c3 100644 --- a/src/Symfony/Component/HttpKernel/composer.json +++ b/src/Symfony/Component/HttpKernel/composer.json @@ -53,22 +53,6 @@ "psr/log-implementation": "1.0|2.0|3.0" }, "conflict": { - "symfony/browser-kit": "<6.4", - "symfony/cache": "<6.4", - "symfony/config": "<6.4", - "symfony/console": "<6.4", - "symfony/form": "<6.4", - "symfony/dependency-injection": "<6.4", - "symfony/doctrine-bridge": "<6.4", - "symfony/http-client": "<6.4", - "symfony/http-client-contracts": "<2.5", - "symfony/mailer": "<6.4", - "symfony/messenger": "<6.4", - "symfony/translation": "<6.4", - "symfony/translation-contracts": "<2.5", - "symfony/twig-bridge": "<6.4", - "symfony/validator": "<6.4", - "symfony/var-dumper": "<6.4", "twig/twig": "<3.12" }, "autoload": { diff --git a/src/Symfony/Component/Intl/composer.json b/src/Symfony/Component/Intl/composer.json index b2101cfe5f728..04c922fab9cc2 100644 --- a/src/Symfony/Component/Intl/composer.json +++ b/src/Symfony/Component/Intl/composer.json @@ -31,9 +31,6 @@ "symfony/filesystem": "^6.4|^7.0", "symfony/var-exporter": "^6.4|^7.0" }, - "conflict": { - "symfony/string": "<7.1" - }, "autoload": { "psr-4": { "Symfony\\Component\\Intl\\": "" }, "exclude-from-classmap": [ diff --git a/src/Symfony/Component/Ldap/composer.json b/src/Symfony/Component/Ldap/composer.json index 5ed2995736e11..5d33cd225e2ab 100644 --- a/src/Symfony/Component/Ldap/composer.json +++ b/src/Symfony/Component/Ldap/composer.json @@ -24,10 +24,6 @@ "symfony/security-core": "^6.4|^7.0", "symfony/security-http": "^6.4|^7.0" }, - "conflict": { - "symfony/options-resolver": "<6.4", - "symfony/security-core": "<6.4" - }, "autoload": { "psr-4": { "Symfony\\Component\\Ldap\\": "" }, "exclude-from-classmap": [ diff --git a/src/Symfony/Component/Lock/composer.json b/src/Symfony/Component/Lock/composer.json index 61f53e06f268e..14bbf1df68dde 100644 --- a/src/Symfony/Component/Lock/composer.json +++ b/src/Symfony/Component/Lock/composer.json @@ -24,8 +24,7 @@ "predis/predis": "^1.1|^2.0" }, "conflict": { - "doctrine/dbal": "<3.6", - "symfony/cache": "<6.4" + "doctrine/dbal": "<3.6" }, "autoload": { "psr-4": { "Symfony\\Component\\Lock\\": "" }, diff --git a/src/Symfony/Component/Mailer/Bridge/Brevo/composer.json b/src/Symfony/Component/Mailer/Bridge/Brevo/composer.json index 441dada9ef97d..422f7bdae28b3 100644 --- a/src/Symfony/Component/Mailer/Bridge/Brevo/composer.json +++ b/src/Symfony/Component/Mailer/Bridge/Brevo/composer.json @@ -23,9 +23,6 @@ "symfony/http-client": "^6.3|^7.0", "symfony/webhook": "^6.3|^7.0" }, - "conflict": { - "symfony/mime": "<6.2" - }, "autoload": { "psr-4": { "Symfony\\Component\\Mailer\\Bridge\\Brevo\\": "" }, "exclude-from-classmap": [ diff --git a/src/Symfony/Component/Mailer/Bridge/Infobip/composer.json b/src/Symfony/Component/Mailer/Bridge/Infobip/composer.json index e15a7a3d17f4a..498c76ff28f2f 100644 --- a/src/Symfony/Component/Mailer/Bridge/Infobip/composer.json +++ b/src/Symfony/Component/Mailer/Bridge/Infobip/composer.json @@ -27,9 +27,6 @@ "require-dev": { "symfony/http-client": "^6.4|^7.0" }, - "conflict": { - "symfony/mime": "<6.4" - }, "autoload": { "psr-4": { "Symfony\\Component\\Mailer\\Bridge\\Infobip\\": "" diff --git a/src/Symfony/Component/Mailer/Bridge/Mailchimp/composer.json b/src/Symfony/Component/Mailer/Bridge/Mailchimp/composer.json index 081b5998e6206..efb405175b529 100644 --- a/src/Symfony/Component/Mailer/Bridge/Mailchimp/composer.json +++ b/src/Symfony/Component/Mailer/Bridge/Mailchimp/composer.json @@ -23,9 +23,6 @@ "symfony/http-client": "^6.4|^7.0", "symfony/webhook": "^7.2" }, - "conflict": { - "symfony/webhook": "<7.2" - }, "autoload": { "psr-4": { "Symfony\\Component\\Mailer\\Bridge\\Mailchimp\\": "" }, "exclude-from-classmap": [ diff --git a/src/Symfony/Component/Mailer/Bridge/Mailgun/composer.json b/src/Symfony/Component/Mailer/Bridge/Mailgun/composer.json index 3a5a475e3e44b..cf6321da86e69 100644 --- a/src/Symfony/Component/Mailer/Bridge/Mailgun/composer.json +++ b/src/Symfony/Component/Mailer/Bridge/Mailgun/composer.json @@ -23,9 +23,6 @@ "symfony/http-client": "^6.4|^7.0", "symfony/webhook": "^6.4|^7.0" }, - "conflict": { - "symfony/http-foundation": "<6.4" - }, "autoload": { "psr-4": { "Symfony\\Component\\Mailer\\Bridge\\Mailgun\\": "" }, "exclude-from-classmap": [ diff --git a/src/Symfony/Component/Mailer/Bridge/Mailomat/composer.json b/src/Symfony/Component/Mailer/Bridge/Mailomat/composer.json index 2d4cc3f1c8515..5834748d1787d 100644 --- a/src/Symfony/Component/Mailer/Bridge/Mailomat/composer.json +++ b/src/Symfony/Component/Mailer/Bridge/Mailomat/composer.json @@ -24,9 +24,6 @@ "symfony/http-foundation": "^7.1", "symfony/webhook": "^6.4|^7.0" }, - "conflict": { - "symfony/http-foundation": "<7.1" - }, "autoload": { "psr-4": { "Symfony\\Component\\Mailer\\Bridge\\Mailomat\\": "" }, "exclude-from-classmap": [ diff --git a/src/Symfony/Component/Mailer/Bridge/Mailtrap/composer.json b/src/Symfony/Component/Mailer/Bridge/Mailtrap/composer.json index 7d448e7c40768..e47daf0394ac5 100644 --- a/src/Symfony/Component/Mailer/Bridge/Mailtrap/composer.json +++ b/src/Symfony/Component/Mailer/Bridge/Mailtrap/composer.json @@ -24,9 +24,6 @@ "symfony/http-client": "^6.4|^7.0", "symfony/webhook": "^7.2" }, - "conflict": { - "symfony/webhook": "<7.2" - }, "autoload": { "psr-4": { "Symfony\\Component\\Mailer\\Bridge\\Mailtrap\\": "" }, "exclude-from-classmap": [ diff --git a/src/Symfony/Component/Mailer/Bridge/Postmark/composer.json b/src/Symfony/Component/Mailer/Bridge/Postmark/composer.json index 0451fec7f96ce..f6c17edf8b689 100644 --- a/src/Symfony/Component/Mailer/Bridge/Postmark/composer.json +++ b/src/Symfony/Component/Mailer/Bridge/Postmark/composer.json @@ -24,9 +24,6 @@ "symfony/http-client": "^6.4|^7.0", "symfony/webhook": "^6.4|^7.0" }, - "conflict": { - "symfony/http-foundation": "<6.4" - }, "autoload": { "psr-4": { "Symfony\\Component\\Mailer\\Bridge\\Postmark\\": "" }, "exclude-from-classmap": [ diff --git a/src/Symfony/Component/Mailer/Bridge/Resend/composer.json b/src/Symfony/Component/Mailer/Bridge/Resend/composer.json index 0fe9a6f79df3c..3eec5dc371c74 100644 --- a/src/Symfony/Component/Mailer/Bridge/Resend/composer.json +++ b/src/Symfony/Component/Mailer/Bridge/Resend/composer.json @@ -24,9 +24,6 @@ "symfony/http-foundation": "^7.1", "symfony/webhook": "^6.4|^7.0" }, - "conflict": { - "symfony/http-foundation": "<7.1" - }, "autoload": { "psr-4": { "Symfony\\Component\\Mailer\\Bridge\\Resend\\": "" }, "exclude-from-classmap": [ diff --git a/src/Symfony/Component/Mailer/Bridge/Sendgrid/composer.json b/src/Symfony/Component/Mailer/Bridge/Sendgrid/composer.json index 700aabef20a7d..5d2ec675706ac 100644 --- a/src/Symfony/Component/Mailer/Bridge/Sendgrid/composer.json +++ b/src/Symfony/Component/Mailer/Bridge/Sendgrid/composer.json @@ -23,11 +23,6 @@ "symfony/http-client": "^6.4|^7.0", "symfony/webhook": "^7.2" }, - "conflict": { - "symfony/mime": "<6.4", - "symfony/http-foundation": "<6.4", - "symfony/webhook": "<7.2" - }, "autoload": { "psr-4": { "Symfony\\Component\\Mailer\\Bridge\\Sendgrid\\": "" }, "exclude-from-classmap": [ diff --git a/src/Symfony/Component/Mailer/Bridge/Sweego/composer.json b/src/Symfony/Component/Mailer/Bridge/Sweego/composer.json index 4fbe23334d574..8ae177441bc88 100644 --- a/src/Symfony/Component/Mailer/Bridge/Sweego/composer.json +++ b/src/Symfony/Component/Mailer/Bridge/Sweego/composer.json @@ -24,9 +24,6 @@ "symfony/http-foundation": "^7.1", "symfony/webhook": "^6.4|^7.0" }, - "conflict": { - "symfony/http-foundation": "<7.1" - }, "autoload": { "psr-4": { "Symfony\\Component\\Mailer\\Bridge\\Sweego\\": "" }, "exclude-from-classmap": [ diff --git a/src/Symfony/Component/Mailer/composer.json b/src/Symfony/Component/Mailer/composer.json index 4336e725133fc..74964fb7ec2d1 100644 --- a/src/Symfony/Component/Mailer/composer.json +++ b/src/Symfony/Component/Mailer/composer.json @@ -30,13 +30,6 @@ "symfony/messenger": "^6.4|^7.0", "symfony/twig-bridge": "^6.4|^7.0" }, - "conflict": { - "symfony/http-client-contracts": "<2.5", - "symfony/http-kernel": "<6.4", - "symfony/messenger": "<6.4", - "symfony/mime": "<6.4", - "symfony/twig-bridge": "<6.4" - }, "autoload": { "psr-4": { "Symfony\\Component\\Mailer\\": "" }, "exclude-from-classmap": [ diff --git a/src/Symfony/Component/Messenger/Bridge/AmazonSqs/composer.json b/src/Symfony/Component/Messenger/Bridge/AmazonSqs/composer.json index 341026c9c55ad..deafffb5e0b50 100644 --- a/src/Symfony/Component/Messenger/Bridge/AmazonSqs/composer.json +++ b/src/Symfony/Component/Messenger/Bridge/AmazonSqs/composer.json @@ -28,9 +28,6 @@ "symfony/property-access": "^6.4|^7.0", "symfony/serializer": "^6.4|^7.0" }, - "conflict": { - "symfony/http-client-contracts": "<2.5" - }, "autoload": { "psr-4": { "Symfony\\Component\\Messenger\\Bridge\\AmazonSqs\\": "" }, "exclude-from-classmap": [ diff --git a/src/Symfony/Component/Messenger/Bridge/Doctrine/composer.json b/src/Symfony/Component/Messenger/Bridge/Doctrine/composer.json index 23be7241e04ed..cedafb43ef8cf 100644 --- a/src/Symfony/Component/Messenger/Bridge/Doctrine/composer.json +++ b/src/Symfony/Component/Messenger/Bridge/Doctrine/composer.json @@ -26,9 +26,6 @@ "symfony/property-access": "^6.4|^7.0", "symfony/serializer": "^6.4|^7.0" }, - "conflict": { - "doctrine/persistence": "<1.3" - }, "autoload": { "psr-4": { "Symfony\\Component\\Messenger\\Bridge\\Doctrine\\": "" }, "exclude-from-classmap": [ diff --git a/src/Symfony/Component/Messenger/composer.json b/src/Symfony/Component/Messenger/composer.json index 1f12f16662f88..2e2b2212dcdb4 100644 --- a/src/Symfony/Component/Messenger/composer.json +++ b/src/Symfony/Component/Messenger/composer.json @@ -36,14 +36,6 @@ "symfony/stopwatch": "^6.4|^7.0", "symfony/validator": "^6.4|^7.0" }, - "conflict": { - "symfony/console": "<7.2", - "symfony/event-dispatcher": "<6.4", - "symfony/event-dispatcher-contracts": "<2.5", - "symfony/framework-bundle": "<6.4", - "symfony/http-kernel": "<6.4", - "symfony/serializer": "<6.4" - }, "autoload": { "psr-4": { "Symfony\\Component\\Messenger\\": "" }, "exclude-from-classmap": [ diff --git a/src/Symfony/Component/Mime/composer.json b/src/Symfony/Component/Mime/composer.json index 5304bdf36d90b..e2b0576bfc9c4 100644 --- a/src/Symfony/Component/Mime/composer.json +++ b/src/Symfony/Component/Mime/composer.json @@ -33,9 +33,7 @@ "conflict": { "egulias/email-validator": "~3.0.0", "phpdocumentor/reflection-docblock": "<3.2.2", - "phpdocumentor/type-resolver": "<1.4.0", - "symfony/mailer": "<6.4", - "symfony/serializer": "<6.4.3|>7.0,<7.0.3" + "phpdocumentor/type-resolver": "<1.4.0" }, "autoload": { "psr-4": { "Symfony\\Component\\Mime\\": "" }, diff --git a/src/Symfony/Component/Notifier/Bridge/Twilio/composer.json b/src/Symfony/Component/Notifier/Bridge/Twilio/composer.json index ee1872491bdfb..565157b6cdaea 100644 --- a/src/Symfony/Component/Notifier/Bridge/Twilio/composer.json +++ b/src/Symfony/Component/Notifier/Bridge/Twilio/composer.json @@ -23,9 +23,6 @@ "require-dev": { "symfony/webhook": "^6.4|^7.0" }, - "conflict": { - "symfony/http-foundation": "<6.4" - }, "autoload": { "psr-4": { "Symfony\\Component\\Notifier\\Bridge\\Twilio\\": "" }, "exclude-from-classmap": [ diff --git a/src/Symfony/Component/Notifier/Bridge/Twitter/composer.json b/src/Symfony/Component/Notifier/Bridge/Twitter/composer.json index f50531a1448ed..ec1ca97da0723 100644 --- a/src/Symfony/Component/Notifier/Bridge/Twitter/composer.json +++ b/src/Symfony/Component/Notifier/Bridge/Twitter/composer.json @@ -23,9 +23,6 @@ "require-dev": { "symfony/mime": "^6.4|^7.0" }, - "conflict": { - "symfony/mime": "<6.4" - }, "autoload": { "psr-4": { "Symfony\\Component\\Notifier\\Bridge\\Twitter\\": "" }, "exclude-from-classmap": [ diff --git a/src/Symfony/Component/Notifier/composer.json b/src/Symfony/Component/Notifier/composer.json index 3cb8fe7d28073..a13f61270e810 100644 --- a/src/Symfony/Component/Notifier/composer.json +++ b/src/Symfony/Component/Notifier/composer.json @@ -25,12 +25,6 @@ "symfony/http-foundation": "^6.4|^7.0", "symfony/messenger": "^6.4|^7.0" }, - "conflict": { - "symfony/event-dispatcher": "<6.4", - "symfony/event-dispatcher-contracts": "<2.5", - "symfony/http-client-contracts": "<2.5", - "symfony/http-kernel": "<6.4" - }, "autoload": { "psr-4": { "Symfony\\Component\\Notifier\\": "" }, "exclude-from-classmap": [ diff --git a/src/Symfony/Component/PasswordHasher/composer.json b/src/Symfony/Component/PasswordHasher/composer.json index ebcb51b4b9599..8ee786813956d 100644 --- a/src/Symfony/Component/PasswordHasher/composer.json +++ b/src/Symfony/Component/PasswordHasher/composer.json @@ -22,9 +22,6 @@ "symfony/security-core": "^6.4|^7.0", "symfony/console": "^6.4|^7.0" }, - "conflict": { - "symfony/security-core": "<6.4" - }, "autoload": { "psr-4": { "Symfony\\Component\\PasswordHasher\\": "" }, "exclude-from-classmap": [ diff --git a/src/Symfony/Component/PropertyInfo/composer.json b/src/Symfony/Component/PropertyInfo/composer.json index 70a57ef06ced0..61b674330fd9b 100644 --- a/src/Symfony/Component/PropertyInfo/composer.json +++ b/src/Symfony/Component/PropertyInfo/composer.json @@ -36,8 +36,7 @@ }, "conflict": { "phpdocumentor/reflection-docblock": "<5.2", - "phpdocumentor/type-resolver": "<1.5.1", - "symfony/dependency-injection": "<6.4" + "phpdocumentor/type-resolver": "<1.5.1" }, "autoload": { "psr-4": { "Symfony\\Component\\PropertyInfo\\": "" }, diff --git a/src/Symfony/Component/Routing/composer.json b/src/Symfony/Component/Routing/composer.json index 59e30bef69611..b5f53914c1bfe 100644 --- a/src/Symfony/Component/Routing/composer.json +++ b/src/Symfony/Component/Routing/composer.json @@ -27,11 +27,6 @@ "symfony/dependency-injection": "^6.4|^7.0", "psr/log": "^1|^2|^3" }, - "conflict": { - "symfony/config": "<6.4", - "symfony/dependency-injection": "<6.4", - "symfony/yaml": "<6.4" - }, "autoload": { "psr-4": { "Symfony\\Component\\Routing\\": "" }, "exclude-from-classmap": [ diff --git a/src/Symfony/Component/Runtime/composer.json b/src/Symfony/Component/Runtime/composer.json index fa9c2cb3f58d0..aec5736b4f240 100644 --- a/src/Symfony/Component/Runtime/composer.json +++ b/src/Symfony/Component/Runtime/composer.json @@ -26,9 +26,6 @@ "symfony/http-foundation": "^6.4|^7.0", "symfony/http-kernel": "^6.4|^7.0" }, - "conflict": { - "symfony/dotenv": "<6.4" - }, "autoload": { "psr-4": { "Symfony\\Component\\Runtime\\": "", diff --git a/src/Symfony/Component/Security/Core/composer.json b/src/Symfony/Component/Security/Core/composer.json index 0aaff1e3645bf..b501baed0b30a 100644 --- a/src/Symfony/Component/Security/Core/composer.json +++ b/src/Symfony/Component/Security/Core/composer.json @@ -36,14 +36,6 @@ "symfony/validator": "^6.4|^7.0", "psr/log": "^1|^2|^3" }, - "conflict": { - "symfony/dependency-injection": "<6.4", - "symfony/event-dispatcher": "<6.4", - "symfony/http-foundation": "<6.4", - "symfony/ldap": "<6.4", - "symfony/translation": "<6.4.3|>=7.0,<7.0.3", - "symfony/validator": "<6.4" - }, "autoload": { "psr-4": { "Symfony\\Component\\Security\\Core\\": "" }, "exclude-from-classmap": [ diff --git a/src/Symfony/Component/Security/Csrf/composer.json b/src/Symfony/Component/Security/Csrf/composer.json index c2bfed1de3d7e..80a613ee050e0 100644 --- a/src/Symfony/Component/Security/Csrf/composer.json +++ b/src/Symfony/Component/Security/Csrf/composer.json @@ -24,9 +24,6 @@ "symfony/http-foundation": "^6.4|^7.0", "symfony/http-kernel": "^6.4|^7.0" }, - "conflict": { - "symfony/http-foundation": "<6.4" - }, "autoload": { "psr-4": { "Symfony\\Component\\Security\\Csrf\\": "" }, "exclude-from-classmap": [ diff --git a/src/Symfony/Component/Security/Http/composer.json b/src/Symfony/Component/Security/Http/composer.json index 9a443fe8ce621..7a8ab89acd1a3 100644 --- a/src/Symfony/Component/Security/Http/composer.json +++ b/src/Symfony/Component/Security/Http/composer.json @@ -38,13 +38,6 @@ "psr/log": "^1|^2|^3", "web-token/jwt-library": "^3.3.2|^4.0" }, - "conflict": { - "symfony/clock": "<6.4", - "symfony/event-dispatcher": "<6.4", - "symfony/http-client-contracts": "<3.0", - "symfony/security-bundle": "<6.4", - "symfony/security-csrf": "<6.4" - }, "autoload": { "psr-4": { "Symfony\\Component\\Security\\Http\\": "" }, "exclude-from-classmap": [ diff --git a/src/Symfony/Component/Semaphore/composer.json b/src/Symfony/Component/Semaphore/composer.json index a620c60cca25a..a3c9df00f3c56 100644 --- a/src/Symfony/Component/Semaphore/composer.json +++ b/src/Symfony/Component/Semaphore/composer.json @@ -26,9 +26,6 @@ "require-dev": { "predis/predis": "^1.1|^2.0" }, - "conflict": { - "symfony/cache": "<6.4" - }, "autoload": { "psr-4": { "Symfony\\Component\\Semaphore\\": "" }, "exclude-from-classmap": [ diff --git a/src/Symfony/Component/Serializer/composer.json b/src/Symfony/Component/Serializer/composer.json index d8809fa079ef9..b809c2160df49 100644 --- a/src/Symfony/Component/Serializer/composer.json +++ b/src/Symfony/Component/Serializer/composer.json @@ -47,13 +47,7 @@ }, "conflict": { "phpdocumentor/reflection-docblock": "<3.2.2", - "phpdocumentor/type-resolver": "<1.4.0", - "symfony/dependency-injection": "<6.4", - "symfony/property-access": "<6.4", - "symfony/property-info": "<6.4", - "symfony/uid": "<6.4", - "symfony/validator": "<6.4", - "symfony/yaml": "<6.4" + "phpdocumentor/type-resolver": "<1.4.0" }, "autoload": { "psr-4": { "Symfony\\Component\\Serializer\\": "" }, diff --git a/src/Symfony/Component/String/composer.json b/src/Symfony/Component/String/composer.json index 10d0ee620e4da..9a569ac2c076e 100644 --- a/src/Symfony/Component/String/composer.json +++ b/src/Symfony/Component/String/composer.json @@ -30,9 +30,6 @@ "symfony/translation-contracts": "^2.5|^3.0", "symfony/var-exporter": "^6.4|^7.0" }, - "conflict": { - "symfony/translation-contracts": "<2.5" - }, "autoload": { "psr-4": { "Symfony\\Component\\String\\": "" }, "files": [ "Resources/functions.php" ], diff --git a/src/Symfony/Component/Translation/composer.json b/src/Symfony/Component/Translation/composer.json index 1db1621590462..bb55b6b539e7b 100644 --- a/src/Symfony/Component/Translation/composer.json +++ b/src/Symfony/Component/Translation/composer.json @@ -36,16 +36,6 @@ "symfony/finder": "^6.4|^7.0", "psr/log": "^1|^2|^3" }, - "conflict": { - "symfony/config": "<6.4", - "symfony/dependency-injection": "<6.4", - "symfony/http-client-contracts": "<2.5", - "symfony/http-kernel": "<6.4", - "symfony/service-contracts": "<2.5", - "symfony/twig-bundle": "<6.4", - "symfony/yaml": "<6.4", - "symfony/console": "<6.4" - }, "provide": { "symfony/translation-implementation": "2.3|3.0" }, diff --git a/src/Symfony/Component/TypeInfo/composer.json b/src/Symfony/Component/TypeInfo/composer.json index a10b6d8785d0e..347e606141799 100644 --- a/src/Symfony/Component/TypeInfo/composer.json +++ b/src/Symfony/Component/TypeInfo/composer.json @@ -33,8 +33,7 @@ "symfony/dependency-injection": "^6.4|^7.0" }, "conflict": { - "phpstan/phpdoc-parser": "<1.0", - "symfony/dependency-injection": "<6.4" + "phpstan/phpdoc-parser": "<1.0" }, "autoload": { "psr-4": { "Symfony\\Component\\TypeInfo\\": "" }, diff --git a/src/Symfony/Component/Validator/composer.json b/src/Symfony/Component/Validator/composer.json index 5177d37d2955a..ab3cca8e17607 100644 --- a/src/Symfony/Component/Validator/composer.json +++ b/src/Symfony/Component/Validator/composer.json @@ -43,15 +43,7 @@ "egulias/email-validator": "^2.1.10|^3|^4" }, "conflict": { - "doctrine/lexer": "<1.1", - "symfony/dependency-injection": "<6.4", - "symfony/doctrine-bridge": "<7.0", - "symfony/expression-language": "<6.4", - "symfony/http-kernel": "<6.4", - "symfony/intl": "<6.4", - "symfony/property-info": "<6.4", - "symfony/translation": "<6.4.3|>=7.0,<7.0.3", - "symfony/yaml": "<6.4" + "doctrine/lexer": "<1.1" }, "autoload": { "psr-4": { "Symfony\\Component\\Validator\\": "" }, diff --git a/src/Symfony/Component/VarDumper/composer.json b/src/Symfony/Component/VarDumper/composer.json index eaba033e14885..8adf2b12e98f4 100644 --- a/src/Symfony/Component/VarDumper/composer.json +++ b/src/Symfony/Component/VarDumper/composer.json @@ -27,9 +27,6 @@ "symfony/uid": "^6.4|^7.0", "twig/twig": "^3.12" }, - "conflict": { - "symfony/console": "<6.4" - }, "autoload": { "files": [ "Resources/functions/dump.php" ], "psr-4": { "Symfony\\Component\\VarDumper\\": "" }, diff --git a/src/Symfony/Component/WebLink/composer.json b/src/Symfony/Component/WebLink/composer.json index 3203f6fa83163..41768c99fe9f8 100644 --- a/src/Symfony/Component/WebLink/composer.json +++ b/src/Symfony/Component/WebLink/composer.json @@ -25,9 +25,6 @@ "require-dev": { "symfony/http-kernel": "^6.4|^7.0" }, - "conflict": { - "symfony/http-kernel": "<6.4" - }, "autoload": { "psr-4": { "Symfony\\Component\\WebLink\\": "" }, "exclude-from-classmap": [ diff --git a/src/Symfony/Component/Workflow/composer.json b/src/Symfony/Component/Workflow/composer.json index 44a300057c04b..650a17aaa805e 100644 --- a/src/Symfony/Component/Workflow/composer.json +++ b/src/Symfony/Component/Workflow/composer.json @@ -33,9 +33,6 @@ "symfony/stopwatch": "^6.4|^7.0", "symfony/validator": "^6.4|^7.0" }, - "conflict": { - "symfony/event-dispatcher": "<6.4" - }, "autoload": { "psr-4": { "Symfony\\Component\\Workflow\\": "" }, "exclude-from-classmap": [ diff --git a/src/Symfony/Component/Yaml/composer.json b/src/Symfony/Component/Yaml/composer.json index 2ceac94665037..a59a0ad9790c9 100644 --- a/src/Symfony/Component/Yaml/composer.json +++ b/src/Symfony/Component/Yaml/composer.json @@ -23,9 +23,6 @@ "require-dev": { "symfony/console": "^6.4|^7.0" }, - "conflict": { - "symfony/console": "<6.4" - }, "autoload": { "psr-4": { "Symfony\\Component\\Yaml\\": "" }, "exclude-from-classmap": [