From d7f2080625f0fcb6f43fe8b0871a6538bc4e39c0 Mon Sep 17 00:00:00 2001 From: Jakub Tobiasz Date: Fri, 21 Apr 2023 10:09:47 +0200 Subject: [PATCH] Clean up conflicts for sylius/sylius --- CONFLICTS.md | 25 ----- composer.json | 94 +++++++++---------- .../Bundle/AddressingBundle/composer.json | 12 +-- src/Sylius/Bundle/AdminBundle/composer.json | 6 +- src/Sylius/Bundle/ApiBundle/composer.json | 10 +- .../Bundle/AttributeBundle/composer.json | 8 +- src/Sylius/Bundle/ChannelBundle/composer.json | 8 +- src/Sylius/Bundle/CoreBundle/composer.json | 22 ++--- .../Bundle/CurrencyBundle/composer.json | 12 +-- .../Bundle/CustomerBundle/composer.json | 8 +- .../Bundle/InventoryBundle/composer.json | 10 +- src/Sylius/Bundle/LocaleBundle/composer.json | 8 +- src/Sylius/Bundle/MoneyBundle/composer.json | 12 +-- src/Sylius/Bundle/OrderBundle/composer.json | 10 +- src/Sylius/Bundle/PaymentBundle/composer.json | 6 +- src/Sylius/Bundle/PayumBundle/composer.json | 2 +- src/Sylius/Bundle/ProductBundle/composer.json | 10 +- .../Bundle/PromotionBundle/composer.json | 10 +- src/Sylius/Bundle/ReviewBundle/composer.json | 12 +-- .../Bundle/ShippingBundle/composer.json | 10 +- src/Sylius/Bundle/ShopBundle/composer.json | 6 +- .../Bundle/TaxationBundle/composer.json | 8 +- .../Bundle/TaxonomyBundle/composer.json | 4 +- src/Sylius/Bundle/UiBundle/composer.json | 14 +-- src/Sylius/Bundle/UserBundle/composer.json | 10 +- src/Sylius/Component/Addressing/composer.json | 2 +- src/Sylius/Component/Attribute/composer.json | 2 +- src/Sylius/Component/Channel/composer.json | 4 +- src/Sylius/Component/Core/composer.json | 8 +- src/Sylius/Component/Currency/composer.json | 2 +- src/Sylius/Component/Locale/composer.json | 2 +- src/Sylius/Component/Shipping/composer.json | 2 +- src/Sylius/Component/User/composer.json | 2 +- 33 files changed, 166 insertions(+), 195 deletions(-) diff --git a/CONFLICTS.md b/CONFLICTS.md index 038fdfb602..0c613c634c 100644 --- a/CONFLICTS.md +++ b/CONFLICTS.md @@ -3,31 +3,6 @@ This document explains why certain conflicts were added to `composer.json` and references related issues. - - `doctrine/doctrine-bundle:2.3.0`: - - This version makes Gedmo Doctrine Extensions fail (tree and position behaviour mostly). - - References: https://github.com/doctrine/DoctrineBundle/issues/1305 - - - `jms/serializer-bundle:4.1.0`: - - This version contains service with a wrong constructor arguments: - `Invalid definition for service ".container.private.profiler": argument 4 of "JMS\SerializerBundle\Debug\DataCollector::__construct()" accepts "JMS\SerializerBundle\Debug\TraceableDriver", "JMS\SerializerBundle\Debug\TraceableMetadataFactory" passed.` - - References: https://github.com/schmittjoh/JMSSerializerBundle/issues/902 - - - `symfony/dependency-injection:5.4.5`: - - This version is causing a problem with mink session: - `InvalidArgumentException: Specify session name to get in vendor/friends-of-behat/mink/src/Mink.php:198`, - Psalm error: - `UndefinedDocblockClass: Docblock-defined class, interface or enum named UnitEnum does not exist`. - - - `symfony/framework-bundle:5.4.5`: - - This version is causing a problem with returning null as token from `Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorage` - which leads to wrong solving path prefix by `Sylius\Bundle\ApiBundle\Provider\PathPrefixProvider` in API scenarios - - `doctrine/migrations:3.5.3`: This version is causing a problem with migrations and results in throwing a `Doctrine\Migrations\Exception\MetadataStorageError` exception e.g. when executing `sylius:install` command. diff --git a/composer.json b/composer.json index e6b8a1c9c7..c53335f3c2 100644 --- a/composer.json +++ b/composer.json @@ -35,7 +35,7 @@ "doctrine/collections": "^1.6", "doctrine/common": "^3.2", "doctrine/dbal": "^2.7 || ^3.0", - "doctrine/doctrine-bundle": "^1.12 || ^2.0", + "doctrine/doctrine-bundle": "^1.12 || ^2.3.1", "doctrine/doctrine-migrations-bundle": "^3.0.1", "doctrine/event-manager": "^1.1", "doctrine/inflector": "^1.4 || ^2.0", @@ -50,7 +50,7 @@ "gedmo/doctrine-extensions": "^3.2", "guzzlehttp/guzzle": "^6.5", "guzzlehttp/psr7": "^1.8", - "jms/serializer-bundle": "^4.0", + "jms/serializer-bundle": "^4.2", "knplabs/gaufrette": "^0.10 || ^0.11", "knplabs/knp-gaufrette-bundle": "^0.7 || ^0.8", "knplabs/knp-menu": "^3.1", @@ -58,7 +58,7 @@ "laminas/laminas-stdlib": "^3.3.1", "league/flysystem-bundle": "^2.4", "lexik/jwt-authentication-bundle": "^2.11", - "liip/imagine-bundle": "^2.3", + "liip/imagine-bundle": "^2.10", "pagerfanta/pagerfanta": "^3.0", "payum/payum": "^1.7.2", "payum/payum-bundle": "^2.5", @@ -84,49 +84,49 @@ "sylius/resource": "^1.9", "sylius/resource-bundle": "^1.9", "sylius/theme-bundle": "^2.1.1 || ^2.3", - "symfony/asset": "^5.4 || ^6.0", - "symfony/config": "^5.4 || ^6.0", - "symfony/console": "^5.4 || ^6.0", - "symfony/dependency-injection": "^5.4 || ^6.0", + "symfony/asset": "^5.4.21 || ^6.0", + "symfony/config": "^5.4.21 || ^6.0", + "symfony/console": "^5.4.21 || ^6.0", + "symfony/dependency-injection": "^5.4.21 || ^6.0", "symfony/deprecation-contracts": "^2.5", - "symfony/doctrine-bridge": "^5.4 || ^6.0", - "symfony/doctrine-messenger": "^5.4 || ^6.0", - "symfony/event-dispatcher": "^5.4 || ^6.0", - "symfony/expression-language": "^5.4 || ^6.0", - "symfony/filesystem": "^5.4 || ^6.0", - "symfony/finder": "^5.4 || ^6.0", - "symfony/form": "^5.4 || ^6.0", - "symfony/framework-bundle": "^5.4 || ^6.0", - "symfony/http-foundation": "^5.4 || ^6.0", - "symfony/http-kernel": "^5.4 || ^6.0", - "symfony/intl": "^5.4 || ^6.0", - "symfony/mailer": "^5.4 || ^6.0", - "symfony/messenger": "^5.4 || ^6.0", + "symfony/doctrine-bridge": "^5.4.21 || ^6.0", + "symfony/doctrine-messenger": "^5.4.21 || ^6.0", + "symfony/event-dispatcher": "^5.4.21 || ^6.0", + "symfony/expression-language": "^5.4.21 || ^6.0", + "symfony/filesystem": "^5.4.21 || ^6.0", + "symfony/finder": "^5.4.21 || ^6.0", + "symfony/form": "^5.4.21 || ^6.0", + "symfony/framework-bundle": "^5.4.21 || ^6.0", + "symfony/http-foundation": "^5.4.21 || ^6.0", + "symfony/http-kernel": "^5.4.21 || ^6.0", + "symfony/intl": "^5.4.21 || ^6.0", + "symfony/mailer": "^5.4.21 || ^6.0", + "symfony/messenger": "^5.4.21 || ^6.0", "symfony/monolog-bundle": "^3.5", - "symfony/options-resolver": "^5.4 || ^6.0", - "symfony/password-hasher": "^5.4 || ^6.0", + "symfony/options-resolver": "^5.4.21 || ^6.0", + "symfony/password-hasher": "^5.4.21 || ^6.0", "symfony/polyfill-iconv": "^1.17", "symfony/polyfill-intl-icu": "^1.22", "symfony/polyfill-mbstring": "^1.17", "symfony/polyfill-php80": "^1.17", - "symfony/process": "^5.4 || ^6.0", - "symfony/property-access": "^5.4 || ^6.0", - "symfony/property-info": "^5.4 || ^6.0", - "symfony/proxy-manager-bridge": "^5.4 || ^6.0", - "symfony/routing": "^5.4 || ^6.0", - "symfony/security-bundle": "^5.4 || ^6.0", - "symfony/security-core": "^5.4 || ^6.0", - "symfony/security-csrf": "^5.4 || ^6.0", - "symfony/security-http": "^5.4 || ^6.0", - "symfony/serializer": "^5.4 || ^6.0", - "symfony/string": "^5.4 || ^6.0", - "symfony/templating": "^5.4 || ^6.0", - "symfony/translation": "^5.4 || ^6.0", + "symfony/process": "^5.4.21 || ^6.0", + "symfony/property-access": "^5.4.21 || ^6.0", + "symfony/property-info": "^5.4.21 || ^6.0", + "symfony/proxy-manager-bridge": "^5.4.21 || ^6.0", + "symfony/routing": "^5.4.21 || ^6.0", + "symfony/security-bundle": "^5.4.21 || ^6.0", + "symfony/security-core": "^5.4.21 || ^6.0", + "symfony/security-csrf": "^5.4.21 || ^6.0", + "symfony/security-http": "^5.4.21 || ^6.0", + "symfony/serializer": "^5.4.21 || ^6.0", + "symfony/string": "^5.4.21 || ^6.0", + "symfony/templating": "^5.4.21 || ^6.0", + "symfony/translation": "^5.4.21 || ^6.0", "symfony/translation-contracts": "^2.5", - "symfony/twig-bundle": "^5.4 || ^6.0", - "symfony/validator": "^5.4 || ^6.0", + "symfony/twig-bundle": "^5.4.21 || ^6.0", + "symfony/validator": "^5.4.21 || ^6.0", "symfony/webpack-encore-bundle": "^1.15", - "symfony/yaml": "^5.4 || ^6.0", + "symfony/yaml": "^5.4.21 || ^6.0", "twig/intl-extra": "^2.12 || ^3.4", "twig/twig": "^2.12 || ^3.3", "webmozart/assert": "^1.9", @@ -178,13 +178,9 @@ "sylius/user-bundle": "self.version" }, "conflict": { - "doctrine/doctrine-bundle": "2.3.0", "doctrine/migrations": "3.5.3", - "jms/serializer-bundle": "4.1.0", "lexik/jwt-authentication-bundle": "^2.18", - "symfony/framework-bundle": "5.4.5 || 6.2.8", - "symfony/dependency-injection": "5.4.5", - "liip/imagine-bundle": "2.7.0" + "symfony/framework-bundle": "6.2.8" }, "require-dev": { "behat/behat": "^3.6.1", @@ -222,12 +218,12 @@ "rector/rector": "^0.15.13", "stripe/stripe-php": "^10.4", "sylius-labs/coding-standard": "^4.2", - "symfony/browser-kit": "^5.4 || ^6.0", - "symfony/debug-bundle": "^5.4 || ^6.0", - "symfony/dotenv": "^5.4 || ^6.0", + "symfony/browser-kit": "^5.4.21 || ^6.0", + "symfony/debug-bundle": "^5.4.21 || ^6.0", + "symfony/dotenv": "^5.4.21 || ^6.0", "symfony/flex": "^2.2", - "symfony/runtime": "^5.4 || ^6.0", - "symfony/web-profiler-bundle": "^5.4 || ^6.0", + "symfony/runtime": "^5.4.21 || ^6.0", + "symfony/web-profiler-bundle": "^5.4.21 || ^6.0", "symplify/monorepo-builder": "^11.0", "vimeo/psalm": "^4.19" }, @@ -252,7 +248,7 @@ "extra": { "symfony": { "allow-contrib": false, - "require": "^5.4 || ^6.0" + "require": "5.4.*" } }, "autoload": { diff --git a/src/Sylius/Bundle/AddressingBundle/composer.json b/src/Sylius/Bundle/AddressingBundle/composer.json index c6691fe0ed..74778dda3a 100644 --- a/src/Sylius/Bundle/AddressingBundle/composer.json +++ b/src/Sylius/Bundle/AddressingBundle/composer.json @@ -30,8 +30,8 @@ "stof/doctrine-extensions-bundle": "^1.4", "sylius/addressing": "^1.12", "sylius/resource-bundle": "^1.9", - "symfony/framework-bundle": "^5.4 || ^6.0", - "symfony/intl": "^5.4 || ^6.0" + "symfony/framework-bundle": "^5.4.21 || ^6.0", + "symfony/intl": "^5.4.21 || ^6.0" }, "conflict": { "twig/twig": "^1.0 || ^3.0" @@ -42,10 +42,10 @@ "phpspec/prophecy-phpunit": "^2.0", "phpunit/phpunit": "^9.5", "polishsymfonycommunity/symfony-mocker-container": "^1.0", - "symfony/browser-kit": "^5.4 || ^6.0", - "symfony/dependency-injection": "^5.4 || ^6.0", - "symfony/form": "^5.4 || ^6.0", - "symfony/validator": "^5.4 || ^6.0" + "symfony/browser-kit": "^5.4.21 || ^6.0", + "symfony/dependency-injection": "^5.4.21 || ^6.0", + "symfony/form": "^5.4.21 || ^6.0", + "symfony/validator": "^5.4.21 || ^6.0" }, "config": { "allow-plugins": { diff --git a/src/Sylius/Bundle/AdminBundle/composer.json b/src/Sylius/Bundle/AdminBundle/composer.json index 86a22f71ae..036d2d0eaf 100644 --- a/src/Sylius/Bundle/AdminBundle/composer.json +++ b/src/Sylius/Bundle/AdminBundle/composer.json @@ -35,7 +35,7 @@ "knplabs/knp-menu-bundle": "^3.0", "sylius/core-bundle": "^1.12", "sylius/ui-bundle": "^1.12", - "symfony/framework-bundle": "^5.4 || ^6.0", + "symfony/framework-bundle": "^5.4.21 || ^6.0", "symfony/webpack-encore-bundle": "^1.15", "twig/intl-extra": "^2.12 || ^3.4", "twig/twig": "^2.12 || ^3.3" @@ -44,8 +44,8 @@ "phpspec/phpspec": "^7.2", "phpspec/prophecy-phpunit": "^2.0", "phpunit/phpunit": "^9.5", - "symfony/dependency-injection": "^5.4 || ^6.0", - "symfony/dotenv": "^5.4 || ^6.0" + "symfony/dependency-injection": "^5.4.21 || ^6.0", + "symfony/dotenv": "^5.4.21 || ^6.0" }, "config": { "allow-plugins": { diff --git a/src/Sylius/Bundle/ApiBundle/composer.json b/src/Sylius/Bundle/ApiBundle/composer.json index beafe09d76..68ddf5263d 100644 --- a/src/Sylius/Bundle/ApiBundle/composer.json +++ b/src/Sylius/Bundle/ApiBundle/composer.json @@ -29,7 +29,7 @@ "enshrined/svg-sanitize": "^0.16", "lexik/jwt-authentication-bundle": "^2.11", "sylius/core-bundle": "^1.12", - "symfony/messenger": "^5.4 || ^6.0" + "symfony/messenger": "^5.4.21 || ^6.0" }, "require-dev": { "ext-sqlite3": "*", @@ -40,10 +40,10 @@ "phpspec/phpspec": "^7.2", "phpspec/prophecy-phpunit": "^2.0", "phpunit/phpunit": "^9.5", - "symfony/browser-kit": "^5.4 || ^6.0", - "symfony/debug-bundle": "^5.4 || ^6.0", - "symfony/dotenv": "^5.4 || ^6.0", - "symfony/http-client": "^5.4 || ^6.0", + "symfony/browser-kit": "^5.4.21 || ^6.0", + "symfony/debug-bundle": "^5.4.21 || ^6.0", + "symfony/dotenv": "^5.4.21 || ^6.0", + "symfony/http-client": "^5.4.21 || ^6.0", "symfony/webpack-encore-bundle": "^1.15", "theofidry/alice-data-fixtures": "^1.4" }, diff --git a/src/Sylius/Bundle/AttributeBundle/composer.json b/src/Sylius/Bundle/AttributeBundle/composer.json index e83af6febe..d90dfb50b0 100644 --- a/src/Sylius/Bundle/AttributeBundle/composer.json +++ b/src/Sylius/Bundle/AttributeBundle/composer.json @@ -31,16 +31,16 @@ "stof/doctrine-extensions-bundle": "^1.4", "sylius/attribute": "^1.12", "sylius/resource-bundle": "^1.9", - "symfony/framework-bundle": "^5.4 || ^6.0" + "symfony/framework-bundle": "^5.4.21 || ^6.0" }, "require-dev": { "doctrine/orm": "^2.13", "phpspec/phpspec": "^7.2", "phpspec/prophecy-phpunit": "^2.0", "phpunit/phpunit": "^9.5", - "symfony/browser-kit": "^5.4 || ^6.0", - "symfony/dependency-injection": "^5.4 || ^6.0", - "symfony/form": "^5.4 || ^6.0" + "symfony/browser-kit": "^5.4.21 || ^6.0", + "symfony/dependency-injection": "^5.4.21 || ^6.0", + "symfony/form": "^5.4.21 || ^6.0" }, "config": { "allow-plugins": { diff --git a/src/Sylius/Bundle/ChannelBundle/composer.json b/src/Sylius/Bundle/ChannelBundle/composer.json index 33827b6157..0e89a2198a 100644 --- a/src/Sylius/Bundle/ChannelBundle/composer.json +++ b/src/Sylius/Bundle/ChannelBundle/composer.json @@ -28,7 +28,7 @@ "php": "^8.0", "sylius/channel": "^1.12", "sylius/resource-bundle": "^1.9", - "symfony/framework-bundle": "^5.4 || ^6.0" + "symfony/framework-bundle": "^5.4.21 || ^6.0" }, "require-dev": { "doctrine/orm": "^2.13", @@ -36,9 +36,9 @@ "phpspec/phpspec": "^7.2", "phpunit/phpunit": "^9.5", "polishsymfonycommunity/symfony-mocker-container": "^1.0", - "symfony/browser-kit": "^5.4 || ^6.0", - "symfony/dependency-injection": "^5.4 || ^6.0", - "symfony/form": "^5.4 || ^6.0", + "symfony/browser-kit": "^5.4.21 || ^6.0", + "symfony/dependency-injection": "^5.4.21 || ^6.0", + "symfony/form": "^5.4.21 || ^6.0", "twig/twig": "^2.12 || ^3.3" }, "config": { diff --git a/src/Sylius/Bundle/CoreBundle/composer.json b/src/Sylius/Bundle/CoreBundle/composer.json index d64bcc48e1..5ff58614af 100644 --- a/src/Sylius/Bundle/CoreBundle/composer.json +++ b/src/Sylius/Bundle/CoreBundle/composer.json @@ -30,11 +30,11 @@ "doctrine/doctrine-migrations-bundle": "^3.0.1", "egulias/email-validator": "^3.1", "fakerphp/faker": "^1.10", - "jms/serializer-bundle": "^4.0", + "jms/serializer-bundle": "^4.2", "knplabs/gaufrette": "^0.10 || ^0.11", "knplabs/knp-gaufrette-bundle": "^0.7 || ^0.8", "league/flysystem-bundle": "^2.4", - "liip/imagine-bundle": "^2.3", + "liip/imagine-bundle": "^2.10", "sonata-project/block-bundle": "^4.2", "sylius-labs/association-hydrator": "^1.1 || ^1.2", "sylius-labs/doctrine-migrations-extra-bundle": "^0.1.4 || ^0.2", @@ -64,24 +64,24 @@ "sylius/theme-bundle": "^2.1.1 || ^2.3", "sylius/ui-bundle": "^1.12", "sylius/user-bundle": "^1.12", - "symfony/framework-bundle": "^5.4 || ^6.0", - "symfony/intl": "^5.4 || ^6.0", - "symfony/mailer": "^5.4 || ^6.0", - "symfony/messenger": "^5.4 || ^6.0", - "symfony/templating": "^5.4 || ^6.0", + "symfony/framework-bundle": "^5.4.21 || ^6.0", + "symfony/intl": "^5.4.21 || ^6.0", + "symfony/mailer": "^5.4.21 || ^6.0", + "symfony/messenger": "^5.4.21 || ^6.0", + "symfony/templating": "^5.4.21 || ^6.0", "symfony/webpack-encore-bundle": "^1.15", "winzou/state-machine-bundle": "^0.6" }, "require-dev": { - "doctrine/doctrine-bundle": "^1.12 || ^2.0", + "doctrine/doctrine-bundle": "^1.12 || ^2.3.1", "hwi/oauth-bundle": "^1.1 || ^2.0@beta", "matthiasnoback/symfony-config-test": "^4.2", "matthiasnoback/symfony-dependency-injection-test": "^4.2", "phpspec/phpspec": "^7.2", "phpspec/prophecy-phpunit": "^2.0", "phpunit/phpunit": "^9.5", - "symfony/dependency-injection": "^5.4 || ^6.0", - "symfony/dotenv": "^5.4 || ^6.0" + "symfony/dependency-injection": "^5.4.21 || ^6.0", + "symfony/dotenv": "^5.4.21 || ^6.0" }, "conflict": { "symfony/doctrine-bridge": "4.4.20 || 5.2.4 || 5.2.5" @@ -97,7 +97,7 @@ "dev-master": "1.12-dev" }, "symfony": { - "require": "^5.4" + "require": "^5.4.21" } }, "autoload": { diff --git a/src/Sylius/Bundle/CurrencyBundle/composer.json b/src/Sylius/Bundle/CurrencyBundle/composer.json index 7242cf9cd4..78433fe9a8 100644 --- a/src/Sylius/Bundle/CurrencyBundle/composer.json +++ b/src/Sylius/Bundle/CurrencyBundle/composer.json @@ -28,9 +28,9 @@ "php": "^8.0", "sylius/currency": "^1.12", "sylius/resource-bundle": "^1.9", - "symfony/framework-bundle": "^5.4 || ^6.0", - "symfony/intl": "^5.4 || ^6.0", - "symfony/templating": "^5.4 || ^6.0" + "symfony/framework-bundle": "^5.4.21 || ^6.0", + "symfony/intl": "^5.4.21 || ^6.0", + "symfony/templating": "^5.4.21 || ^6.0" }, "conflict": { "twig/twig": "^1.0" @@ -40,9 +40,9 @@ "phpspec/phpspec": "^7.2", "phpunit/phpunit": "^9.5", "polishsymfonycommunity/symfony-mocker-container": "^1.0", - "symfony/browser-kit": "^5.4 || ^6.0", - "symfony/dependency-injection": "^5.4 || ^6.0", - "symfony/form": "^5.4 || ^6.0", + "symfony/browser-kit": "^5.4.21 || ^6.0", + "symfony/dependency-injection": "^5.4.21 || ^6.0", + "symfony/form": "^5.4.21 || ^6.0", "twig/twig": "^2.12 || ^3.3" }, "config": { diff --git a/src/Sylius/Bundle/CustomerBundle/composer.json b/src/Sylius/Bundle/CustomerBundle/composer.json index 9f1cce8aa7..7d965a3614 100644 --- a/src/Sylius/Bundle/CustomerBundle/composer.json +++ b/src/Sylius/Bundle/CustomerBundle/composer.json @@ -40,7 +40,7 @@ "egulias/email-validator": "^3.1", "sylius/customer": "^1.12", "sylius/resource-bundle": "^1.9", - "symfony/framework-bundle": "^5.4 || ^6.0", + "symfony/framework-bundle": "^5.4.21 || ^6.0", "webmozart/assert": "^1.9" }, "conflict": { @@ -50,9 +50,9 @@ "phpspec/phpspec": "^7.2", "phpunit/phpunit": "^9.5", "polishsymfonycommunity/symfony-mocker-container": "^1.0", - "symfony/browser-kit": "^5.4 || ^6.0", - "symfony/dependency-injection": "^5.4 || ^6.0", - "symfony/form": "^5.4 || ^6.0" + "symfony/browser-kit": "^5.4.21 || ^6.0", + "symfony/dependency-injection": "^5.4.21 || ^6.0", + "symfony/form": "^5.4.21 || ^6.0" }, "config": { "allow-plugins": { diff --git a/src/Sylius/Bundle/InventoryBundle/composer.json b/src/Sylius/Bundle/InventoryBundle/composer.json index f961309fd4..08625dbb8d 100644 --- a/src/Sylius/Bundle/InventoryBundle/composer.json +++ b/src/Sylius/Bundle/InventoryBundle/composer.json @@ -29,9 +29,9 @@ "php": "^8.0", "sylius/inventory": "^1.12", "sylius/resource-bundle": "^1.9", - "symfony/framework-bundle": "^5.4 || ^6.0", - "symfony/templating": "^5.4 || ^6.0", - "symfony/validator": "^5.4 || ^6.0" + "symfony/framework-bundle": "^5.4.21 || ^6.0", + "symfony/templating": "^5.4.21 || ^6.0", + "symfony/validator": "^5.4.21 || ^6.0" }, "conflict": { "twig/twig": "^1.0" @@ -41,8 +41,8 @@ "phpspec/phpspec": "^7.2", "phpunit/phpunit": "^9.5", "polishsymfonycommunity/symfony-mocker-container": "^1.0", - "symfony/browser-kit": "^5.4 || ^6.0", - "symfony/dependency-injection": "^5.4 || ^6.0", + "symfony/browser-kit": "^5.4.21 || ^6.0", + "symfony/dependency-injection": "^5.4.21 || ^6.0", "twig/twig": "^2.12 || ^3.3" }, "config": { diff --git a/src/Sylius/Bundle/LocaleBundle/composer.json b/src/Sylius/Bundle/LocaleBundle/composer.json index e862eb4c89..66e1293862 100644 --- a/src/Sylius/Bundle/LocaleBundle/composer.json +++ b/src/Sylius/Bundle/LocaleBundle/composer.json @@ -29,8 +29,8 @@ "php": "^8.0", "sylius/locale": "^1.12", "sylius/resource-bundle": "^1.9", - "symfony/framework-bundle": "^5.4 || ^6.0", - "symfony/templating": "^5.4 || ^6.0" + "symfony/framework-bundle": "^5.4.21 || ^6.0", + "symfony/templating": "^5.4.21 || ^6.0" }, "conflict": { "twig/twig": "^1.0" @@ -41,8 +41,8 @@ "phpspec/phpspec": "^7.2", "phpunit/phpunit": "^9.5", "polishsymfonycommunity/symfony-mocker-container": "^1.0", - "symfony/browser-kit": "^5.4 || ^6.0", - "symfony/dependency-injection": "^5.4 || ^6.0", + "symfony/browser-kit": "^5.4.21 || ^6.0", + "symfony/dependency-injection": "^5.4.21 || ^6.0", "twig/twig": "^2.12 || ^3.3" }, "config": { diff --git a/src/Sylius/Bundle/MoneyBundle/composer.json b/src/Sylius/Bundle/MoneyBundle/composer.json index e445954a4b..c11de824be 100644 --- a/src/Sylius/Bundle/MoneyBundle/composer.json +++ b/src/Sylius/Bundle/MoneyBundle/composer.json @@ -27,9 +27,9 @@ "require": { "php": "^8.0", "sylius/resource-bundle": "^1.9", - "symfony/framework-bundle": "^5.4 || ^6.0", - "symfony/intl": "^5.4 || ^6.0", - "symfony/templating": "^5.4 || ^6.0", + "symfony/framework-bundle": "^5.4.21 || ^6.0", + "symfony/intl": "^5.4.21 || ^6.0", + "symfony/templating": "^5.4.21 || ^6.0", "webmozart/assert": "^1.9" }, "conflict": { @@ -41,9 +41,9 @@ "phpunit/phpunit": "^9.5", "polishsymfonycommunity/symfony-mocker-container": "^1.0", "sylius/currency-bundle": "^1.12", - "symfony/browser-kit": "^5.4 || ^6.0", - "symfony/dependency-injection": "^5.4 || ^6.0", - "symfony/form": "^5.4 || ^6.0", + "symfony/browser-kit": "^5.4.21 || ^6.0", + "symfony/dependency-injection": "^5.4.21 || ^6.0", + "symfony/form": "^5.4.21 || ^6.0", "twig/twig": "^2.12 || ^3.3" }, "config": { diff --git a/src/Sylius/Bundle/OrderBundle/composer.json b/src/Sylius/Bundle/OrderBundle/composer.json index af1ca103e3..1dfcbc97ae 100644 --- a/src/Sylius/Bundle/OrderBundle/composer.json +++ b/src/Sylius/Bundle/OrderBundle/composer.json @@ -33,8 +33,8 @@ "sylius/money-bundle": "^1.12", "sylius/order": "^1.12", "sylius/resource-bundle": "^1.9", - "symfony/framework-bundle": "^5.4 || ^6.0", - "symfony/templating": "^5.4 || ^6.0" + "symfony/framework-bundle": "^5.4.21 || ^6.0", + "symfony/templating": "^5.4.21 || ^6.0" }, "conflict": { "twig/twig": "^1.0 || ^3.0" @@ -44,9 +44,9 @@ "matthiasnoback/symfony-dependency-injection-test": "^4.2", "phpspec/phpspec": "^7.2", "phpunit/phpunit": "^9.5", - "symfony/browser-kit": "^5.4 || ^6.0", - "symfony/form": "^5.4 || ^6.0", - "symfony/validator": "^5.4 || ^6.0" + "symfony/browser-kit": "^5.4.21 || ^6.0", + "symfony/form": "^5.4.21 || ^6.0", + "symfony/validator": "^5.4.21 || ^6.0" }, "config": { "allow-plugins": { diff --git a/src/Sylius/Bundle/PaymentBundle/composer.json b/src/Sylius/Bundle/PaymentBundle/composer.json index 6b3c1ac251..17447598f8 100644 --- a/src/Sylius/Bundle/PaymentBundle/composer.json +++ b/src/Sylius/Bundle/PaymentBundle/composer.json @@ -29,7 +29,7 @@ "php": "^8.0", "sylius/payment": "^1.12", "sylius/resource-bundle": "^1.9", - "symfony/framework-bundle": "^5.4 || ^6.0" + "symfony/framework-bundle": "^5.4.21 || ^6.0" }, "conflict": { "twig/twig": "^3.0" @@ -41,8 +41,8 @@ "phpunit/phpunit": "^9.5", "polishsymfonycommunity/symfony-mocker-container": "^1.0", "sylius/locale-bundle": "^1.12", - "symfony/browser-kit": "^5.4 || ^6.0", - "symfony/dependency-injection": "^5.4 || ^6.0" + "symfony/browser-kit": "^5.4.21 || ^6.0", + "symfony/dependency-injection": "^5.4.21 || ^6.0" }, "config": { "allow-plugins": { diff --git a/src/Sylius/Bundle/PayumBundle/composer.json b/src/Sylius/Bundle/PayumBundle/composer.json index ebefe67431..b88825f0bc 100644 --- a/src/Sylius/Bundle/PayumBundle/composer.json +++ b/src/Sylius/Bundle/PayumBundle/composer.json @@ -40,7 +40,7 @@ }, "require-dev": { "phpspec/phpspec": "^7.2", - "symfony/dependency-injection": "^5.4 || ^6.0" + "symfony/dependency-injection": "^5.4.21 || ^6.0" }, "config": { "allow-plugins": { diff --git a/src/Sylius/Bundle/ProductBundle/composer.json b/src/Sylius/Bundle/ProductBundle/composer.json index 4631be97f3..5ef69d280d 100644 --- a/src/Sylius/Bundle/ProductBundle/composer.json +++ b/src/Sylius/Bundle/ProductBundle/composer.json @@ -32,17 +32,17 @@ "sylius/locale-bundle": "^1.12", "sylius/product": "^1.12", "sylius/resource-bundle": "^1.9", - "symfony/framework-bundle": "^5.4 || ^6.0" + "symfony/framework-bundle": "^5.4.21 || ^6.0" }, "require-dev": { "doctrine/orm": "^2.13", "mockery/mockery": "^1.4", "phpspec/phpspec": "^7.2", "phpunit/phpunit": "^9.5", - "symfony/browser-kit": "^5.4 || ^6.0", - "symfony/dependency-injection": "^5.4 || ^6.0", - "symfony/form": "^5.4 || ^6.0", - "symfony/validator": "^5.4 || ^6.0" + "symfony/browser-kit": "^5.4.21 || ^6.0", + "symfony/dependency-injection": "^5.4.21 || ^6.0", + "symfony/form": "^5.4.21 || ^6.0", + "symfony/validator": "^5.4.21 || ^6.0" }, "config": { "allow-plugins": { diff --git a/src/Sylius/Bundle/PromotionBundle/composer.json b/src/Sylius/Bundle/PromotionBundle/composer.json index e489c18b47..7a0e0e777b 100644 --- a/src/Sylius/Bundle/PromotionBundle/composer.json +++ b/src/Sylius/Bundle/PromotionBundle/composer.json @@ -34,7 +34,7 @@ "sylius/promotion": "^1.12", "sylius/registry": "^1.5", "sylius/resource-bundle": "^1.9", - "symfony/framework-bundle": "^5.4 || ^6.0" + "symfony/framework-bundle": "^5.4.21 || ^6.0" }, "conflict": { "twig/twig": "^3.0" @@ -46,10 +46,10 @@ "phpspec/prophecy-phpunit": "^2.0", "phpunit/phpunit": "^9.5", "polishsymfonycommunity/symfony-mocker-container": "^1.0", - "symfony/browser-kit": "^5.4 || ^6.0", - "symfony/dependency-injection": "^5.4 || ^6.0", - "symfony/form": "^5.4 || ^6.0", - "symfony/validator": "^5.4 || ^6.0" + "symfony/browser-kit": "^5.4.21 || ^6.0", + "symfony/dependency-injection": "^5.4.21 || ^6.0", + "symfony/form": "^5.4.21 || ^6.0", + "symfony/validator": "^5.4.21 || ^6.0" }, "config": { "allow-plugins": { diff --git a/src/Sylius/Bundle/ReviewBundle/composer.json b/src/Sylius/Bundle/ReviewBundle/composer.json index 3401e0c687..652fd9c43d 100644 --- a/src/Sylius/Bundle/ReviewBundle/composer.json +++ b/src/Sylius/Bundle/ReviewBundle/composer.json @@ -44,7 +44,7 @@ "sylius/resource-bundle": "^1.9", "sylius/review": "^1.12", "sylius/user-bundle": "^1.12", - "symfony/framework-bundle": "^5.4 || ^6.0" + "symfony/framework-bundle": "^5.4.21 || ^6.0" }, "conflict": { "twig/twig": "^3.0" @@ -54,11 +54,11 @@ "phpspec/prophecy-phpunit": "^2.0", "phpunit/phpunit": "^9.5", "polishsymfonycommunity/symfony-mocker-container": "^1.0", - "symfony/browser-kit": "^5.4 || ^6.0", - "symfony/dependency-injection": "^5.4 || ^6.0", - "symfony/form": "^5.4 || ^6.0", - "symfony/security-bundle": "^5.4 || ^6.0", - "symfony/validator": "^5.4 || ^6.0" + "symfony/browser-kit": "^5.4.21 || ^6.0", + "symfony/dependency-injection": "^5.4.21 || ^6.0", + "symfony/form": "^5.4.21 || ^6.0", + "symfony/security-bundle": "^5.4.21 || ^6.0", + "symfony/validator": "^5.4.21 || ^6.0" }, "config": { "allow-plugins": { diff --git a/src/Sylius/Bundle/ShippingBundle/composer.json b/src/Sylius/Bundle/ShippingBundle/composer.json index 34a5ec510a..ae29fb6b12 100644 --- a/src/Sylius/Bundle/ShippingBundle/composer.json +++ b/src/Sylius/Bundle/ShippingBundle/composer.json @@ -34,7 +34,7 @@ "sylius/money-bundle": "^1.12", "sylius/resource-bundle": "^1.9", "sylius/shipping": "^1.12", - "symfony/framework-bundle": "^5.4 || ^6.0" + "symfony/framework-bundle": "^5.4.21 || ^6.0" }, "conflict": { "twig/twig": "^3.0" @@ -45,10 +45,10 @@ "phpspec/phpspec": "^7.2", "phpunit/phpunit": "^9.5", "polishsymfonycommunity/symfony-mocker-container": "^1.0", - "symfony/browser-kit": "^5.4 || ^6.0", - "symfony/dependency-injection": "^5.4 || ^6.0", - "symfony/form": "^5.4 || ^6.0", - "symfony/validator": "^5.4 || ^6.0" + "symfony/browser-kit": "^5.4.21 || ^6.0", + "symfony/dependency-injection": "^5.4.21 || ^6.0", + "symfony/form": "^5.4.21 || ^6.0", + "symfony/validator": "^5.4.21 || ^6.0" }, "config": { "allow-plugins": { diff --git a/src/Sylius/Bundle/ShopBundle/composer.json b/src/Sylius/Bundle/ShopBundle/composer.json index 22560d454a..cf285ca92e 100644 --- a/src/Sylius/Bundle/ShopBundle/composer.json +++ b/src/Sylius/Bundle/ShopBundle/composer.json @@ -29,8 +29,8 @@ "php": "^8.0", "sylius/core-bundle": "^1.12", "sylius/ui-bundle": "^1.12", - "symfony/framework-bundle": "^5.4 || ^6.0", - "symfony/security-bundle": "^5.4 || ^6.0", + "symfony/framework-bundle": "^5.4.21 || ^6.0", + "symfony/security-bundle": "^5.4.21 || ^6.0", "symfony/webpack-encore-bundle": "^1.15", "twig/intl-extra": "^2.12 || ^3.4", "twig/twig": "^2.12 || ^3.3" @@ -41,7 +41,7 @@ "mockery/mockery": "^1.4", "phpspec/phpspec": "^7.2", "phpunit/phpunit": "^9.5", - "symfony/dependency-injection": "^5.4 || ^6.0" + "symfony/dependency-injection": "^5.4.21 || ^6.0" }, "config": { "allow-plugins": { diff --git a/src/Sylius/Bundle/TaxationBundle/composer.json b/src/Sylius/Bundle/TaxationBundle/composer.json index 672fe31491..7019f08302 100644 --- a/src/Sylius/Bundle/TaxationBundle/composer.json +++ b/src/Sylius/Bundle/TaxationBundle/composer.json @@ -33,7 +33,7 @@ "sylius/registry": "^1.5", "sylius/resource-bundle": "^1.9", "sylius/taxation": "^1.12", - "symfony/framework-bundle": "^5.4 || ^6.0" + "symfony/framework-bundle": "^5.4.21 || ^6.0" }, "conflict": { "twig/twig": "^3.0" @@ -44,9 +44,9 @@ "phpspec/phpspec": "^7.2", "phpunit/phpunit": "^9.5", "polishsymfonycommunity/symfony-mocker-container": "^1.0", - "symfony/browser-kit": "^5.4 || ^6.0", - "symfony/dependency-injection": "^5.4 || ^6.0", - "symfony/form": "^5.4 || ^6.0" + "symfony/browser-kit": "^5.4.21 || ^6.0", + "symfony/dependency-injection": "^5.4.21 || ^6.0", + "symfony/form": "^5.4.21 || ^6.0" }, "config": { "allow-plugins": { diff --git a/src/Sylius/Bundle/TaxonomyBundle/composer.json b/src/Sylius/Bundle/TaxonomyBundle/composer.json index 8efd6c147b..eee8bad9fc 100644 --- a/src/Sylius/Bundle/TaxonomyBundle/composer.json +++ b/src/Sylius/Bundle/TaxonomyBundle/composer.json @@ -32,7 +32,7 @@ "stof/doctrine-extensions-bundle": "^1.4", "sylius/resource-bundle": "^1.9", "sylius/taxonomy": "^1.12", - "symfony/framework-bundle": "^5.4 || ^6.0" + "symfony/framework-bundle": "^5.4.21 || ^6.0" }, "conflict": { "twig/twig": "^3.0" @@ -41,7 +41,7 @@ "doctrine/orm": "^2.13", "phpspec/phpspec": "^7.2", "phpunit/phpunit": "^9.5", - "symfony/dependency-injection": "^5.4 || ^6.0" + "symfony/dependency-injection": "^5.4.21 || ^6.0" }, "config": { "allow-plugins": { diff --git a/src/Sylius/Bundle/UiBundle/composer.json b/src/Sylius/Bundle/UiBundle/composer.json index 6c5aaa6021..2e91947684 100644 --- a/src/Sylius/Bundle/UiBundle/composer.json +++ b/src/Sylius/Bundle/UiBundle/composer.json @@ -35,11 +35,11 @@ "sonata-project/block-bundle": "^4.2", "sylius-labs/polyfill-symfony-event-dispatcher": "^1.0.1", "sylius/grid-bundle": "^1.11", - "symfony/config": "^5.4 || ^6.0", - "symfony/framework-bundle": "^5.4 || ^6.0", - "symfony/security-core": "^5.4 || ^6.0", - "symfony/security-bundle": "^5.4 || ^6.0", - "symfony/templating": "^5.4 || ^6.0", + "symfony/config": "^5.4.21 || ^6.0", + "symfony/framework-bundle": "^5.4.21 || ^6.0", + "symfony/security-core": "^5.4.21 || ^6.0", + "symfony/security-bundle": "^5.4.21 || ^6.0", + "symfony/templating": "^5.4.21 || ^6.0", "symfony/webpack-encore-bundle": "^1.15", "laminas/laminas-stdlib": "^3.3.1" }, @@ -51,8 +51,8 @@ "matthiasnoback/symfony-dependency-injection-test": "^4.2", "phpspec/phpspec": "^7.2", "phpunit/phpunit": "^9.5", - "symfony/dependency-injection": "^5.4 || ^6.0", - "symfony/form": "^5.4 || ^6.0", + "symfony/dependency-injection": "^5.4.21 || ^6.0", + "symfony/form": "^5.4.21 || ^6.0", "twig/twig": "^2.12 || ^3.3" }, "config": { diff --git a/src/Sylius/Bundle/UserBundle/composer.json b/src/Sylius/Bundle/UserBundle/composer.json index fa7602c227..71f9f49320 100644 --- a/src/Sylius/Bundle/UserBundle/composer.json +++ b/src/Sylius/Bundle/UserBundle/composer.json @@ -45,8 +45,8 @@ "sylius/mailer-bundle": "^1.8 || ^2.0@beta", "sylius/resource-bundle": "^1.9", "sylius/user": "^1.12", - "symfony/framework-bundle": "^5.4 || ^6.0", - "symfony/password-hasher": "^5.4 || ^6.0", + "symfony/framework-bundle": "^5.4.21 || ^6.0", + "symfony/password-hasher": "^5.4.21 || ^6.0", "webmozart/assert": "^1.9" }, "conflict": { @@ -58,9 +58,9 @@ "php-http/guzzle6-adapter": "^2.0", "phpspec/phpspec": "^7.2", "phpunit/phpunit": "^9.5", - "symfony/dependency-injection": "^5.4 || ^6.0", - "symfony/security-bundle": "^5.4 || ^6.0", - "symfony/mailer": "^5.4 || ^6.0" + "symfony/dependency-injection": "^5.4.21 || ^6.0", + "symfony/security-bundle": "^5.4.21 || ^6.0", + "symfony/mailer": "^5.4.21 || ^6.0" }, "suggest": { "hwi/oauth-bundle": "For OAuth integration" diff --git a/src/Sylius/Component/Addressing/composer.json b/src/Sylius/Component/Addressing/composer.json index 509a501b39..c212414062 100644 --- a/src/Sylius/Component/Addressing/composer.json +++ b/src/Sylius/Component/Addressing/composer.json @@ -29,7 +29,7 @@ "php": "^8.0", "sylius/registry": "^1.5", "sylius/resource": "^1.9", - "symfony/intl": "^5.4 || ^6.0" + "symfony/intl": "^5.4.21 || ^6.0" }, "require-dev": { "phpspec/phpspec": "^7.2" diff --git a/src/Sylius/Component/Attribute/composer.json b/src/Sylius/Component/Attribute/composer.json index 21c9ae3034..3aaa8c5011 100644 --- a/src/Sylius/Component/Attribute/composer.json +++ b/src/Sylius/Component/Attribute/composer.json @@ -29,7 +29,7 @@ "doctrine/collections": "^1.6", "sylius/registry": "^1.5", "sylius/resource": "^1.9", - "symfony/validator": "^5.4 || ^6.0" + "symfony/validator": "^5.4.21 || ^6.0" }, "require-dev": { "phpspec/phpspec": "^7.2" diff --git a/src/Sylius/Component/Channel/composer.json b/src/Sylius/Component/Channel/composer.json index e0edd3e6e7..cb9ca1a08b 100644 --- a/src/Sylius/Component/Channel/composer.json +++ b/src/Sylius/Component/Channel/composer.json @@ -29,8 +29,8 @@ "require": { "php": "^8.0", "sylius/resource": "^1.9", - "symfony/form": "^5.4 || ^6.0", - "symfony/http-foundation": "^5.4 || ^6.0", + "symfony/form": "^5.4.21 || ^6.0", + "symfony/http-foundation": "^5.4.21 || ^6.0", "laminas/laminas-stdlib": "^3.3.1" }, "require-dev": { diff --git a/src/Sylius/Component/Core/composer.json b/src/Sylius/Component/Core/composer.json index f1c9c0fcb0..c20a212195 100644 --- a/src/Sylius/Component/Core/composer.json +++ b/src/Sylius/Component/Core/composer.json @@ -50,16 +50,16 @@ "sylius/taxation": "^1.12", "sylius/taxonomy": "^1.12", "sylius/user": "^1.12", - "symfony/http-foundation": "^5.4 || ^6.0", - "symfony/mime": "^5.4 || ^6.0", - "symfony/string": "^5.4 || ^6.0", + "symfony/http-foundation": "^5.4.21 || ^6.0", + "symfony/mime": "^5.4.21 || ^6.0", + "symfony/string": "^5.4.21 || ^6.0", "webmozart/assert": "^1.9", "laminas/laminas-stdlib": "^3.3.1" }, "require-dev": { "phpspec/phpspec": "^7.2", "phpunit/phpunit": "^9.5", - "symfony/property-access": "^5.4 || ^6.0" + "symfony/property-access": "^5.4.21 || ^6.0" }, "config": { "allow-plugins": { diff --git a/src/Sylius/Component/Currency/composer.json b/src/Sylius/Component/Currency/composer.json index 21d9a208de..e6e40ee015 100644 --- a/src/Sylius/Component/Currency/composer.json +++ b/src/Sylius/Component/Currency/composer.json @@ -27,7 +27,7 @@ "require": { "php": "^8.0", "sylius/resource": "^1.9", - "symfony/intl": "^5.4 || ^6.0", + "symfony/intl": "^5.4.21 || ^6.0", "laminas/laminas-stdlib": "^3.3.1" }, "require-dev": { diff --git a/src/Sylius/Component/Locale/composer.json b/src/Sylius/Component/Locale/composer.json index 7054b4fc35..03376f540d 100644 --- a/src/Sylius/Component/Locale/composer.json +++ b/src/Sylius/Component/Locale/composer.json @@ -28,7 +28,7 @@ "require": { "php": "^8.0", "sylius/resource": "^1.9", - "symfony/intl": "^5.4 || ^6.0", + "symfony/intl": "^5.4.21 || ^6.0", "laminas/laminas-stdlib": "^3.3.1" }, "require-dev": { diff --git a/src/Sylius/Component/Shipping/composer.json b/src/Sylius/Component/Shipping/composer.json index 23584d1902..1d797639ec 100644 --- a/src/Sylius/Component/Shipping/composer.json +++ b/src/Sylius/Component/Shipping/composer.json @@ -31,7 +31,7 @@ "php": "^8.0", "sylius/registry": "^1.5", "sylius/resource": "^1.9", - "symfony/options-resolver": "^5.4 || ^6.0" + "symfony/options-resolver": "^5.4.21 || ^6.0" }, "require-dev": { "phpspec/phpspec": "^7.2" diff --git a/src/Sylius/Component/User/composer.json b/src/Sylius/Component/User/composer.json index 8111de6e57..6905f7512c 100644 --- a/src/Sylius/Component/User/composer.json +++ b/src/Sylius/Component/User/composer.json @@ -38,7 +38,7 @@ "sylius-labs/polyfill-symfony-security": "^1.1", "sylius/resource": "^1.9", "symfony/polyfill-mbstring": "^1.17", - "symfony/security-core": "^5.4 || ^6.0" + "symfony/security-core": "^5.4.21 || ^6.0" }, "require-dev": { "phpspec/phpspec": "^7.2"