From e0d8391f55443aaa103e6fb1965d61e83c9b47ab Mon Sep 17 00:00:00 2001 From: Jacob Tobiasz Date: Tue, 23 Jan 2024 07:44:17 +0100 Subject: [PATCH 1/2] Update the branch-aliases and inter-dependencies versions --- composer.json | 3 ++ .../Abstraction/StateMachine/composer.json | 2 +- .../Bundle/AddressingBundle/composer.json | 4 +- src/Sylius/Bundle/AdminBundle/composer.json | 6 +-- src/Sylius/Bundle/ApiBundle/composer.json | 4 +- .../Bundle/AttributeBundle/composer.json | 4 +- src/Sylius/Bundle/ChannelBundle/composer.json | 4 +- src/Sylius/Bundle/CoreBundle/composer.json | 44 +++++++++---------- .../Bundle/CurrencyBundle/composer.json | 4 +- .../Bundle/CustomerBundle/composer.json | 4 +- .../Bundle/InventoryBundle/composer.json | 4 +- src/Sylius/Bundle/LocaleBundle/composer.json | 4 +- src/Sylius/Bundle/MoneyBundle/composer.json | 4 +- src/Sylius/Bundle/OrderBundle/composer.json | 6 +-- src/Sylius/Bundle/PaymentBundle/composer.json | 6 +-- src/Sylius/Bundle/PayumBundle/composer.json | 10 ++--- src/Sylius/Bundle/ProductBundle/composer.json | 8 ++-- .../Bundle/PromotionBundle/composer.json | 6 +-- src/Sylius/Bundle/ReviewBundle/composer.json | 6 +-- .../Bundle/ShippingBundle/composer.json | 6 +-- src/Sylius/Bundle/ShopBundle/composer.json | 6 +-- .../Bundle/TaxationBundle/composer.json | 4 +- .../Bundle/TaxonomyBundle/composer.json | 4 +- src/Sylius/Bundle/UiBundle/composer.json | 2 +- src/Sylius/Bundle/UserBundle/composer.json | 4 +- src/Sylius/Component/Addressing/composer.json | 2 +- src/Sylius/Component/Attribute/composer.json | 2 +- src/Sylius/Component/Channel/composer.json | 2 +- src/Sylius/Component/Core/composer.json | 34 +++++++------- src/Sylius/Component/Currency/composer.json | 2 +- src/Sylius/Component/Customer/composer.json | 2 +- src/Sylius/Component/Inventory/composer.json | 2 +- src/Sylius/Component/Locale/composer.json | 2 +- src/Sylius/Component/Order/composer.json | 2 +- src/Sylius/Component/Payment/composer.json | 2 +- src/Sylius/Component/Product/composer.json | 4 +- src/Sylius/Component/Promotion/composer.json | 2 +- src/Sylius/Component/Review/composer.json | 2 +- src/Sylius/Component/Shipping/composer.json | 2 +- src/Sylius/Component/Taxation/composer.json | 2 +- src/Sylius/Component/Taxonomy/composer.json | 2 +- src/Sylius/Component/User/composer.json | 2 +- 42 files changed, 115 insertions(+), 112 deletions(-) diff --git a/composer.json b/composer.json index bad43c2c584..78cbc44304d 100644 --- a/composer.json +++ b/composer.json @@ -261,6 +261,9 @@ "symfony": { "allow-contrib": false, "require": "5.4.*" + }, + "branch-alias": { + "dev-main": "1.13-dev" } }, "autoload": { diff --git a/src/Sylius/Abstraction/StateMachine/composer.json b/src/Sylius/Abstraction/StateMachine/composer.json index 2ae402df607..a8c241926ec 100644 --- a/src/Sylius/Abstraction/StateMachine/composer.json +++ b/src/Sylius/Abstraction/StateMachine/composer.json @@ -34,7 +34,7 @@ }, "extra": { "branch-alias": { - "dev-master": "1.12-dev" + "dev-main": "1.13-dev" }, "symfony": { "require": "^5.4.21" diff --git a/src/Sylius/Bundle/AddressingBundle/composer.json b/src/Sylius/Bundle/AddressingBundle/composer.json index 05cfa43e917..33dec5365db 100644 --- a/src/Sylius/Bundle/AddressingBundle/composer.json +++ b/src/Sylius/Bundle/AddressingBundle/composer.json @@ -28,7 +28,7 @@ "require": { "php": "^8.0", "stof/doctrine-extensions-bundle": "^1.4", - "sylius/addressing": "^1.12", + "sylius/addressing": "^1.13", "sylius/resource-bundle": "^1.9", "symfony/framework-bundle": "^5.4.21 || ^6.0", "symfony/intl": "^5.4.21 || ^6.0" @@ -58,7 +58,7 @@ }, "extra": { "branch-alias": { - "dev-master": "1.12-dev" + "dev-main": "1.13-dev" }, "symfony": { "require": "^5.4" diff --git a/src/Sylius/Bundle/AdminBundle/composer.json b/src/Sylius/Bundle/AdminBundle/composer.json index 88df3c39348..bbdbc911807 100644 --- a/src/Sylius/Bundle/AdminBundle/composer.json +++ b/src/Sylius/Bundle/AdminBundle/composer.json @@ -33,8 +33,8 @@ "php": "^8.0", "knplabs/knp-menu": "^3.1", "knplabs/knp-menu-bundle": "^3.0", - "sylius/core-bundle": "^1.12", - "sylius/ui-bundle": "^1.12", + "sylius/core-bundle": "^1.13", + "sylius/ui-bundle": "^1.13", "symfony/framework-bundle": "^5.4.21 || ^6.0", "symfony/webpack-encore-bundle": "^1.15", "twig/intl-extra": "^2.12 || ^3.4", @@ -55,7 +55,7 @@ }, "extra": { "branch-alias": { - "dev-master": "1.12-dev" + "dev-main": "1.13-dev" } }, "autoload": { diff --git a/src/Sylius/Bundle/ApiBundle/composer.json b/src/Sylius/Bundle/ApiBundle/composer.json index 95d6b521f1f..4f596a596b6 100644 --- a/src/Sylius/Bundle/ApiBundle/composer.json +++ b/src/Sylius/Bundle/ApiBundle/composer.json @@ -28,7 +28,7 @@ "api-platform/core": "^2.7.10", "enshrined/svg-sanitize": "^0.16", "lexik/jwt-authentication-bundle": "^2.11", - "sylius/core-bundle": "^1.12", + "sylius/core-bundle": "^1.13", "symfony/messenger": "^5.4.21 || ^6.0" }, "require-dev": { @@ -58,7 +58,7 @@ }, "extra": { "branch-alias": { - "dev-master": "1.12-dev" + "dev-main": "1.13-dev" } }, "autoload": { diff --git a/src/Sylius/Bundle/AttributeBundle/composer.json b/src/Sylius/Bundle/AttributeBundle/composer.json index 16dc291de9b..07b74f39514 100644 --- a/src/Sylius/Bundle/AttributeBundle/composer.json +++ b/src/Sylius/Bundle/AttributeBundle/composer.json @@ -29,7 +29,7 @@ "php": "^8.0", "ramsey/uuid": "^4.0", "stof/doctrine-extensions-bundle": "^1.4", - "sylius/attribute": "^1.12", + "sylius/attribute": "^1.13", "sylius/resource-bundle": "^1.9", "symfony/framework-bundle": "^5.4.21 || ^6.0" }, @@ -54,7 +54,7 @@ }, "extra": { "branch-alias": { - "dev-master": "1.12-dev" + "dev-main": "1.13-dev" } }, "autoload": { diff --git a/src/Sylius/Bundle/ChannelBundle/composer.json b/src/Sylius/Bundle/ChannelBundle/composer.json index ee7c6ae698b..c4a6aa48030 100644 --- a/src/Sylius/Bundle/ChannelBundle/composer.json +++ b/src/Sylius/Bundle/ChannelBundle/composer.json @@ -26,7 +26,7 @@ ], "require": { "php": "^8.0", - "sylius/channel": "^1.12", + "sylius/channel": "^1.13", "sylius/resource-bundle": "^1.9", "symfony/framework-bundle": "^5.4.21 || ^6.0" }, @@ -51,7 +51,7 @@ }, "extra": { "branch-alias": { - "dev-master": "1.12-dev" + "dev-main": "1.13-dev" } }, "autoload": { diff --git a/src/Sylius/Bundle/CoreBundle/composer.json b/src/Sylius/Bundle/CoreBundle/composer.json index 7d717983c56..3b2ce743b16 100644 --- a/src/Sylius/Bundle/CoreBundle/composer.json +++ b/src/Sylius/Bundle/CoreBundle/composer.json @@ -40,32 +40,32 @@ "sylius-labs/association-hydrator": "^1.1 || ^1.2", "sylius-labs/doctrine-migrations-extra-bundle": "^0.1.4 || ^0.2", "sylius-labs/polyfill-symfony-framework-bundle": "^1.0 || ^1.1", - "sylius/addressing-bundle": "^1.12", - "sylius/attribute-bundle": "^1.12", - "sylius/channel-bundle": "^1.12", - "sylius/core": "^1.12", - "sylius/currency-bundle": "^1.12", - "sylius/customer-bundle": "^1.12", + "sylius/addressing-bundle": "^1.13", + "sylius/attribute-bundle": "^1.13", + "sylius/channel-bundle": "^1.13", + "sylius/core": "^1.13", + "sylius/currency-bundle": "^1.13", + "sylius/customer-bundle": "^1.13", "sylius/fixtures-bundle": "^1.7", "sylius/grid-bundle": "^1.11", - "sylius/inventory-bundle": "^1.12", - "sylius/locale-bundle": "^1.12", - "sylius/money-bundle": "^1.12", - "sylius/order-bundle": "^1.12", - "sylius/payment-bundle": "^1.12", - "sylius/payum-bundle": "^1.12", - "sylius/product-bundle": "^1.12", - "sylius/promotion-bundle": "^1.12", + "sylius/inventory-bundle": "^1.13", + "sylius/locale-bundle": "^1.13", + "sylius/money-bundle": "^1.13", + "sylius/order-bundle": "^1.13", + "sylius/payment-bundle": "^1.13", + "sylius/payum-bundle": "^1.13", + "sylius/product-bundle": "^1.13", + "sylius/promotion-bundle": "^1.13", "sylius/resource-bundle": "^1.9", - "sylius/review-bundle": "^1.12", - "sylius/shipping-bundle": "^1.12", - "sylius/state-machine-abstraction": "^1.12", - "sylius/taxation-bundle": "^1.12", - "sylius/taxonomy-bundle": "^1.12", + "sylius/review-bundle": "^1.13", + "sylius/shipping-bundle": "^1.13", + "sylius/state-machine-abstraction": "^1.13", + "sylius/taxation-bundle": "^1.13", + "sylius/taxonomy-bundle": "^1.13", "sylius/mailer-bundle": "^1.8 || ^2.0@beta", "sylius/theme-bundle": "^2.1.1 || ^2.3", - "sylius/ui-bundle": "^1.12", - "sylius/user-bundle": "^1.12", + "sylius/ui-bundle": "^1.13", + "sylius/user-bundle": "^1.13", "symfony/framework-bundle": "^5.4.21 || ^6.0", "symfony/intl": "^5.4.21 || ^6.0", "symfony/mailer": "^5.4.21 || ^6.0", @@ -97,7 +97,7 @@ }, "extra": { "branch-alias": { - "dev-master": "1.12-dev" + "dev-main": "1.13-dev" }, "symfony": { "require": "^5.4.21" diff --git a/src/Sylius/Bundle/CurrencyBundle/composer.json b/src/Sylius/Bundle/CurrencyBundle/composer.json index 2f5d2c83704..0e7ce320349 100644 --- a/src/Sylius/Bundle/CurrencyBundle/composer.json +++ b/src/Sylius/Bundle/CurrencyBundle/composer.json @@ -26,7 +26,7 @@ ], "require": { "php": "^8.0", - "sylius/currency": "^1.12", + "sylius/currency": "^1.13", "sylius/resource-bundle": "^1.9", "symfony/framework-bundle": "^5.4.21 || ^6.0", "symfony/intl": "^5.4.21 || ^6.0", @@ -54,7 +54,7 @@ }, "extra": { "branch-alias": { - "dev-master": "1.12-dev" + "dev-main": "1.13-dev" } }, "autoload": { diff --git a/src/Sylius/Bundle/CustomerBundle/composer.json b/src/Sylius/Bundle/CustomerBundle/composer.json index cfe7082459b..c6ed6682396 100644 --- a/src/Sylius/Bundle/CustomerBundle/composer.json +++ b/src/Sylius/Bundle/CustomerBundle/composer.json @@ -38,7 +38,7 @@ "php": "^8.0", "doctrine/orm": "^2.13", "egulias/email-validator": "^3.1", - "sylius/customer": "^1.12", + "sylius/customer": "^1.13", "sylius/resource-bundle": "^1.9", "symfony/framework-bundle": "^5.4.21 || ^6.0", "webmozart/assert": "^1.9" @@ -62,7 +62,7 @@ }, "extra": { "branch-alias": { - "dev-master": "1.12-dev" + "dev-main": "1.13-dev" } }, "autoload": { diff --git a/src/Sylius/Bundle/InventoryBundle/composer.json b/src/Sylius/Bundle/InventoryBundle/composer.json index 4005a9b0be4..eb9424e9195 100644 --- a/src/Sylius/Bundle/InventoryBundle/composer.json +++ b/src/Sylius/Bundle/InventoryBundle/composer.json @@ -27,7 +27,7 @@ ], "require": { "php": "^8.0", - "sylius/inventory": "^1.12", + "sylius/inventory": "^1.13", "sylius/resource-bundle": "^1.9", "symfony/framework-bundle": "^5.4.21 || ^6.0", "symfony/templating": "^5.4.21 || ^6.0", @@ -53,7 +53,7 @@ }, "extra": { "branch-alias": { - "dev-master": "1.12-dev" + "dev-main": "1.13-dev" } }, "autoload": { diff --git a/src/Sylius/Bundle/LocaleBundle/composer.json b/src/Sylius/Bundle/LocaleBundle/composer.json index 78b51cb31c7..b00c3ccd13c 100644 --- a/src/Sylius/Bundle/LocaleBundle/composer.json +++ b/src/Sylius/Bundle/LocaleBundle/composer.json @@ -27,7 +27,7 @@ ], "require": { "php": "^8.0", - "sylius/locale": "^1.12", + "sylius/locale": "^1.13", "sylius/resource-bundle": "^1.9", "symfony/framework-bundle": "^5.4.21 || ^6.0", "symfony/templating": "^5.4.21 || ^6.0" @@ -54,7 +54,7 @@ }, "extra": { "branch-alias": { - "dev-master": "1.12-dev" + "dev-main": "1.13-dev" } }, "autoload": { diff --git a/src/Sylius/Bundle/MoneyBundle/composer.json b/src/Sylius/Bundle/MoneyBundle/composer.json index 013b125d3f6..8158e3c7774 100644 --- a/src/Sylius/Bundle/MoneyBundle/composer.json +++ b/src/Sylius/Bundle/MoneyBundle/composer.json @@ -41,7 +41,7 @@ "phpspec/phpspec": "^7.2", "phpunit/phpunit": "^9.5", "polishsymfonycommunity/symfony-mocker-container": "^1.0", - "sylius/currency-bundle": "^1.12", + "sylius/currency-bundle": "^1.13", "symfony/browser-kit": "^5.4.21 || ^6.0", "symfony/dependency-injection": "^5.4.21 || ^6.0", "symfony/form": "^5.4.21 || ^6.0", @@ -54,7 +54,7 @@ }, "extra": { "branch-alias": { - "dev-master": "1.12-dev" + "dev-main": "1.13-dev" } }, "autoload": { diff --git a/src/Sylius/Bundle/OrderBundle/composer.json b/src/Sylius/Bundle/OrderBundle/composer.json index fb6906de1aa..d158553114e 100644 --- a/src/Sylius/Bundle/OrderBundle/composer.json +++ b/src/Sylius/Bundle/OrderBundle/composer.json @@ -30,8 +30,8 @@ "php": "^8.0", "stof/doctrine-extensions-bundle": "^1.4", "sylius-labs/polyfill-symfony-framework-bundle": "^1.0 || ^1.1", - "sylius/money-bundle": "^1.12", - "sylius/order": "^1.12", + "sylius/money-bundle": "^1.13", + "sylius/order": "^1.13", "sylius/resource-bundle": "^1.9", "symfony/framework-bundle": "^5.4.21 || ^6.0", "symfony/service-contracts": "^2.5 || ^3.0", @@ -58,7 +58,7 @@ }, "extra": { "branch-alias": { - "dev-master": "1.12-dev" + "dev-main": "1.13-dev" } }, "autoload": { diff --git a/src/Sylius/Bundle/PaymentBundle/composer.json b/src/Sylius/Bundle/PaymentBundle/composer.json index ec6e9c81ca4..810019aa60f 100644 --- a/src/Sylius/Bundle/PaymentBundle/composer.json +++ b/src/Sylius/Bundle/PaymentBundle/composer.json @@ -27,7 +27,7 @@ ], "require": { "php": "^8.0", - "sylius/payment": "^1.12", + "sylius/payment": "^1.13", "sylius/resource-bundle": "^1.9", "symfony/framework-bundle": "^5.4.21 || ^6.0" }, @@ -41,7 +41,7 @@ "phpspec/phpspec": "^7.2", "phpunit/phpunit": "^9.5", "polishsymfonycommunity/symfony-mocker-container": "^1.0", - "sylius/locale-bundle": "^1.12", + "sylius/locale-bundle": "^1.13", "symfony/browser-kit": "^5.4.21 || ^6.0", "symfony/dependency-injection": "^5.4.21 || ^6.0" }, @@ -52,7 +52,7 @@ }, "extra": { "branch-alias": { - "dev-master": "1.12-dev" + "dev-main": "1.13-dev" } }, "autoload": { diff --git a/src/Sylius/Bundle/PayumBundle/composer.json b/src/Sylius/Bundle/PayumBundle/composer.json index d88580785eb..4c5dca4c2d6 100644 --- a/src/Sylius/Bundle/PayumBundle/composer.json +++ b/src/Sylius/Bundle/PayumBundle/composer.json @@ -31,10 +31,10 @@ "php": "^8.0", "payum/offline": "^1.7.3", "payum/payum-bundle": "^2.5", - "sylius/core": "^1.12", - "sylius/currency": "^1.12", - "sylius/order-bundle": "^1.12", - "sylius/payment-bundle": "^1.12", + "sylius/core": "^1.13", + "sylius/currency": "^1.13", + "sylius/order-bundle": "^1.13", + "sylius/payment-bundle": "^1.13", "sylius/resource-bundle": "^1.9", "php-http/httplug": "^2.4" }, @@ -53,7 +53,7 @@ }, "extra": { "branch-alias": { - "dev-master": "1.12-dev" + "dev-main": "1.13-dev" } }, "autoload": { diff --git a/src/Sylius/Bundle/ProductBundle/composer.json b/src/Sylius/Bundle/ProductBundle/composer.json index 4d30e5fdf73..eab9152fea4 100644 --- a/src/Sylius/Bundle/ProductBundle/composer.json +++ b/src/Sylius/Bundle/ProductBundle/composer.json @@ -28,9 +28,9 @@ "require": { "php": "^8.0", "stof/doctrine-extensions-bundle": "^1.4", - "sylius/attribute-bundle": "^1.12", - "sylius/locale-bundle": "^1.12", - "sylius/product": "^1.12", + "sylius/attribute-bundle": "^1.13", + "sylius/locale-bundle": "^1.13", + "sylius/product": "^1.13", "sylius/resource-bundle": "^1.9", "symfony/framework-bundle": "^5.4.21 || ^6.0" }, @@ -56,7 +56,7 @@ }, "extra": { "branch-alias": { - "dev-master": "1.12-dev" + "dev-main": "1.13-dev" } }, "autoload": { diff --git a/src/Sylius/Bundle/PromotionBundle/composer.json b/src/Sylius/Bundle/PromotionBundle/composer.json index fb6759cbafd..5209d44300a 100644 --- a/src/Sylius/Bundle/PromotionBundle/composer.json +++ b/src/Sylius/Bundle/PromotionBundle/composer.json @@ -30,8 +30,8 @@ "php": "^8.0", "stof/doctrine-extensions-bundle": "^1.4", "sylius/calendar": "^0.3 || ^0.4 || ^0.5", - "sylius/money-bundle": "^1.12", - "sylius/promotion": "^1.12", + "sylius/money-bundle": "^1.13", + "sylius/promotion": "^1.13", "sylius/registry": "^1.5", "sylius/resource-bundle": "^1.9", "symfony/framework-bundle": "^5.4.21 || ^6.0" @@ -60,7 +60,7 @@ }, "extra": { "branch-alias": { - "dev-master": "1.12-dev" + "dev-main": "1.13-dev" } }, "autoload": { diff --git a/src/Sylius/Bundle/ReviewBundle/composer.json b/src/Sylius/Bundle/ReviewBundle/composer.json index 911618c08d1..6f55adab57f 100644 --- a/src/Sylius/Bundle/ReviewBundle/composer.json +++ b/src/Sylius/Bundle/ReviewBundle/composer.json @@ -42,8 +42,8 @@ "stof/doctrine-extensions-bundle": "^1.4", "sylius/mailer-bundle": "^1.8 || ^2.0@beta", "sylius/resource-bundle": "^1.9", - "sylius/review": "^1.12", - "sylius/user-bundle": "^1.12", + "sylius/review": "^1.13", + "sylius/user-bundle": "^1.13", "symfony/framework-bundle": "^5.4.21 || ^6.0" }, "conflict": { @@ -68,7 +68,7 @@ }, "extra": { "branch-alias": { - "dev-master": "1.12-dev" + "dev-main": "1.13-dev" } }, "autoload": { diff --git a/src/Sylius/Bundle/ShippingBundle/composer.json b/src/Sylius/Bundle/ShippingBundle/composer.json index 83ecb428abd..7b1a649dfdc 100644 --- a/src/Sylius/Bundle/ShippingBundle/composer.json +++ b/src/Sylius/Bundle/ShippingBundle/composer.json @@ -31,9 +31,9 @@ "php": "^8.0", "stof/doctrine-extensions-bundle": "^1.4", "sylius/calendar": "^0.3 || ^0.4 || ^0.5", - "sylius/money-bundle": "^1.12", + "sylius/money-bundle": "^1.13", "sylius/resource-bundle": "^1.9", - "sylius/shipping": "^1.12", + "sylius/shipping": "^1.13", "symfony/framework-bundle": "^5.4.21 || ^6.0" }, "conflict": { @@ -59,7 +59,7 @@ }, "extra": { "branch-alias": { - "dev-master": "1.12-dev" + "dev-main": "1.13-dev" } }, "autoload": { diff --git a/src/Sylius/Bundle/ShopBundle/composer.json b/src/Sylius/Bundle/ShopBundle/composer.json index cf285ca92e8..8f6c327962d 100644 --- a/src/Sylius/Bundle/ShopBundle/composer.json +++ b/src/Sylius/Bundle/ShopBundle/composer.json @@ -27,8 +27,8 @@ ], "require": { "php": "^8.0", - "sylius/core-bundle": "^1.12", - "sylius/ui-bundle": "^1.12", + "sylius/core-bundle": "^1.13", + "sylius/ui-bundle": "^1.13", "symfony/framework-bundle": "^5.4.21 || ^6.0", "symfony/security-bundle": "^5.4.21 || ^6.0", "symfony/webpack-encore-bundle": "^1.15", @@ -50,7 +50,7 @@ }, "extra": { "branch-alias": { - "dev-master": "1.12-dev" + "dev-main": "1.13-dev" } }, "autoload": { diff --git a/src/Sylius/Bundle/TaxationBundle/composer.json b/src/Sylius/Bundle/TaxationBundle/composer.json index 352fe1c7f0d..99586587af1 100644 --- a/src/Sylius/Bundle/TaxationBundle/composer.json +++ b/src/Sylius/Bundle/TaxationBundle/composer.json @@ -32,7 +32,7 @@ "sylius/calendar": "^0.3 || ^0.4 || ^0.5", "sylius/registry": "^1.5", "sylius/resource-bundle": "^1.9", - "sylius/taxation": "^1.12", + "sylius/taxation": "^1.13", "symfony/framework-bundle": "^5.4.21 || ^6.0" }, "conflict": { @@ -57,7 +57,7 @@ }, "extra": { "branch-alias": { - "dev-master": "1.12-dev" + "dev-main": "1.13-dev" } }, "autoload": { diff --git a/src/Sylius/Bundle/TaxonomyBundle/composer.json b/src/Sylius/Bundle/TaxonomyBundle/composer.json index 5925fd37b88..94adb54b513 100644 --- a/src/Sylius/Bundle/TaxonomyBundle/composer.json +++ b/src/Sylius/Bundle/TaxonomyBundle/composer.json @@ -31,7 +31,7 @@ "php": "^8.0", "stof/doctrine-extensions-bundle": "^1.4", "sylius/resource-bundle": "^1.9", - "sylius/taxonomy": "^1.12", + "sylius/taxonomy": "^1.13", "symfony/framework-bundle": "^5.4.21 || ^6.0" }, "conflict": { @@ -52,7 +52,7 @@ }, "extra": { "branch-alias": { - "dev-master": "1.12-dev" + "dev-main": "1.13-dev" } }, "autoload": { diff --git a/src/Sylius/Bundle/UiBundle/composer.json b/src/Sylius/Bundle/UiBundle/composer.json index f5b5bb18134..347dd0d748e 100644 --- a/src/Sylius/Bundle/UiBundle/composer.json +++ b/src/Sylius/Bundle/UiBundle/composer.json @@ -62,7 +62,7 @@ }, "extra": { "branch-alias": { - "dev-master": "1.12-dev" + "dev-main": "1.13-dev" } }, "autoload": { diff --git a/src/Sylius/Bundle/UserBundle/composer.json b/src/Sylius/Bundle/UserBundle/composer.json index 818b1d883f0..f4653728edd 100644 --- a/src/Sylius/Bundle/UserBundle/composer.json +++ b/src/Sylius/Bundle/UserBundle/composer.json @@ -44,7 +44,7 @@ "sylius-labs/polyfill-symfony-framework-bundle": "^1.0 || ^1.1", "sylius/mailer-bundle": "^1.8 || ^2.0@beta", "sylius/resource-bundle": "^1.9", - "sylius/user": "^1.12", + "sylius/user": "^1.13", "symfony/framework-bundle": "^5.4.21 || ^6.0", "symfony/password-hasher": "^5.4.21 || ^6.0", "webmozart/assert": "^1.9" @@ -73,7 +73,7 @@ }, "extra": { "branch-alias": { - "dev-master": "1.12-dev" + "dev-main": "1.13-dev" } }, "autoload": { diff --git a/src/Sylius/Component/Addressing/composer.json b/src/Sylius/Component/Addressing/composer.json index c2124140624..57104804718 100644 --- a/src/Sylius/Component/Addressing/composer.json +++ b/src/Sylius/Component/Addressing/composer.json @@ -41,7 +41,7 @@ }, "extra": { "branch-alias": { - "dev-master": "1.12-dev" + "dev-main": "1.13-dev" } }, "autoload": { diff --git a/src/Sylius/Component/Attribute/composer.json b/src/Sylius/Component/Attribute/composer.json index 3aaa8c5011c..9a1d6ec68fb 100644 --- a/src/Sylius/Component/Attribute/composer.json +++ b/src/Sylius/Component/Attribute/composer.json @@ -41,7 +41,7 @@ }, "extra": { "branch-alias": { - "dev-master": "1.12-dev" + "dev-main": "1.13-dev" } }, "autoload": { diff --git a/src/Sylius/Component/Channel/composer.json b/src/Sylius/Component/Channel/composer.json index cb9ca1a08b7..98cbcf2d0f3 100644 --- a/src/Sylius/Component/Channel/composer.json +++ b/src/Sylius/Component/Channel/composer.json @@ -43,7 +43,7 @@ }, "extra": { "branch-alias": { - "dev-master": "1.12-dev" + "dev-main": "1.13-dev" } }, "autoload": { diff --git a/src/Sylius/Component/Core/composer.json b/src/Sylius/Component/Core/composer.json index b433be54877..036be69fed8 100644 --- a/src/Sylius/Component/Core/composer.json +++ b/src/Sylius/Component/Core/composer.json @@ -34,24 +34,24 @@ "payum/core": "^1.7.3", "psr/http-client": "^1.0", "psr/http-message": "^1.0", - "sylius/addressing": "^1.12", - "sylius/attribute": "^1.12", - "sylius/channel": "^1.12", - "sylius/currency": "^1.12", - "sylius/customer": "^1.12", - "sylius/inventory": "^1.12", - "sylius/locale": "^1.12", - "sylius/order": "^1.12", - "sylius/payment": "^1.12", - "sylius/product": "^1.12", - "sylius/promotion": "^1.12", + "sylius/addressing": "^1.13", + "sylius/attribute": "^1.13", + "sylius/channel": "^1.13", + "sylius/currency": "^1.13", + "sylius/customer": "^1.13", + "sylius/inventory": "^1.13", + "sylius/locale": "^1.13", + "sylius/order": "^1.13", + "sylius/payment": "^1.13", + "sylius/product": "^1.13", + "sylius/promotion": "^1.13", "sylius/registry": "^1.5", "sylius/resource": "^1.9", - "sylius/review": "^1.12", - "sylius/shipping": "^1.12", - "sylius/taxation": "^1.12", - "sylius/taxonomy": "^1.12", - "sylius/user": "^1.12", + "sylius/review": "^1.13", + "sylius/shipping": "^1.13", + "sylius/taxation": "^1.13", + "sylius/taxonomy": "^1.13", + "sylius/user": "^1.13", "symfony/http-client": "^5.4.21 || ^6.0", "symfony/http-foundation": "^5.4.21 || ^6.0", "symfony/mime": "^5.4.21 || ^6.0", @@ -72,7 +72,7 @@ }, "extra": { "branch-alias": { - "dev-master": "1.12-dev" + "dev-main": "1.13-dev" } }, "autoload": { diff --git a/src/Sylius/Component/Currency/composer.json b/src/Sylius/Component/Currency/composer.json index e6e40ee015f..f93ec823c07 100644 --- a/src/Sylius/Component/Currency/composer.json +++ b/src/Sylius/Component/Currency/composer.json @@ -40,7 +40,7 @@ }, "extra": { "branch-alias": { - "dev-master": "1.12-dev" + "dev-main": "1.13-dev" } }, "autoload": { diff --git a/src/Sylius/Component/Customer/composer.json b/src/Sylius/Component/Customer/composer.json index c5603adfa37..1260fe9f449 100644 --- a/src/Sylius/Component/Customer/composer.json +++ b/src/Sylius/Component/Customer/composer.json @@ -45,7 +45,7 @@ }, "extra": { "branch-alias": { - "dev-master": "1.12-dev" + "dev-main": "1.13-dev" } }, "autoload": { diff --git a/src/Sylius/Component/Inventory/composer.json b/src/Sylius/Component/Inventory/composer.json index a4c1647e593..8c98f3759a9 100644 --- a/src/Sylius/Component/Inventory/composer.json +++ b/src/Sylius/Component/Inventory/composer.json @@ -40,7 +40,7 @@ }, "extra": { "branch-alias": { - "dev-master": "1.12-dev" + "dev-main": "1.13-dev" } }, "autoload": { diff --git a/src/Sylius/Component/Locale/composer.json b/src/Sylius/Component/Locale/composer.json index 03376f540d2..e2fbc3dace3 100644 --- a/src/Sylius/Component/Locale/composer.json +++ b/src/Sylius/Component/Locale/composer.json @@ -41,7 +41,7 @@ }, "extra": { "branch-alias": { - "dev-master": "1.12-dev" + "dev-main": "1.13-dev" } }, "autoload": { diff --git a/src/Sylius/Component/Order/composer.json b/src/Sylius/Component/Order/composer.json index eaedb930605..379d336b928 100644 --- a/src/Sylius/Component/Order/composer.json +++ b/src/Sylius/Component/Order/composer.json @@ -41,7 +41,7 @@ }, "extra": { "branch-alias": { - "dev-master": "1.12-dev" + "dev-main": "1.13-dev" } }, "autoload": { diff --git a/src/Sylius/Component/Payment/composer.json b/src/Sylius/Component/Payment/composer.json index 7ec0afc5e3b..8d0f10d3788 100644 --- a/src/Sylius/Component/Payment/composer.json +++ b/src/Sylius/Component/Payment/composer.json @@ -40,7 +40,7 @@ }, "extra": { "branch-alias": { - "dev-master": "1.12-dev" + "dev-main": "1.13-dev" } }, "autoload": { diff --git a/src/Sylius/Component/Product/composer.json b/src/Sylius/Component/Product/composer.json index 507356ee883..2a777dde750 100644 --- a/src/Sylius/Component/Product/composer.json +++ b/src/Sylius/Component/Product/composer.json @@ -30,7 +30,7 @@ "require": { "php": "^8.0", "behat/transliterator": "^1.3", - "sylius/attribute": "^1.12", + "sylius/attribute": "^1.13", "sylius/resource": "^1.9", "symfony/polyfill-iconv": "^1.17", "webmozart/assert": "^1.9" @@ -48,7 +48,7 @@ }, "extra": { "branch-alias": { - "dev-master": "1.12-dev" + "dev-main": "1.13-dev" } }, "autoload": { diff --git a/src/Sylius/Component/Promotion/composer.json b/src/Sylius/Component/Promotion/composer.json index 2e37108fdb3..99993f19147 100644 --- a/src/Sylius/Component/Promotion/composer.json +++ b/src/Sylius/Component/Promotion/composer.json @@ -43,7 +43,7 @@ }, "extra": { "branch-alias": { - "dev-master": "1.12-dev" + "dev-main": "1.13-dev" } }, "autoload": { diff --git a/src/Sylius/Component/Review/composer.json b/src/Sylius/Component/Review/composer.json index 9fa9db74487..e175432b199 100644 --- a/src/Sylius/Component/Review/composer.json +++ b/src/Sylius/Component/Review/composer.json @@ -51,7 +51,7 @@ }, "extra": { "branch-alias": { - "dev-master": "1.12-dev" + "dev-main": "1.13-dev" } }, "autoload": { diff --git a/src/Sylius/Component/Shipping/composer.json b/src/Sylius/Component/Shipping/composer.json index 1d797639ec7..15308427a96 100644 --- a/src/Sylius/Component/Shipping/composer.json +++ b/src/Sylius/Component/Shipping/composer.json @@ -43,7 +43,7 @@ }, "extra": { "branch-alias": { - "dev-master": "1.12-dev" + "dev-main": "1.13-dev" } }, "autoload": { diff --git a/src/Sylius/Component/Taxation/composer.json b/src/Sylius/Component/Taxation/composer.json index b9d2bdadca2..28165433a5c 100644 --- a/src/Sylius/Component/Taxation/composer.json +++ b/src/Sylius/Component/Taxation/composer.json @@ -43,7 +43,7 @@ }, "extra": { "branch-alias": { - "dev-master": "1.12-dev" + "dev-main": "1.13-dev" } }, "autoload": { diff --git a/src/Sylius/Component/Taxonomy/composer.json b/src/Sylius/Component/Taxonomy/composer.json index 566b9dd61cc..1d3493febf4 100644 --- a/src/Sylius/Component/Taxonomy/composer.json +++ b/src/Sylius/Component/Taxonomy/composer.json @@ -41,7 +41,7 @@ }, "extra": { "branch-alias": { - "dev-master": "1.12-dev" + "dev-main": "1.13-dev" } }, "autoload": { diff --git a/src/Sylius/Component/User/composer.json b/src/Sylius/Component/User/composer.json index 6905f7512c8..9a4909e3ac4 100644 --- a/src/Sylius/Component/User/composer.json +++ b/src/Sylius/Component/User/composer.json @@ -53,7 +53,7 @@ }, "extra": { "branch-alias": { - "dev-master": "1.12-dev" + "dev-main": "1.13-dev" } }, "autoload": { From cff037616f624f2980ece68745915e3a989f5a95 Mon Sep 17 00:00:00 2001 From: Jacob Tobiasz Date: Tue, 23 Jan 2024 07:52:05 +0100 Subject: [PATCH 2/2] Change the COMPOSER_ROOT_VERSION for the CI --- .github/workflows/ci_packages-unstable.yaml | 2 +- .github/workflows/ci_packages.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci_packages-unstable.yaml b/.github/workflows/ci_packages-unstable.yaml index 95fa480f44d..885b6d3f931 100644 --- a/.github/workflows/ci_packages-unstable.yaml +++ b/.github/workflows/ci_packages-unstable.yaml @@ -43,7 +43,7 @@ jobs: matrix: ${{ fromJson(needs.get-matrix.outputs.matrix) }} env: - COMPOSER_ROOT_VERSION: "dev-master" + COMPOSER_ROOT_VERSION: "dev-main" SYMFONY_VERSION: "${{ matrix.symfony }}" UNSTABLE: "yes" diff --git a/.github/workflows/ci_packages.yaml b/.github/workflows/ci_packages.yaml index b33583d715d..91d883b1786 100644 --- a/.github/workflows/ci_packages.yaml +++ b/.github/workflows/ci_packages.yaml @@ -75,7 +75,7 @@ jobs: matrix: ${{ fromJson(needs.get-matrix.outputs.matrix) }} env: - COMPOSER_ROOT_VERSION: "dev-master" + COMPOSER_ROOT_VERSION: "dev-main" SYMFONY_VERSION: "${{ matrix.symfony }}" UNSTABLE: "no" @@ -133,7 +133,7 @@ jobs: env: APP_ENV: "test_with_swiftmailer" - COMPOSER_ROOT_VERSION: "dev-master" + COMPOSER_ROOT_VERSION: "dev-main" SYMFONY_VERSION: "${{ matrix.symfony }}" USE_SWIFTMAILER: "yes" UNSTABLE: "no"