From 87de9289f076f5d9f3a7a35c857304a998aa3225 Mon Sep 17 00:00:00 2001 From: Grzegorz Sadowski Date: Tue, 8 Oct 2024 07:21:38 +0200 Subject: [PATCH] [Composer] Remove conflict to doctrine/orm --- CONFLICTS.md | 5 ----- composer.json | 1 - src/Sylius/Bundle/AddressingBundle/composer.json | 1 - src/Sylius/Bundle/AttributeBundle/composer.json | 1 - src/Sylius/Bundle/ChannelBundle/composer.json | 1 - src/Sylius/Bundle/CurrencyBundle/composer.json | 1 - src/Sylius/Bundle/CustomerBundle/composer.json | 1 - src/Sylius/Bundle/InventoryBundle/composer.json | 1 - src/Sylius/Bundle/LocaleBundle/composer.json | 1 - src/Sylius/Bundle/MoneyBundle/composer.json | 1 - src/Sylius/Bundle/OrderBundle/composer.json | 1 - src/Sylius/Bundle/TaxationBundle/composer.json | 1 - 12 files changed, 16 deletions(-) diff --git a/CONFLICTS.md b/CONFLICTS.md index 0058d70636..beab9261f1 100644 --- a/CONFLICTS.md +++ b/CONFLICTS.md @@ -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. diff --git a/composer.json b/composer.json index 2904b7f309..7a9718ce0b 100644 --- a/composer.json +++ b/composer.json @@ -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", diff --git a/src/Sylius/Bundle/AddressingBundle/composer.json b/src/Sylius/Bundle/AddressingBundle/composer.json index 791f8feee1..8c3b349653 100644 --- a/src/Sylius/Bundle/AddressingBundle/composer.json +++ b/src/Sylius/Bundle/AddressingBundle/composer.json @@ -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" }, diff --git a/src/Sylius/Bundle/AttributeBundle/composer.json b/src/Sylius/Bundle/AttributeBundle/composer.json index 537c428053..5c32c6ea9e 100644 --- a/src/Sylius/Bundle/AttributeBundle/composer.json +++ b/src/Sylius/Bundle/AttributeBundle/composer.json @@ -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": { diff --git a/src/Sylius/Bundle/ChannelBundle/composer.json b/src/Sylius/Bundle/ChannelBundle/composer.json index 98be6876ee..f44c3c5d82 100644 --- a/src/Sylius/Bundle/ChannelBundle/composer.json +++ b/src/Sylius/Bundle/ChannelBundle/composer.json @@ -42,7 +42,6 @@ "twig/twig": "^2.12 || ^3.3" }, "conflict": { - "doctrine/orm": ">= 2.16.0", "twig/twig": "3.9.0" }, "config": { diff --git a/src/Sylius/Bundle/CurrencyBundle/composer.json b/src/Sylius/Bundle/CurrencyBundle/composer.json index ff364b5d5f..43b38f64f7 100644 --- a/src/Sylius/Bundle/CurrencyBundle/composer.json +++ b/src/Sylius/Bundle/CurrencyBundle/composer.json @@ -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": { diff --git a/src/Sylius/Bundle/CustomerBundle/composer.json b/src/Sylius/Bundle/CustomerBundle/composer.json index ad12215618..0db513b10f 100644 --- a/src/Sylius/Bundle/CustomerBundle/composer.json +++ b/src/Sylius/Bundle/CustomerBundle/composer.json @@ -44,7 +44,6 @@ "webmozart/assert": "^1.9" }, "conflict": { - "doctrine/orm": ">= 2.16.0", "twig/twig": "^3.0" }, "require-dev": { diff --git a/src/Sylius/Bundle/InventoryBundle/composer.json b/src/Sylius/Bundle/InventoryBundle/composer.json index 7f396ebe82..1a265cb18d 100644 --- a/src/Sylius/Bundle/InventoryBundle/composer.json +++ b/src/Sylius/Bundle/InventoryBundle/composer.json @@ -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": { diff --git a/src/Sylius/Bundle/LocaleBundle/composer.json b/src/Sylius/Bundle/LocaleBundle/composer.json index 5a7b9cb604..6a6e65be64 100644 --- a/src/Sylius/Bundle/LocaleBundle/composer.json +++ b/src/Sylius/Bundle/LocaleBundle/composer.json @@ -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": { diff --git a/src/Sylius/Bundle/MoneyBundle/composer.json b/src/Sylius/Bundle/MoneyBundle/composer.json index 2c551f56bf..bb68f1cbc2 100644 --- a/src/Sylius/Bundle/MoneyBundle/composer.json +++ b/src/Sylius/Bundle/MoneyBundle/composer.json @@ -33,7 +33,6 @@ "webmozart/assert": "^1.9" }, "conflict": { - "doctrine/orm": ">= 2.16.0", "twig/twig": "^1.0 || 3.9.0" }, "require-dev": { diff --git a/src/Sylius/Bundle/OrderBundle/composer.json b/src/Sylius/Bundle/OrderBundle/composer.json index a409d20437..ce23732b49 100644 --- a/src/Sylius/Bundle/OrderBundle/composer.json +++ b/src/Sylius/Bundle/OrderBundle/composer.json @@ -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" }, diff --git a/src/Sylius/Bundle/TaxationBundle/composer.json b/src/Sylius/Bundle/TaxationBundle/composer.json index e5b282b6f1..7faf988985 100644 --- a/src/Sylius/Bundle/TaxationBundle/composer.json +++ b/src/Sylius/Bundle/TaxationBundle/composer.json @@ -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" },