diff --git a/.github/workflows/application.yml b/.github/workflows/application.yml index c9bddf48e9..0e09cff9e1 100644 --- a/.github/workflows/application.yml +++ b/.github/workflows/application.yml @@ -32,7 +32,7 @@ jobs: fail-fast: false matrix: php: ["8.0", "8.1"] - symfony: ["^5.4"] + symfony: ["^5.4", "^6.0"] api-platform: ["^2.7"] include: @@ -124,6 +124,21 @@ jobs: with: base: old-composer.lock + - + name: Show diff in comment to PR + uses: marocchino/sticky-pull-request-comment@v2 + if: ${{ steps.composer_diff.outputs.composer_diff_exit_code != 0 }} + with: + recreate: true + header: composer-diff # Creates a collapsed comment with the report + message: | +
+ Composer package changes + + ${{ steps.composer_diff.outputs.composer_diff }} + +
+ - name: Check for security vulnerabilities run: symfony security:check @@ -196,7 +211,7 @@ jobs: fail-fast: false matrix: php: ["8.0", "8.1"] - symfony: ["^5.4"] + symfony: ["^5.4", "^6.0"] api-platform: ["^2.7"] include: @@ -254,7 +269,7 @@ jobs: strategy: matrix: php: ["8.0"] - symfony: ["^5.4"] + symfony: ["^5.4", "^6.0"] postgres: ["13.8"] node: ["16.x"] @@ -401,7 +416,7 @@ jobs: strategy: matrix: php: ["8.0"] - symfony: ["^5.4"] + symfony: ["^5.4", "^6.0"] mariadb: ["10.4.10"] dbal: ["2", "3"] node: ["16.x"] @@ -568,7 +583,7 @@ jobs: fail-fast: false matrix: php: ["8.0", "8.1"] - symfony: ["^5.4"] + symfony: ["^5.4", "^6.0"] api-platform: ["^2.7"] mysql: ["5.7", "8.0"] twig: ["3.x"] @@ -776,8 +791,8 @@ jobs: fail-fast: false matrix: php: ["8.0", "8.1"] - symfony: ["^5.4"] - node: ["14.x", "16.x", "18.x"] + symfony: ["^5.4", "^6.0"] + node: ["16.x", "18.x"] mysql: ["5.7", "8.0"] env: diff --git a/.github/workflows/packages.yml b/.github/workflows/packages.yml index cb8d0e9583..1ade304dc9 100644 --- a/.github/workflows/packages.yml +++ b/.github/workflows/packages.yml @@ -51,7 +51,7 @@ jobs: fail-fast: false matrix: php: ["8.0", "8.1"] - symfony: ["^5.4"] + symfony: ["^5.4", "^6.0"] package: "${{ fromJson(needs.list.outputs.packages) }}" steps: diff --git a/composer.json b/composer.json index 062a46bfd0..e28526b4b4 100644 --- a/composer.json +++ b/composer.json @@ -85,49 +85,49 @@ "sylius/resource": "^1.9", "sylius/resource-bundle": "^1.9", "sylius/theme-bundle": "^2.1.1", - "symfony/asset": "^5.4", - "symfony/config": "^5.4", - "symfony/console": "^5.4", - "symfony/dependency-injection": "^5.4", + "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/deprecation-contracts": "^2.5", - "symfony/doctrine-bridge": "^5.4", - "symfony/event-dispatcher": "^5.4", - "symfony/expression-language": "^5.4", - "symfony/filesystem": "^5.4", - "symfony/finder": "^5.4", - "symfony/form": "^5.4", - "symfony/framework-bundle": "^5.4", - "symfony/http-foundation": "^5.4", - "symfony/http-kernel": "^5.4", - "symfony/intl": "^5.4", - "symfony/messenger": "^5.4", + "symfony/doctrine-bridge": "^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/messenger": "^5.4 || ^6.0", "symfony/monolog-bundle": "^3.5", - "symfony/options-resolver": "^5.4", - "symfony/password-hasher": "^5.4", + "symfony/options-resolver": "^5.4 || ^6.0", + "symfony/password-hasher": "^5.4 || 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", - "symfony/property-access": "^5.4", - "symfony/property-info": "^5.4", - "symfony/proxy-manager-bridge": "^5.4", - "symfony/routing": "^5.4", - "symfony/security-bundle": "^5.4", - "symfony/security-core": "^5.4", - "symfony/security-csrf": "^5.4", - "symfony/security-guard": "^5.4", - "symfony/security-http": "^5.4", - "symfony/serializer": "^5.4", - "symfony/string": "^5.4", + "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-guard": "^5.4 || ^6.0", + "symfony/security-http": "^5.4 || ^6.0", + "symfony/serializer": "^5.4 || ^6.0", + "symfony/string": "^5.4 || ^6.0", "symfony/swiftmailer-bundle": "^3.4", - "symfony/templating": "^5.4", - "symfony/translation": "^5.4", + "symfony/templating": "^5.4 || ^6.0", + "symfony/translation": "^5.4 || ^6.0", "symfony/translation-contracts": "^2.5", - "symfony/twig-bundle": "^5.4", - "symfony/validator": "^5.4", + "symfony/twig-bundle": "^5.4 || ^6.0", + "symfony/validator": "^5.4 || ^6.0", "symfony/webpack-encore-bundle": "^1.15", - "symfony/yaml": "^5.4", + "symfony/yaml": "^5.4 || ^6.0", "twig/intl-extra": "^2.12", "twig/twig": "^2.12 || ^3.3", "webmozart/assert": "^1.9", @@ -229,11 +229,11 @@ "rector/rector": "^0.12.20", "stripe/stripe-php": "^8.1", "sylius-labs/coding-standard": "^4.2", - "symfony/browser-kit": "^5.4", - "symfony/debug-bundle": "^5.4", - "symfony/dotenv": "^5.4", + "symfony/browser-kit": "^5.4 || ^6.0", + "symfony/debug-bundle": "^5.4 || ^6.0", + "symfony/dotenv": "^5.4 || ^6.0", "symfony/flex": "^1.7", - "symfony/web-profiler-bundle": "^5.4", + "symfony/web-profiler-bundle": "^5.4 || ^6.0", "vimeo/psalm": "^4.19" }, "suggest": { diff --git a/src/Sylius/Bundle/AddressingBundle/composer.json b/src/Sylius/Bundle/AddressingBundle/composer.json index d513fbd8be..03fcdfcbf7 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.6", "sylius/resource-bundle": "^1.7", - "symfony/framework-bundle": "^5.4", - "symfony/intl": "^5.4" + "symfony/framework-bundle": "^5.4 || ^6.0", + "symfony/intl": "^5.4 || ^6.0" }, "conflict": { "twig/twig": "^1.0 || ^3.0" @@ -41,10 +41,10 @@ "phpspec/phpspec": "^7.2", "phpunit/phpunit": "^8.5", "polishsymfonycommunity/symfony-mocker-container": "^1.0", - "symfony/browser-kit": "^5.4", - "symfony/dependency-injection": "^5.4", - "symfony/form": "^5.4", - "symfony/validator": "^5.4" + "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" }, "config": { "allow-plugins": { diff --git a/src/Sylius/Bundle/AdminBundle/composer.json b/src/Sylius/Bundle/AdminBundle/composer.json index 86ba2d65e4..219e3abef6 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.6", "sylius/ui-bundle": "^1.6", - "symfony/framework-bundle": "^5.4", + "symfony/framework-bundle": "^5.4 || ^6.0", "symfony/webpack-encore-bundle": "^1.15", "twig/intl-extra": "^2.12", "twig/twig": "^2.12" @@ -43,7 +43,7 @@ "require-dev": { "phpspec/phpspec": "^7.2", "phpunit/phpunit": "^8.5", - "symfony/dependency-injection": "^5.4" + "symfony/dependency-injection": "^5.4 || ^6.0" }, "config": { "allow-plugins": { diff --git a/src/Sylius/Bundle/ApiBundle/composer.json b/src/Sylius/Bundle/ApiBundle/composer.json index 0bbe5c73b6..bbcc290727 100644 --- a/src/Sylius/Bundle/ApiBundle/composer.json +++ b/src/Sylius/Bundle/ApiBundle/composer.json @@ -29,7 +29,7 @@ "enshrined/svg-sanitize": "^0.15.4", "lexik/jwt-authentication-bundle": "^2.6", "sylius/core-bundle": "^1.7", - "symfony/messenger": "^5.4" + "symfony/messenger": "^5.4 || ^6.0" }, "require-dev": { "matthiasnoback/symfony-config-test": "^4.2", @@ -38,10 +38,10 @@ "phparkitect/phparkitect": "^0.2.9", "phpspec/phpspec": "^7.2", "phpunit/phpunit": "^8.5", - "symfony/browser-kit": "^5.4", - "symfony/debug-bundle": "^5.4", - "symfony/dotenv": "^5.4", - "symfony/http-client": "^5.4", + "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/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 e3d5104987..9e4343801f 100644 --- a/src/Sylius/Bundle/AttributeBundle/composer.json +++ b/src/Sylius/Bundle/AttributeBundle/composer.json @@ -31,15 +31,15 @@ "stof/doctrine-extensions-bundle": "^1.4", "sylius/attribute": "^1.6", "sylius/resource-bundle": "^1.7", - "symfony/framework-bundle": "^5.4" + "symfony/framework-bundle": "^5.4 || ^6.0" }, "require-dev": { "doctrine/orm": "^2.7", "phpspec/phpspec": "^7.2", "phpunit/phpunit": "^8.5", - "symfony/browser-kit": "^5.4", - "symfony/dependency-injection": "^5.4", - "symfony/form": "^5.4" + "symfony/browser-kit": "^5.4 || ^6.0", + "symfony/dependency-injection": "^5.4 || ^6.0", + "symfony/form": "^5.4 || ^6.0" }, "config": { "allow-plugins": { diff --git a/src/Sylius/Bundle/ChannelBundle/composer.json b/src/Sylius/Bundle/ChannelBundle/composer.json index eb5c716831..fb12e233ba 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.6", "sylius/resource-bundle": "^1.7", - "symfony/framework-bundle": "^5.4" + "symfony/framework-bundle": "^5.4 || ^6.0" }, "require-dev": { "doctrine/orm": "^2.7", @@ -36,9 +36,9 @@ "phpspec/phpspec": "^7.2", "phpunit/phpunit": "^8.5", "polishsymfonycommunity/symfony-mocker-container": "^1.0", - "symfony/browser-kit": "^5.4", - "symfony/dependency-injection": "^5.4", - "symfony/form": "^5.4", + "symfony/browser-kit": "^5.4 || ^6.0", + "symfony/dependency-injection": "^5.4 || ^6.0", + "symfony/form": "^5.4 || ^6.0", "twig/twig": "^2.12" }, "config": { diff --git a/src/Sylius/Bundle/CoreBundle/composer.json b/src/Sylius/Bundle/CoreBundle/composer.json index 20e7b21e86..513ec741fc 100644 --- a/src/Sylius/Bundle/CoreBundle/composer.json +++ b/src/Sylius/Bundle/CoreBundle/composer.json @@ -64,11 +64,11 @@ "sylius/theme-bundle": "^2.1.1", "sylius/ui-bundle": "^1.6", "sylius/user-bundle": "^1.6", - "symfony/framework-bundle": "^5.4", - "symfony/intl": "^5.4", - "symfony/messenger": "^5.4", + "symfony/framework-bundle": "^5.4 || ^6.0", + "symfony/intl": "^5.4 || ^6.0", + "symfony/messenger": "^5.4 || ^6.0", "symfony/swiftmailer-bundle": "^3.4", - "symfony/templating": "^5.4", + "symfony/templating": "^5.4 || ^6.0", "symfony/webpack-encore-bundle": "^1.15", "winzou/state-machine-bundle": "^0.5" }, @@ -79,7 +79,7 @@ "matthiasnoback/symfony-dependency-injection-test": "^4.2", "phpspec/phpspec": "^7.2", "phpunit/phpunit": "^8.5", - "symfony/dependency-injection": "^5.4" + "symfony/dependency-injection": "^5.4 || ^6.0" }, "conflict": { "symfony/doctrine-bridge": "4.4.20 || 5.2.4 || 5.2.5" diff --git a/src/Sylius/Bundle/CurrencyBundle/composer.json b/src/Sylius/Bundle/CurrencyBundle/composer.json index 377eda341d..2c8421b00e 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.6", "sylius/resource-bundle": "^1.7", - "symfony/framework-bundle": "^5.4", - "symfony/intl": "^5.4", - "symfony/templating": "^5.4" + "symfony/framework-bundle": "^5.4 || ^6.0", + "symfony/intl": "^5.4 || ^6.0", + "symfony/templating": "^5.4 || ^6.0" }, "conflict": { "twig/twig": "^1.0" @@ -40,9 +40,9 @@ "phpspec/phpspec": "^7.2", "phpunit/phpunit": "^8.5", "polishsymfonycommunity/symfony-mocker-container": "^1.0", - "symfony/browser-kit": "^5.4", - "symfony/dependency-injection": "^5.4", - "symfony/form": "^5.4", + "symfony/browser-kit": "^5.4 || ^6.0", + "symfony/dependency-injection": "^5.4 || ^6.0", + "symfony/form": "^5.4 || ^6.0", "twig/twig": "^2.12" }, "config": { diff --git a/src/Sylius/Bundle/CustomerBundle/composer.json b/src/Sylius/Bundle/CustomerBundle/composer.json index d7ac0389c8..29526c5d38 100644 --- a/src/Sylius/Bundle/CustomerBundle/composer.json +++ b/src/Sylius/Bundle/CustomerBundle/composer.json @@ -40,7 +40,7 @@ "egulias/email-validator": "^3.0", "sylius/customer": "^1.6", "sylius/resource-bundle": "^1.7", - "symfony/framework-bundle": "^5.4", + "symfony/framework-bundle": "^5.4 || ^6.0", "webmozart/assert": "^1.8" }, "conflict": { @@ -50,9 +50,9 @@ "phpspec/phpspec": "^7.2", "phpunit/phpunit": "^8.5", "polishsymfonycommunity/symfony-mocker-container": "^1.0", - "symfony/browser-kit": "^5.4", - "symfony/dependency-injection": "^5.4", - "symfony/form": "^5.4" + "symfony/browser-kit": "^5.4 || ^6.0", + "symfony/dependency-injection": "^5.4 || ^6.0", + "symfony/form": "^5.4 || ^6.0" }, "config": { "allow-plugins": { diff --git a/src/Sylius/Bundle/InventoryBundle/composer.json b/src/Sylius/Bundle/InventoryBundle/composer.json index 13df4afbaa..ab64168339 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.6", "sylius/resource-bundle": "^1.7", - "symfony/framework-bundle": "^5.4", - "symfony/templating": "^5.4", - "symfony/validator": "^5.4" + "symfony/framework-bundle": "^5.4 || ^6.0", + "symfony/templating": "^5.4 || ^6.0", + "symfony/validator": "^5.4 || ^6.0" }, "conflict": { "twig/twig": "^1.0" @@ -41,8 +41,8 @@ "phpspec/phpspec": "^7.2", "phpunit/phpunit": "^8.5", "polishsymfonycommunity/symfony-mocker-container": "^1.0", - "symfony/browser-kit": "^5.4", - "symfony/dependency-injection": "^5.4", + "symfony/browser-kit": "^5.4 || ^6.0", + "symfony/dependency-injection": "^5.4 || ^6.0", "twig/twig": "^2.12" }, "config": { diff --git a/src/Sylius/Bundle/LocaleBundle/composer.json b/src/Sylius/Bundle/LocaleBundle/composer.json index a5ca63f106..9a2e8ba24f 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.6", "sylius/resource-bundle": "^1.7", - "symfony/framework-bundle": "^5.4", - "symfony/templating": "^5.4" + "symfony/framework-bundle": "^5.4 || ^6.0", + "symfony/templating": "^5.4 || ^6.0" }, "conflict": { "twig/twig": "^1.0" @@ -41,8 +41,8 @@ "phpspec/phpspec": "^7.2", "phpunit/phpunit": "^8.5", "polishsymfonycommunity/symfony-mocker-container": "^1.0", - "symfony/browser-kit": "^5.4", - "symfony/dependency-injection": "^5.4", + "symfony/browser-kit": "^5.4 || ^6.0", + "symfony/dependency-injection": "^5.4 || ^6.0", "twig/twig": "^2.12" }, "config": { diff --git a/src/Sylius/Bundle/MoneyBundle/composer.json b/src/Sylius/Bundle/MoneyBundle/composer.json index e88b2bd7b5..bec995a947 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.7", - "symfony/framework-bundle": "^5.4", - "symfony/intl": "^5.4", - "symfony/templating": "^5.4", + "symfony/framework-bundle": "^5.4 || ^6.0", + "symfony/intl": "^5.4 || ^6.0", + "symfony/templating": "^5.4 || ^6.0", "webmozart/assert": "^1.8" }, "conflict": { @@ -41,9 +41,9 @@ "phpunit/phpunit": "^8.5", "polishsymfonycommunity/symfony-mocker-container": "^1.0", "sylius/currency-bundle": "^1.6", - "symfony/browser-kit": "^5.4", - "symfony/dependency-injection": "^5.4", - "symfony/form": "^5.4", + "symfony/browser-kit": "^5.4 || ^6.0", + "symfony/dependency-injection": "^5.4 || ^6.0", + "symfony/form": "^5.4 || ^6.0", "twig/twig": "^2.12" }, "config": { diff --git a/src/Sylius/Bundle/OrderBundle/composer.json b/src/Sylius/Bundle/OrderBundle/composer.json index dace3b24a9..78b5854eac 100644 --- a/src/Sylius/Bundle/OrderBundle/composer.json +++ b/src/Sylius/Bundle/OrderBundle/composer.json @@ -33,8 +33,8 @@ "sylius/money-bundle": "^1.6", "sylius/order": "^1.6", "sylius/resource-bundle": "^1.7", - "symfony/framework-bundle": "^5.4", - "symfony/templating": "^5.4" + "symfony/framework-bundle": "^5.4 || ^6.0", + "symfony/templating": "^5.4 || ^6.0" }, "conflict": { "twig/twig": "^1.0 || ^3.0" @@ -44,9 +44,9 @@ "matthiasnoback/symfony-dependency-injection-test": "^4.1", "phpspec/phpspec": "^7.2", "phpunit/phpunit": "^8.5", - "symfony/browser-kit": "^5.4", - "symfony/form": "^5.4", - "symfony/validator": "^5.4" + "symfony/browser-kit": "^5.4 || ^6.0", + "symfony/form": "^5.4 || ^6.0", + "symfony/validator": "^5.4 || ^6.0" }, "config": { "allow-plugins": { diff --git a/src/Sylius/Bundle/PaymentBundle/composer.json b/src/Sylius/Bundle/PaymentBundle/composer.json index 79469bb94c..0c7a25bab0 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.6", "sylius/resource-bundle": "^1.7", - "symfony/framework-bundle": "^5.4" + "symfony/framework-bundle": "^5.4 || ^6.0" }, "conflict": { "twig/twig": "^3.0" @@ -41,8 +41,8 @@ "phpunit/phpunit": "^8.5", "polishsymfonycommunity/symfony-mocker-container": "^1.0", "sylius/locale-bundle": "^1.6", - "symfony/browser-kit": "^5.4", - "symfony/dependency-injection": "^5.4" + "symfony/browser-kit": "^5.4 || ^6.0", + "symfony/dependency-injection": "^5.4 || ^6.0" }, "config": { "allow-plugins": { diff --git a/src/Sylius/Bundle/PayumBundle/composer.json b/src/Sylius/Bundle/PayumBundle/composer.json index e27601aaec..b842623f02 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" + "symfony/dependency-injection": "^5.4 || ^6.0" }, "config": { "allow-plugins": { diff --git a/src/Sylius/Bundle/ProductBundle/composer.json b/src/Sylius/Bundle/ProductBundle/composer.json index f9eb4a2c02..df7531c68d 100644 --- a/src/Sylius/Bundle/ProductBundle/composer.json +++ b/src/Sylius/Bundle/ProductBundle/composer.json @@ -32,17 +32,17 @@ "sylius/locale-bundle": "^1.6", "sylius/product": "^1.6", "sylius/resource-bundle": "^1.7", - "symfony/framework-bundle": "^5.4" + "symfony/framework-bundle": "^5.4 || ^6.0" }, "require-dev": { "doctrine/orm": "^2.7", "mockery/mockery": "^1.4", "phpspec/phpspec": "^7.2", "phpunit/phpunit": "^8.5", - "symfony/browser-kit": "^5.4", - "symfony/dependency-injection": "^5.4", - "symfony/form": "^5.4", - "symfony/validator": "^5.4" + "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" }, "config": { "allow-plugins": { diff --git a/src/Sylius/Bundle/PromotionBundle/composer.json b/src/Sylius/Bundle/PromotionBundle/composer.json index 37b49d2f3b..0ab53e2d6f 100644 --- a/src/Sylius/Bundle/PromotionBundle/composer.json +++ b/src/Sylius/Bundle/PromotionBundle/composer.json @@ -34,7 +34,7 @@ "sylius/promotion": "^1.6", "sylius/registry": "^1.5", "sylius/resource-bundle": "^1.7", - "symfony/framework-bundle": "^5.4" + "symfony/framework-bundle": "^5.4 || ^6.0" }, "conflict": { "twig/twig": "^3.0" @@ -45,10 +45,10 @@ "phpspec/phpspec": "^7.2", "phpunit/phpunit": "^8.5", "polishsymfonycommunity/symfony-mocker-container": "^1.0", - "symfony/browser-kit": "^5.4", - "symfony/dependency-injection": "^5.4", - "symfony/form": "^5.4", - "symfony/validator": "^5.4" + "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" }, "config": { "allow-plugins": { diff --git a/src/Sylius/Bundle/ReviewBundle/composer.json b/src/Sylius/Bundle/ReviewBundle/composer.json index 75152e7a44..8d329e4414 100644 --- a/src/Sylius/Bundle/ReviewBundle/composer.json +++ b/src/Sylius/Bundle/ReviewBundle/composer.json @@ -44,7 +44,7 @@ "sylius/resource-bundle": "^1.7", "sylius/review": "^1.6", "sylius/user-bundle": "^1.6", - "symfony/framework-bundle": "^5.4" + "symfony/framework-bundle": "^5.4 || ^6.0" }, "conflict": { "twig/twig": "^3.0" @@ -53,12 +53,12 @@ "phpspec/phpspec": "^7.2", "phpunit/phpunit": "^8.5", "polishsymfonycommunity/symfony-mocker-container": "^1.0", - "symfony/browser-kit": "^5.4", - "symfony/dependency-injection": "^5.4", - "symfony/form": "^5.4", - "symfony/security-bundle": "^5.4", + "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/swiftmailer-bundle": "^3.1", - "symfony/validator": "^5.4" + "symfony/validator": "^5.4 || ^6.0" }, "config": { "allow-plugins": { diff --git a/src/Sylius/Bundle/ShippingBundle/composer.json b/src/Sylius/Bundle/ShippingBundle/composer.json index baed118a32..e8f5b7bbdc 100644 --- a/src/Sylius/Bundle/ShippingBundle/composer.json +++ b/src/Sylius/Bundle/ShippingBundle/composer.json @@ -34,7 +34,7 @@ "sylius/money-bundle": "^1.6", "sylius/resource-bundle": "^1.7", "sylius/shipping": "^1.6", - "symfony/framework-bundle": "^5.4" + "symfony/framework-bundle": "^5.4 || ^6.0" }, "conflict": { "twig/twig": "^3.0" @@ -45,10 +45,10 @@ "phpspec/phpspec": "^7.2", "phpunit/phpunit": "^8.5", "polishsymfonycommunity/symfony-mocker-container": "^1.0", - "symfony/browser-kit": "^5.4", - "symfony/dependency-injection": "^5.4", - "symfony/form": "^5.4", - "symfony/validator": "^5.4" + "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" }, "config": { "allow-plugins": { diff --git a/src/Sylius/Bundle/ShopBundle/composer.json b/src/Sylius/Bundle/ShopBundle/composer.json index b5a2c3d2fc..82dc92931e 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.6", "sylius/ui-bundle": "^1.6", - "symfony/framework-bundle": "^5.4", - "symfony/security-bundle": "^5.4", + "symfony/framework-bundle": "^5.4 || ^6.0", + "symfony/security-bundle": "^5.4 || ^6.0", "symfony/webpack-encore-bundle": "^1.15", "twig/intl-extra": "^2.12", "twig/twig": "^2.12" @@ -41,7 +41,7 @@ "mockery/mockery": "^1.4", "phpspec/phpspec": "^7.2", "phpunit/phpunit": "^8.5", - "symfony/dependency-injection": "^5.4" + "symfony/dependency-injection": "^5.4 || ^6.0" }, "config": { "allow-plugins": { diff --git a/src/Sylius/Bundle/TaxationBundle/composer.json b/src/Sylius/Bundle/TaxationBundle/composer.json index 74aee125d5..53f552777b 100644 --- a/src/Sylius/Bundle/TaxationBundle/composer.json +++ b/src/Sylius/Bundle/TaxationBundle/composer.json @@ -32,7 +32,7 @@ "sylius/registry": "^1.5", "sylius/resource-bundle": "^1.7", "sylius/taxation": "^1.6", - "symfony/framework-bundle": "^5.4" + "symfony/framework-bundle": "^5.4 || ^6.0" }, "conflict": { "twig/twig": "^3.0" @@ -43,9 +43,9 @@ "phpspec/phpspec": "^7.2", "phpunit/phpunit": "^8.5", "polishsymfonycommunity/symfony-mocker-container": "^1.0", - "symfony/browser-kit": "^5.4", - "symfony/dependency-injection": "^5.4", - "symfony/form": "^5.4" + "symfony/browser-kit": "^5.4 || ^6.0", + "symfony/dependency-injection": "^5.4 || ^6.0", + "symfony/form": "^5.4 || ^6.0" }, "config": { "allow-plugins": { diff --git a/src/Sylius/Bundle/TaxonomyBundle/composer.json b/src/Sylius/Bundle/TaxonomyBundle/composer.json index ae0ede6647..81a49f3a91 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.7", "sylius/taxonomy": "^1.6", - "symfony/framework-bundle": "^5.4" + "symfony/framework-bundle": "^5.4 || ^6.0" }, "conflict": { "twig/twig": "^3.0" @@ -41,7 +41,7 @@ "doctrine/orm": "^2.7", "phpspec/phpspec": "^7.2", "phpunit/phpunit": "^8.5", - "symfony/dependency-injection": "^5.4" + "symfony/dependency-injection": "^5.4 || ^6.0" }, "config": { "allow-plugins": { diff --git a/src/Sylius/Bundle/UiBundle/composer.json b/src/Sylius/Bundle/UiBundle/composer.json index 440b831f71..27755e7c4e 100644 --- a/src/Sylius/Bundle/UiBundle/composer.json +++ b/src/Sylius/Bundle/UiBundle/composer.json @@ -35,11 +35,11 @@ "sonata-project/block-bundle": "^3.20|^4.0", "sylius-labs/polyfill-symfony-event-dispatcher": "^1.0.1", "sylius/grid-bundle": "^1.8", - "symfony/config": "^5.4", - "symfony/framework-bundle": "^5.4", - "symfony/security-core": "^5.4", - "symfony/security-bundle": "^5.4", - "symfony/templating": "^5.4", + "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/webpack-encore-bundle": "^1.15", "laminas/laminas-stdlib": "^3.2" }, @@ -51,8 +51,8 @@ "matthiasnoback/symfony-dependency-injection-test": "^4.1", "phpspec/phpspec": "^7.2", "phpunit/phpunit": "^8.5", - "symfony/dependency-injection": "^5.4", - "symfony/form": "^5.4", + "symfony/dependency-injection": "^5.4 || ^6.0", + "symfony/form": "^5.4 || ^6.0", "twig/twig": "^2.12" }, "config": { diff --git a/src/Sylius/Bundle/UserBundle/composer.json b/src/Sylius/Bundle/UserBundle/composer.json index 64f4b82a85..554e9167a6 100644 --- a/src/Sylius/Bundle/UserBundle/composer.json +++ b/src/Sylius/Bundle/UserBundle/composer.json @@ -45,8 +45,8 @@ "sylius/mailer-bundle": "^1.4", "sylius/resource-bundle": "^1.7", "sylius/user": "^1.6", - "symfony/framework-bundle": "^5.4", - "symfony/password-hasher": "^5.4", + "symfony/framework-bundle": "^5.4 || ^6.0", + "symfony/password-hasher": "^5.4 || 6.0", "webmozart/assert": "^1.8" }, "conflict": { @@ -58,8 +58,8 @@ "php-http/guzzle6-adapter": "^2.0", "phpspec/phpspec": "^7.2", "phpunit/phpunit": "^8.5", - "symfony/dependency-injection": "^5.4", - "symfony/security-bundle": "^5.4", + "symfony/dependency-injection": "^5.4 || ^6.0", + "symfony/security-bundle": "^5.4 || ^6.0", "symfony/swiftmailer-bundle": "^3.1" }, "suggest": { diff --git a/src/Sylius/Component/Addressing/composer.json b/src/Sylius/Component/Addressing/composer.json index 80891a2e63..814f53ec96 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.7", - "symfony/intl": "^5.4" + "symfony/intl": "^5.4 || ^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 b2ce982feb..23097b057c 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.7", - "symfony/validator": "^5.4" + "symfony/validator": "^5.4 || ^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 7c655979a2..f8e6e0998d 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.7", - "symfony/form": "^5.4", - "symfony/http-foundation": "^5.4", + "symfony/form": "^5.4 || ^6.0", + "symfony/http-foundation": "^5.4 || ^6.0", "laminas/laminas-stdlib": "^3.2" }, "require-dev": { diff --git a/src/Sylius/Component/Core/composer.json b/src/Sylius/Component/Core/composer.json index c2d68f2dbc..3f00613b8f 100644 --- a/src/Sylius/Component/Core/composer.json +++ b/src/Sylius/Component/Core/composer.json @@ -50,15 +50,15 @@ "sylius/taxation": "^1.6", "sylius/taxonomy": "^1.6", "sylius/user": "^1.6", - "symfony/http-foundation": "^5.4", - "symfony/mime": "^5.4", - "symfony/string": "^5.2", + "symfony/http-foundation": "^5.4 || ^6.0", + "symfony/mime": "^5.4 || ^6.0", + "symfony/string": "^5.2 || ^6.0", "webmozart/assert": "^1.8", "laminas/laminas-stdlib": "^3.2" }, "require-dev": { "phpspec/phpspec": "^7.2", - "symfony/property-access": "^5.4" + "symfony/property-access": "^5.4 || ^6.0" }, "config": { "allow-plugins": { diff --git a/src/Sylius/Component/Currency/composer.json b/src/Sylius/Component/Currency/composer.json index 178ad9f142..2451ef0ce1 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.7", - "symfony/intl": "^5.4", + "symfony/intl": "^5.4 || ^6.0", "laminas/laminas-stdlib": "^3.2" }, "require-dev": { diff --git a/src/Sylius/Component/Locale/composer.json b/src/Sylius/Component/Locale/composer.json index 671696bcd1..707a4bf34e 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.7", - "symfony/intl": "^5.4", + "symfony/intl": "^5.4 || ^6.0", "laminas/laminas-stdlib": "^3.2" }, "require-dev": { diff --git a/src/Sylius/Component/Shipping/composer.json b/src/Sylius/Component/Shipping/composer.json index 9edbc19a0a..92c3aa5e26 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.7", - "symfony/options-resolver": "^5.4" + "symfony/options-resolver": "^5.4 || ^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 98d00eee3d..9b25ddee4f 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.0", "sylius/resource": "^1.7", "symfony/polyfill-mbstring": "^1.17", - "symfony/security-core": "^5.4" + "symfony/security-core": "^5.4 || ^6.0" }, "require-dev": { "phpspec/phpspec": "^7.2"