kenaug74/Sylius
1
0
Fork 0
mirror of https://github.com/Sylius/Sylius.git synced 2026-07-14 09:02:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

[Composer] Remove conflict to doctrine/orm

Browse source
This commit is contained in:
Grzegorz Sadowski 2024-10-08 07:21:38 +02:00
parent d8eda17e0b
commit 87de9289f0
No known key found for this signature in database
GPG key ID: EF87FF4E6E3BD364
12 changed files with 0 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
CONFLICTS.md
View file

@ -8,11 +8,6 @@ references related issues.
After bumping to this version ApiBundle starts failing due to requesting a non-existing `api_platform.openapi.factory.legacy` service.
As we are not using this service across the ApiBundle we added this conflict to unlock the builds, until we investigate the problem.
- `doctrine/orm:>= 2.16.0`
This version makes Sylius Fixtures loading fail on the product review fixtures.
References: https://github.com/doctrine/orm/issues/10869
- `symfony/validator:5.4.25`
This version introduced a bug, causing validation constraints to not work.

1
composer.json
View file

@ -188,7 +188,6 @@
},
"conflict": {
"api-platform/core": "2.7.17",
"doctrine/orm": ">= 2.16.0",
"lexik/jwt-authentication-bundle": "^2.18",
"stof/doctrine-extensions-bundle": "1.8.0",
"symfony/validator": "5.4.25",

1
src/Sylius/Bundle/AddressingBundle/composer.json
View file

@ -34,7 +34,6 @@
"symfony/intl": "^5.4.21 || ^6.4"
},
"conflict": {
"doctrine/orm": ">= 2.16.0",
"stof/doctrine-extensions-bundle": "1.8.0",
"twig/twig": "^1.0 || ^3.0"
},

1
src/Sylius/Bundle/AttributeBundle/composer.json
View file

@ -44,7 +44,6 @@
"symfony/form": "^5.4.21 || ^6.4"
},
"conflict": {
"doctrine/orm": ">= 2.16.0",
"stof/doctrine-extensions-bundle": "1.8.0"
},
"config": {

1
src/Sylius/Bundle/ChannelBundle/composer.json
View file

@ -42,7 +42,6 @@
"twig/twig": "^2.12 || ^3.3"
},
"conflict": {
"doctrine/orm": ">= 2.16.0",
"twig/twig": "3.9.0"
},
"config": {

1
src/Sylius/Bundle/CurrencyBundle/composer.json
View file

@ -33,7 +33,6 @@
"symfony/templating": "^5.4.21 || ^6.4"
},
"conflict": {
"doctrine/orm": ">= 2.16.0",
"twig/twig": "^1.0 || 3.9.0"
},
"require-dev": {

1
src/Sylius/Bundle/CustomerBundle/composer.json
View file

@ -44,7 +44,6 @@
"webmozart/assert": "^1.9"
},
"conflict": {
"doctrine/orm": ">= 2.16.0",
"twig/twig": "^3.0"
},
"require-dev": {

1
src/Sylius/Bundle/InventoryBundle/composer.json
View file

@ -34,7 +34,6 @@
"symfony/validator": "^5.4.21 || ^6.4"
},
"conflict": {
"doctrine/orm": ">= 2.16.0",
"twig/twig": "^1.0 || 3.9.0"
},
"require-dev": {

1
src/Sylius/Bundle/LocaleBundle/composer.json
View file

@ -34,7 +34,6 @@
"symfony/templating": "^5.4.21 || ^6.4"
},
"conflict": {
"doctrine/orm": ">= 2.16.0",
"twig/twig": "^1.0 || 3.9.0"
},
"require-dev": {

1
src/Sylius/Bundle/MoneyBundle/composer.json
View file

@ -33,7 +33,6 @@
"webmozart/assert": "^1.9"
},
"conflict": {
"doctrine/orm": ">= 2.16.0",
"twig/twig": "^1.0 || 3.9.0"
},
"require-dev": {

1
src/Sylius/Bundle/OrderBundle/composer.json
View file

@ -38,7 +38,6 @@
"symfony/templating": "^5.4.21 || ^6.4"
},
"conflict": {
"doctrine/orm": ">= 2.16.0",
"stof/doctrine-extensions-bundle": "1.8.0",
"twig/twig": "^1.0 || ^3.0"
},

1
src/Sylius/Bundle/TaxationBundle/composer.json
View file

@ -36,7 +36,6 @@
"symfony/framework-bundle": "^5.4.21 || ^6.4"
},
"conflict": {
"doctrine/orm": ">= 2.16.0",
"stof/doctrine-extensions-bundle": "1.8.0",
"twig/twig": "^3.0"
},