From c71efa7825aa9c6afb3bdae4c0139d651ab67de0 Mon Sep 17 00:00:00 2001 From: Grzegorz Sadowski Date: Tue, 12 Nov 2024 16:49:44 +0100 Subject: [PATCH 1/2] [Composer] Add conflict to phpstan/phpdoc-parser >= 2.0 --- src/Sylius/Bundle/AddressingBundle/composer.json | 3 ++- src/Sylius/Bundle/AttributeBundle/composer.json | 3 ++- src/Sylius/Bundle/CoreBundle/composer.json | 3 +++ src/Sylius/Bundle/InventoryBundle/composer.json | 3 ++- src/Sylius/Bundle/PromotionBundle/composer.json | 3 ++- 5 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/Sylius/Bundle/AddressingBundle/composer.json b/src/Sylius/Bundle/AddressingBundle/composer.json index ca3036bb6b..00361bfd7e 100644 --- a/src/Sylius/Bundle/AddressingBundle/composer.json +++ b/src/Sylius/Bundle/AddressingBundle/composer.json @@ -34,7 +34,8 @@ "symfony/intl": "^6.4 || ^7.1" }, "conflict": { - "doctrine/orm": ">= 3.0" + "doctrine/orm": ">= 3.0", + "phpstan/phpdoc-parser": ">= 2.0" }, "require-dev": { "doctrine/data-fixtures": "^1.7", diff --git a/src/Sylius/Bundle/AttributeBundle/composer.json b/src/Sylius/Bundle/AttributeBundle/composer.json index 18dca50489..ecc479cc2f 100644 --- a/src/Sylius/Bundle/AttributeBundle/composer.json +++ b/src/Sylius/Bundle/AttributeBundle/composer.json @@ -45,7 +45,8 @@ "symfony/form": "^6.4.1 || ^7.1" }, "conflict": { - "doctrine/orm": ">= 3.0" + "doctrine/orm": ">= 3.0", + "phpstan/phpdoc-parser": ">= 2.0" }, "config": { "allow-plugins": { diff --git a/src/Sylius/Bundle/CoreBundle/composer.json b/src/Sylius/Bundle/CoreBundle/composer.json index bf82663a0e..b4fae2fb37 100644 --- a/src/Sylius/Bundle/CoreBundle/composer.json +++ b/src/Sylius/Bundle/CoreBundle/composer.json @@ -68,6 +68,9 @@ "symfony/workflow": "^6.4 || ^7.1", "php-http/discovery": "^1.20" }, + "conflict": { + "phpstan/phpdoc-parser": ">= 2.0" + }, "require-dev": { "doctrine/doctrine-bundle": "^2.13", "hwi/oauth-bundle": "^2.2", diff --git a/src/Sylius/Bundle/InventoryBundle/composer.json b/src/Sylius/Bundle/InventoryBundle/composer.json index 00f4bdc592..cb4a7f294c 100644 --- a/src/Sylius/Bundle/InventoryBundle/composer.json +++ b/src/Sylius/Bundle/InventoryBundle/composer.json @@ -33,7 +33,8 @@ "symfony/validator": "^6.4 || ^7.1" }, "conflict": { - "doctrine/orm": ">= 3.0" + "doctrine/orm": ">= 3.0", + "phpstan/phpdoc-parser": ">= 2.0" }, "require-dev": { "doctrine/doctrine-bundle": "^2.13", diff --git a/src/Sylius/Bundle/PromotionBundle/composer.json b/src/Sylius/Bundle/PromotionBundle/composer.json index e09cb79c58..11bf340b52 100644 --- a/src/Sylius/Bundle/PromotionBundle/composer.json +++ b/src/Sylius/Bundle/PromotionBundle/composer.json @@ -37,7 +37,8 @@ "symfony/framework-bundle": "^6.4.1 || ^7.1" }, "conflict": { - "doctrine/orm": ">= 3.0" + "doctrine/orm": ">= 3.0", + "phpstan/phpdoc-parser": ">= 2.0" }, "require-dev": { "doctrine/doctrine-bundle": "^2.13", From d0a83a2321830ae37607058f6a0efce10aba844e Mon Sep 17 00:00:00 2001 From: Grzegorz Sadowski Date: Tue, 12 Nov 2024 17:39:09 +0100 Subject: [PATCH 2/2] Fix application's version v1.14.1-DEV --- src/Sylius/Bundle/CoreBundle/SyliusCoreBundle.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Sylius/Bundle/CoreBundle/SyliusCoreBundle.php b/src/Sylius/Bundle/CoreBundle/SyliusCoreBundle.php index ac542f71a1..57f1d8813a 100644 --- a/src/Sylius/Bundle/CoreBundle/SyliusCoreBundle.php +++ b/src/Sylius/Bundle/CoreBundle/SyliusCoreBundle.php @@ -45,7 +45,7 @@ final class SyliusCoreBundle extends AbstractResourceBundle { public const VERSION = '1.14.1-DEV'; - public const VERSION_ID = '11400'; + public const VERSION_ID = '11401'; public const MAJOR_VERSION = '1';