Skip to content

Remove conflicts with symfony/* from composer.json files #59009

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

Closed
wants to merge 1 commit into from
Closed

Remove conflicts with symfony/* from composer.json files #59009

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
13 changes: 1 addition & 12 deletions src/Symfony/Bridge/Doctrine/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Copy link
Member

Choose a reason for hiding this comment

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

Those conflicts are there to enforce the min requirement of our optional dependencies, matching the bound used in require-dev (which does not impact projects).
Removing this conflict means we must not bump our min version in require-dev anymore, because Composer would not have the info about an equivalent requirement bump when using the package (and so bumping our lowest bound becomes a breaking change instead of being handled by Composer)

Copy link
Member

Choose a reason for hiding this comment

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

to be actually safe, the conflict rule should actually have a second part, covering versions above the upper bound of the dev requirement.

Copy link
Member Author

Choose a reason for hiding this comment

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

conflicts are terrible
it's not because we don't test with older versions that they don't work
this leads to real issues like #58997
so we'd rather not use them

Copy link
Member Author

@nicolas-grekas nicolas-grekas Nov 27, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

We have a CI that runs tests cross-versions instead, so that even if not by require-dev, we do test outside these boundaries (as hinted in #58997 again)

"doctrine/orm": "<2.15"
},
"autoload": {
"psr-4": { "Symfony\\Bridge\\Doctrine\\": "" },
Expand Down
5 changes: 0 additions & 5 deletions src/Symfony/Bridge/Monolog/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand Down
3 changes: 1 addition & 2 deletions src/Symfony/Bridge/PsrHttpMessage/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
10 changes: 1 addition & 9 deletions src/Symfony/Bridge/Twig/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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\\": "" },
Expand Down
4 changes: 0 additions & 4 deletions src/Symfony/Bundle/DebugBundle/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand Down
29 changes: 1 addition & 28 deletions src/Symfony/Bundle/FrameworkBundle/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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\\": "" },
Expand Down
10 changes: 0 additions & 10 deletions src/Symfony/Bundle/SecurityBundle/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand Down
4 changes: 0 additions & 4 deletions src/Symfony/Bundle/TwigBundle/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand Down
6 changes: 0 additions & 6 deletions src/Symfony/Bundle/WebProfilerBundle/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand Down
3 changes: 0 additions & 3 deletions src/Symfony/Component/Asset/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand Down
3 changes: 0 additions & 3 deletions src/Symfony/Component/AssetMapper/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand Down
5 changes: 1 addition & 4 deletions src/Symfony/Component/Cache/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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\\": "" },
Expand Down
4 changes: 0 additions & 4 deletions src/Symfony/Component/Config/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand Down
7 changes: 0 additions & 7 deletions src/Symfony/Component/Console/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand Down
5 changes: 1 addition & 4 deletions src/Symfony/Component/DependencyInjection/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
4 changes: 0 additions & 4 deletions src/Symfony/Component/Dotenv/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand Down
4 changes: 0 additions & 4 deletions src/Symfony/Component/ErrorHandler/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand Down
4 changes: 0 additions & 4 deletions src/Symfony/Component/EventDispatcher/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
11 changes: 0 additions & 11 deletions src/Symfony/Component/Form/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand Down
3 changes: 1 addition & 2 deletions src/Symfony/Component/HttpClient/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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\\": "" },
Expand Down
3 changes: 1 addition & 2 deletions src/Symfony/Component/HttpFoundation/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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\\": "" },
Expand Down
16 changes: 0 additions & 16 deletions src/Symfony/Component/HttpKernel/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
3 changes: 0 additions & 3 deletions src/Symfony/Component/Intl/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand Down
4 changes: 0 additions & 4 deletions src/Symfony/Component/Ldap/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand Down
3 changes: 1 addition & 2 deletions src/Symfony/Component/Lock/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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\\": "" },
Expand Down
3 changes: 0 additions & 3 deletions src/Symfony/Component/Mailer/Bridge/Brevo/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand Down
3 changes: 0 additions & 3 deletions src/Symfony/Component/Mailer/Bridge/Infobip/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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\\": ""
Expand Down
3 changes: 0 additions & 3 deletions src/Symfony/Component/Mailer/Bridge/Mailchimp/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand Down
3 changes: 0 additions & 3 deletions src/Symfony/Component/Mailer/Bridge/Mailgun/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand Down
3 changes: 0 additions & 3 deletions src/Symfony/Component/Mailer/Bridge/Mailomat/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand Down
Loading