From 8dab39254a84051c1320fabd7c1a9ce474529bd1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Pysiak?= Date: Tue, 8 Oct 2024 08:06:05 +0200 Subject: [PATCH 01/16] Resolve gedmo/doctrine-extension conflict --- CONFLICTS.md | 5 ----- composer.json | 5 ++--- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/CONFLICTS.md b/CONFLICTS.md index 0058d70636..3cee61618e 100644 --- a/CONFLICTS.md +++ b/CONFLICTS.md @@ -37,8 +37,3 @@ references related issues. This version has a bug, which lead to a fatal error: `An exception has been thrown during the rendering of a template ("Warning: Undefined variable $blocks").` - -- `gedmo/doctrine-extensions:3.17.0`: - - This version has a bug, which on Symfony 6.4 leads to a fatal error: - `[Semantical Error] The annotation "@note" in property Gedmo\Loggable\Entity\MappedSuperclass\AbstractLogEntry::$data was never imported.` diff --git a/composer.json b/composer.json index df5e49cd0e..abda28e677 100644 --- a/composer.json +++ b/composer.json @@ -48,7 +48,7 @@ "fakerphp/faker": "^1.10", "friendsofphp/proxy-manager-lts": "^1.0.7", "friendsofsymfony/rest-bundle": "^3.0", - "gedmo/doctrine-extensions": "^3.2", + "gedmo/doctrine-extensions": "^3.17.1", "guzzlehttp/guzzle": "^6.5 || ^7.0", "guzzlehttp/psr7": "^2.5", "jms/serializer-bundle": "^4.2", @@ -192,8 +192,7 @@ "lexik/jwt-authentication-bundle": "^2.18", "stof/doctrine-extensions-bundle": "1.8.0", "symfony/validator": "5.4.25", - "twig/twig": "3.9.0", - "gedmo/doctrine-extensions": "^3.17.0" + "twig/twig": "3.9.0" }, "require-dev": { "behat/behat": "^3.6.1", From c9f2be9d9f1a7eef5b75510c1ee29c3c524666d0 Mon Sep 17 00:00:00 2001 From: Wojdylak Date: Mon, 7 Oct 2024 11:33:14 +0200 Subject: [PATCH 02/16] [LocaleBundle] Unification of service names --- .../Resources/config/services.xml | 26 +++++++------------ .../config/services/twig/component.xml | 2 +- 2 files changed, 11 insertions(+), 17 deletions(-) diff --git a/src/Sylius/Bundle/LocaleBundle/Resources/config/services.xml b/src/Sylius/Bundle/LocaleBundle/Resources/config/services.xml index 3cf6bdfd6e..e157245be7 100644 --- a/src/Sylius/Bundle/LocaleBundle/Resources/config/services.xml +++ b/src/Sylius/Bundle/LocaleBundle/Resources/config/services.xml @@ -47,34 +47,29 @@ - + - - + - - + - - + %sylius_locale.locale% - - + - - - + + @@ -88,19 +83,18 @@ - + - + - + - diff --git a/src/Sylius/Bundle/ShopBundle/Resources/config/services/twig/component.xml b/src/Sylius/Bundle/ShopBundle/Resources/config/services/twig/component.xml index 74453a4675..50bf04dad2 100644 --- a/src/Sylius/Bundle/ShopBundle/Resources/config/services/twig/component.xml +++ b/src/Sylius/Bundle/ShopBundle/Resources/config/services/twig/component.xml @@ -16,7 +16,7 @@ class="Sylius\Bundle\ShopBundle\Twig\Component\Common\LocaleSwitcherComponent" > - + Date: Tue, 8 Oct 2024 08:45:25 +0200 Subject: [PATCH 03/16] Update upgrade file --- UPGRADE-2.0.md | 53 +++++++++++++++++++++++++++++--------------------- 1 file changed, 31 insertions(+), 22 deletions(-) diff --git a/UPGRADE-2.0.md b/UPGRADE-2.0.md index 882abb0f70..ee4935706e 100644 --- a/UPGRADE-2.0.md +++ b/UPGRADE-2.0.md @@ -41,28 +41,35 @@ * Aliases introduced in Sylius 1.14 have now become the primary service IDs in Sylius 2.0. The old service IDs have been removed, and all references must be updated accordingly: -| Old ID | New ID | -|-------------------------------------------------------------|-------------------------------------------------------------------------------------| -| **AttributeBundle** | | -| `sylius.form.type.attribute_type.select.choices_collection` | `sylius.form.type.attribute_type.configuration.select_attribute_choices_collection` | -| `sylius.attribute_type.select.value.translations` | `sylius.form.type.attribute_type.configuration.select_attribute_value_translations` | -| `sylius.validator.valid_text_attribute` | `sylius.validator.valid_text_attribute_configuration` | -| `sylius.validator.valid_select_attribute` | `sylius.validator.valid_select_attribute_configuration` | -| **AddressingBundle** | | -| `sylius.province_naming_provider` | `sylius.provider.province_naming` | -| `sylius.zone_matcher` | `sylius.matcher.zone` | -| `sylius.address_comparator` | `sylius.comparator.address` | -| **ChannelBundle** | | -| `sylius.channel_collector` | `sylius.collector.channel` | -| **CurrencyBundle** | | -| `sylius.currency_converter` | `sylius.converter.currency` | -| `sylius.currency_name_converter` | `sylius.converter.currency_name` | -| **InventoryBundle** | | -| `sylius.availability_checker.default` | `sylius.availability_checker` | -| **MoneyBundle** | | -| `sylius.twig.extension.convert_amount` | `sylius.twig.extension.convert_money` | -| `sylius.twig.extension.money` | `sylius.twig.extension.format_money` | -| `sylius.money_formatter` | `sylius.formatter.money` | +| Old ID | New ID | +|--------------------------------------------------------------------------------|-------------------------------------------------------------------------------------| +| **AttributeBundle** | | +| `sylius.form.type.attribute_type.select.choices_collection` | `sylius.form.type.attribute_type.configuration.select_attribute_choices_collection` | +| `sylius.attribute_type.select.value.translations` | `sylius.form.type.attribute_type.configuration.select_attribute_value_translations` | +| `sylius.validator.valid_text_attribute` | `sylius.validator.valid_text_attribute_configuration` | +| `sylius.validator.valid_select_attribute` | `sylius.validator.valid_select_attribute_configuration` | +| **AddressingBundle** | | +| `sylius.province_naming_provider` | `sylius.provider.province_naming` | +| `sylius.zone_matcher` | `sylius.matcher.zone` | +| `sylius.address_comparator` | `sylius.comparator.address` | +| **ChannelBundle** | | +| `sylius.channel_collector` | `sylius.collector.channel` | +| **CurrencyBundle** | | +| `sylius.currency_converter` | `sylius.converter.currency` | +| `sylius.currency_name_converter` | `sylius.converter.currency_name` | +| **InventoryBundle** | | +| `sylius.availability_checker.default` | `sylius.availability_checker` | +| **LocaleBundle** | | +| `Sylius\Bundle\LocaleBundle\Context\RequestHeaderBasedLocaleContext` | `sylius.context.locale.request_header_based` | +| `sylius.locale_collection_provider` | `sylius.provider.locale_collection` | +| `sylius.locale_collection_provider.cahced` | `sylius.provider.locale_collection.cached` | +| `sylius.locale_provider` | `sylius.provider.locale` | +| `sylius.locale_converter` | `sylius.converter.locale` | +| `Sylius\Bundle\LocaleBundle\Doctrine\EventListener\LocaleModificationListener` | `sylius.doctrine.listener.locale_modification` | +| **MoneyBundle** | | +| `sylius.twig.extension.convert_amount` | `sylius.twig.extension.convert_money` | +| `sylius.twig.extension.money` | `sylius.twig.extension.format_money` | +| `sylius.money_formatter` | `sylius.formatter.money` | The old service IDs are no longer available in Sylius 2.0. Please ensure your configurations and service references use the new service IDs. @@ -73,6 +80,8 @@ | **AddressingBundle** | | | `Sylius\Component\Addressing\Checker\ZoneDeletionCheckerInterface` | `sylius.checker.zone_deletion` | | `Sylius\Component\Addressing\Checker\CountryProvincesDeletionCheckerInterface` | `sylius.checker.country_provinces_deletion` | +| **LocaleBundle** | | +| `Sylius\Bundle\LocaleBundle\Checker\LocaleUsageCheckerInterface` | `sylius.checker.locale_usage` | * The following parameters were removed: From 5d0014799fb3b9e966f10c42f8cb9ad8972e695c Mon Sep 17 00:00:00 2001 From: Wojdylak Date: Mon, 7 Oct 2024 14:53:51 +0200 Subject: [PATCH 04/16] [PromotionBundle] Unification of service names --- .../config/services/contexts/setup.xml | 2 +- .../Resources/config/services/form.xml | 4 +-- .../ApiBundle/Resources/config/services.xml | 4 +-- .../config/services/command_handlers.xml | 2 +- .../catalog_promotion/command_handlers.xml | 2 +- .../Resources/config/services/form.xml | 2 +- .../config/services/order_processing.xml | 2 +- .../Controller/PromotionCouponController.php | 2 +- .../Resources/config/services.xml | 26 +++++++++++++--- .../config/services/console_command.xml | 22 +++++++++++-- .../Resources/config/services/criteria.xml | 7 ++++- .../config/services/eligibility_checkers.xml | 31 +++++++++++++++++-- .../Resources/config/services/forms.xml | 24 +++++++++++--- .../services/integrations/doctrine/orm.xml | 11 +++---- .../Resources/config/services/validators.xml | 22 +++++++++++-- .../Command/GenerateCouponsCommandTest.php | 2 +- 16 files changed, 129 insertions(+), 36 deletions(-) diff --git a/src/Sylius/Behat/Resources/config/services/contexts/setup.xml b/src/Sylius/Behat/Resources/config/services/contexts/setup.xml index cca6896842..20fe9a7d68 100644 --- a/src/Sylius/Behat/Resources/config/services/contexts/setup.xml +++ b/src/Sylius/Behat/Resources/config/services/contexts/setup.xml @@ -210,7 +210,7 @@ - + diff --git a/src/Sylius/Bundle/AdminBundle/Resources/config/services/form.xml b/src/Sylius/Bundle/AdminBundle/Resources/config/services/form.xml index f31e880fd7..c227c5b417 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/config/services/form.xml +++ b/src/Sylius/Bundle/AdminBundle/Resources/config/services/form.xml @@ -27,13 +27,13 @@ - + - + diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/services.xml b/src/Sylius/Bundle/ApiBundle/Resources/config/services.xml index 0e37411843..86b5903220 100644 --- a/src/Sylius/Bundle/ApiBundle/Resources/config/services.xml +++ b/src/Sylius/Bundle/ApiBundle/Resources/config/services.xml @@ -138,8 +138,8 @@ - - + + diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/services/command_handlers.xml b/src/Sylius/Bundle/ApiBundle/Resources/config/services/command_handlers.xml index 24bd15ba03..0e613ce679 100644 --- a/src/Sylius/Bundle/ApiBundle/Resources/config/services/command_handlers.xml +++ b/src/Sylius/Bundle/ApiBundle/Resources/config/services/command_handlers.xml @@ -228,7 +228,7 @@ - + diff --git a/src/Sylius/Bundle/CoreBundle/Resources/config/services/catalog_promotion/command_handlers.xml b/src/Sylius/Bundle/CoreBundle/Resources/config/services/catalog_promotion/command_handlers.xml index 02c5db1af5..bf96525ea9 100644 --- a/src/Sylius/Bundle/CoreBundle/Resources/config/services/catalog_promotion/command_handlers.xml +++ b/src/Sylius/Bundle/CoreBundle/Resources/config/services/catalog_promotion/command_handlers.xml @@ -16,7 +16,7 @@ - + diff --git a/src/Sylius/Bundle/CoreBundle/Resources/config/services/form.xml b/src/Sylius/Bundle/CoreBundle/Resources/config/services/form.xml index 6d30383539..1bc966e68e 100644 --- a/src/Sylius/Bundle/CoreBundle/Resources/config/services/form.xml +++ b/src/Sylius/Bundle/CoreBundle/Resources/config/services/form.xml @@ -88,7 +88,7 @@ - + diff --git a/src/Sylius/Bundle/CoreBundle/Resources/config/services/order_processing.xml b/src/Sylius/Bundle/CoreBundle/Resources/config/services/order_processing.xml index fa920cee46..4e0ce64843 100644 --- a/src/Sylius/Bundle/CoreBundle/Resources/config/services/order_processing.xml +++ b/src/Sylius/Bundle/CoreBundle/Resources/config/services/order_processing.xml @@ -56,7 +56,7 @@ - + diff --git a/src/Sylius/Bundle/PromotionBundle/Controller/PromotionCouponController.php b/src/Sylius/Bundle/PromotionBundle/Controller/PromotionCouponController.php index 4a0ac3af9e..6373aac478 100644 --- a/src/Sylius/Bundle/PromotionBundle/Controller/PromotionCouponController.php +++ b/src/Sylius/Bundle/PromotionBundle/Controller/PromotionCouponController.php @@ -65,6 +65,6 @@ class PromotionCouponController extends ResourceController protected function getGenerator(): PromotionCouponGeneratorInterface { - return $this->container->get('sylius.promotion_coupon_generator'); + return $this->container->get('sylius.generator.promotion_coupon'); } } diff --git a/src/Sylius/Bundle/PromotionBundle/Resources/config/services.xml b/src/Sylius/Bundle/PromotionBundle/Resources/config/services.xml index a1c70e4eb2..c986c06a90 100644 --- a/src/Sylius/Bundle/PromotionBundle/Resources/config/services.xml +++ b/src/Sylius/Bundle/PromotionBundle/Resources/config/services.xml @@ -11,7 +11,11 @@ --> - + @@ -28,11 +32,12 @@ - - - + + + + @@ -43,35 +48,45 @@ + Sylius\Component\Promotion\Checker\Rule\RuleCheckerInterface rule checker + + + Sylius\Component\Promotion\Action\PromotionActionCommandInterface promotion action + + + + - + + + + diff --git a/src/Sylius/Bundle/PromotionBundle/Resources/config/services/console_command.xml b/src/Sylius/Bundle/PromotionBundle/Resources/config/services/console_command.xml index f17f6eb853..5061f180c4 100644 --- a/src/Sylius/Bundle/PromotionBundle/Resources/config/services/console_command.xml +++ b/src/Sylius/Bundle/PromotionBundle/Resources/config/services/console_command.xml @@ -1,13 +1,31 @@ - + + + + + - + + diff --git a/src/Sylius/Bundle/PromotionBundle/Resources/config/services/criteria.xml b/src/Sylius/Bundle/PromotionBundle/Resources/config/services/criteria.xml index 19b413679e..052e34f594 100644 --- a/src/Sylius/Bundle/PromotionBundle/Resources/config/services/criteria.xml +++ b/src/Sylius/Bundle/PromotionBundle/Resources/config/services/criteria.xml @@ -11,13 +11,18 @@ --> - + + diff --git a/src/Sylius/Bundle/PromotionBundle/Resources/config/services/eligibility_checkers.xml b/src/Sylius/Bundle/PromotionBundle/Resources/config/services/eligibility_checkers.xml index caf2fed7e3..dd22d8a0f3 100644 --- a/src/Sylius/Bundle/PromotionBundle/Resources/config/services/eligibility_checkers.xml +++ b/src/Sylius/Bundle/PromotionBundle/Resources/config/services/eligibility_checkers.xml @@ -11,7 +11,11 @@ --> - + @@ -20,45 +24,66 @@ public="false"> + + + + + + + + + + + + - + + + - + + + + + + + + diff --git a/src/Sylius/Bundle/PromotionBundle/Resources/config/services/forms.xml b/src/Sylius/Bundle/PromotionBundle/Resources/config/services/forms.xml index cb329e3b03..66070fd3bc 100644 --- a/src/Sylius/Bundle/PromotionBundle/Resources/config/services/forms.xml +++ b/src/Sylius/Bundle/PromotionBundle/Resources/config/services/forms.xml @@ -11,7 +11,11 @@ --> - + sylius @@ -45,9 +49,10 @@ %sylius.model.catalog_promotion.class% %sylius.form.type.catalog_promotion.validation_groups% - Sylius\Bundle\PromotionBundle\Form\Type\CatalogPromotionTranslationType + sylius.form.type.catalog_promotion_translation + %sylius.model.catalog_promotion_scope.class% @@ -55,11 +60,13 @@ + + %sylius.model.catalog_promotion_action.class% @@ -67,17 +74,19 @@ + %sylius.model.catalog_promotion_translation.class% %sylius.form.type.catalog_promotion_translation.validation_groups% + %sylius.model.promotion.class% %sylius.form.type.promotion.validation_groups% - Sylius\Bundle\PromotionBundle\Form\Type\PromotionTranslationType + sylius.form.type.promotion_translation @@ -86,6 +95,7 @@ %sylius.form.type.promotion_translation.validation_groups% + %sylius.model.promotion_action.class% @@ -97,7 +107,7 @@ %sylius.model.promotion_rule.class% %sylius.form.type.promotion_scope.validation_groups% - + @@ -111,15 +121,19 @@ + + - + + %sylius.promotion_actions% + %sylius.promotion_rules% diff --git a/src/Sylius/Bundle/PromotionBundle/Resources/config/services/integrations/doctrine/orm.xml b/src/Sylius/Bundle/PromotionBundle/Resources/config/services/integrations/doctrine/orm.xml index 0dde20c0a7..31b15d1dac 100644 --- a/src/Sylius/Bundle/PromotionBundle/Resources/config/services/integrations/doctrine/orm.xml +++ b/src/Sylius/Bundle/PromotionBundle/Resources/config/services/integrations/doctrine/orm.xml @@ -11,15 +11,14 @@ --> - - + Sylius\Bundle\PromotionBundle\Doctrine\ORM\CatalogPromotionRepository Sylius\Bundle\PromotionBundle\Doctrine\ORM\PromotionRepository Sylius\Bundle\PromotionBundle\Doctrine\ORM\PromotionCouponRepository - diff --git a/src/Sylius/Bundle/PromotionBundle/Resources/config/services/validators.xml b/src/Sylius/Bundle/PromotionBundle/Resources/config/services/validators.xml index 724792ad72..14455ca9a5 100644 --- a/src/Sylius/Bundle/PromotionBundle/Resources/config/services/validators.xml +++ b/src/Sylius/Bundle/PromotionBundle/Resources/config/services/validators.xml @@ -11,21 +11,26 @@ --> - + - + + - + @@ -34,55 +39,66 @@ + %sylius.promotion.catalog_promotion_action.validation_groups% + %sylius.catalog_promotion.actions_types% + %sylius.catalog_promotion.scopes_types% + %sylius.promotion.catalog_promotion_scope.validation_groups% + %sylius.catalog_promotion.scopes_types% + %sylius.promotion.promotion_action.validation_groups% + %sylius.promotion_actions% + %sylius.promotion.promotion_rule.validation_groups% + %sylius.promotion_rules% + + diff --git a/src/Sylius/Bundle/PromotionBundle/Tests/Console/Command/GenerateCouponsCommandTest.php b/src/Sylius/Bundle/PromotionBundle/Tests/Console/Command/GenerateCouponsCommandTest.php index fe2917ff36..8023c8aaef 100644 --- a/src/Sylius/Bundle/PromotionBundle/Tests/Console/Command/GenerateCouponsCommandTest.php +++ b/src/Sylius/Bundle/PromotionBundle/Tests/Console/Command/GenerateCouponsCommandTest.php @@ -46,7 +46,7 @@ final class GenerateCouponsCommandTest extends KernelTestCase $kernel->getContainer()->set('sylius.repository.promotion', $this->promotionRepository); $this->couponGenerator = $this->createMock(PromotionCouponGeneratorInterface::class); - $kernel->getContainer()->set('sylius.promotion_coupon_generator', $this->couponGenerator); + $kernel->getContainer()->set('sylius.generator.promotion_coupon', $this->couponGenerator); $this->command = $application->find('sylius:promotion:generate-coupons'); $this->commandTester = new CommandTester($this->command); From 42533ade2f1149dfd750a2e3a5ee5bd917c76f61 Mon Sep 17 00:00:00 2001 From: Wojdylak Date: Mon, 7 Oct 2024 14:54:00 +0200 Subject: [PATCH 05/16] Update upgrade file --- UPGRADE-1.14.md | 148 +++++++++++++++++++++++++++++++----------------- 1 file changed, 95 insertions(+), 53 deletions(-) diff --git a/UPGRADE-1.14.md b/UPGRADE-1.14.md index 9b08f0bc88..b655b841e0 100644 --- a/UPGRADE-1.14.md +++ b/UPGRADE-1.14.md @@ -35,65 +35,107 @@ 1. Aliases for the following services have been introduced to standardize service IDs and will replace the incorrect IDs in Sylius 2.0: - | Old ID | New ID | - |------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------------| - | **AttributeBundle** | | - | `sylius.form.type.attribute_type.select.choices_collection` | `sylius.form.type.attribute_type.configuration.select_attribute_choices_collection` | - | `sylius.attribute_type.select.value.translations` | `sylius.form.type.attribute_type.configuration.select_attribute_value_translations` | - | `sylius.validator.valid_text_attribute` | `sylius.validator.valid_text_attribute_configuration` | - | `sylius.validator.valid_select_attribute` | `sylius.validator.valid_select_attribute_configuration` | - | **AddressingBundle** | | - | `sylius.province_naming_provider` | `sylius.provider.province_naming` | - | `sylius.zone_matcher` | `sylius.matcher.zone` | - | `sylius.address_comparator` | `sylius.comparator.address` | - | **ChannelBundle** | | - | `sylius.channel_collector` | `sylius.collector.channel` | - | **CurrencyBundle** | | - | `sylius.currency_converter` | `sylius.converter.currency` | - | `sylius.currency_name_converter` | `sylius.converter.currency_name` | - | **InventoryBundle** | | - | `sylius.availability_checker.default` | `sylius.availability_checker` | - | **LocaleBundle** | | - | `Sylius\Bundle\LocaleBundle\Context\RequestHeaderBasedLocaleContext` | `sylius.context.locale.request_header_based` | - | `sylius.locale_collection_provider` | `sylius.provider.locale_collection` | - | `sylius.locale_collection_provider.cahced` | `sylius.provider.locale_collection.cached` | - | `sylius.locale_provider` | `sylius.provider.locale` | - | `sylius.locale_converter` | `sylius.converter.locale` | - | `Sylius\Bundle\LocaleBundle\Doctrine\EventListener\LocaleModificationListener` | `sylius.doctrine.listener.locale_modification` | - | **MoneyBundle** | | - | `sylius.twig.extension.convert_amount` | `sylius.twig.extension.convert_money` | - | `sylius.twig.extension.money` | `sylius.twig.extension.format_money` | - | `sylius.money_formatter` | `sylius.formatter.money` | - | **OrderBundle** | - | `sylius.order_modifier` | `sylius.modifier.order` | - | `sylius.order_item_quantity_modifier` | `sylius.modifier.order_item_quantity` | - | `sylius.order_number_assigner` | `sylius.number_assigner.order_number` | - | `sylius.adjustments_aggregator` | `sylius.aggregator.adjustments_by_label` | - | `sylius.expired_carts_remover` | `sylius.remover.expired_carts` | - | `sylius.sequential_order_number_generator` | `sylius.number_generator.sequential_order` | - | `Sylius\Bundle\OrderBundle\Console\Command\RemoveExpiredCartsCommand` | `sylius.console.command.remove_expired_carts` | - | **ProductBundle** | - | `sylius.form.type.sylius_product_associations` | `sylius.form.type.product_associations` | - | `sylius.form.event_subscriber.product_variant_generator` | `sylius.form.event_subscriber.generate_product_variants` | - | `Sylius\Bundle\ProductBundle\Validator\ProductVariantOptionValuesConfigurationValidator` | `sylius.validator.product_variant_option_values_configuration` | - | `sylius.validator.product_code_uniqueness` | `sylius.validator.unique_simple_product_code` | - | `sylius.product_variant_resolver.default` | `sylius.resolver.product_variant.default` | - | `sylius.available_product_option_values_resolver` | `sylius.resolver.available_product_option_values` | + | Old ID | New ID | + |------------------------------------------------------------------------------------------------------------|--------------------------------------------------------------------------------------| + | **AttributeBundle** | | + | `sylius.form.type.attribute_type.select.choices_collection` | `sylius.form.type.attribute_type.configuration.select_attribute_choices_collection` | + | `sylius.attribute_type.select.value.translations` | `sylius.form.type.attribute_type.configuration.select_attribute_value_translations` | + | `sylius.validator.valid_text_attribute` | `sylius.validator.valid_text_attribute_configuration` | + | `sylius.validator.valid_select_attribute` | `sylius.validator.valid_select_attribute_configuration` | + | **AddressingBundle** | | + | `sylius.province_naming_provider` | `sylius.provider.province_naming` | + | `sylius.zone_matcher` | `sylius.matcher.zone` | + | `sylius.address_comparator` | `sylius.comparator.address` | + | **ChannelBundle** | | + | `sylius.channel_collector` | `sylius.collector.channel` | + | **CurrencyBundle** | | + | `sylius.currency_converter` | `sylius.converter.currency` | + | `sylius.currency_name_converter` | `sylius.converter.currency_name` | + | **InventoryBundle** | | + | `sylius.availability_checker.default` | `sylius.availability_checker` | + | **LocaleBundle** | | + | `Sylius\Bundle\LocaleBundle\Context\RequestHeaderBasedLocaleContext` | `sylius.context.locale.request_header_based` | + | `sylius.locale_collection_provider` | `sylius.provider.locale_collection` | + | `sylius.locale_collection_provider.cahced` | `sylius.provider.locale_collection.cached` | + | `sylius.locale_provider` | `sylius.provider.locale` | + | `sylius.locale_converter` | `sylius.converter.locale` | + | `Sylius\Bundle\LocaleBundle\Doctrine\EventListener\LocaleModificationListener` | `sylius.doctrine.listener.locale_modification` | + | **MoneyBundle** | | + | `sylius.twig.extension.convert_amount` | `sylius.twig.extension.convert_money` | + | `sylius.twig.extension.money` | `sylius.twig.extension.format_money` | + | `sylius.money_formatter` | `sylius.formatter.money` | + | **OrderBundle** | + | `sylius.order_modifier` | `sylius.modifier.order` | + | `sylius.order_item_quantity_modifier` | `sylius.modifier.order_item_quantity` | + | `sylius.order_number_assigner` | `sylius.number_assigner.order_number` | + | `sylius.adjustments_aggregator` | `sylius.aggregator.adjustments_by_label` | + | `sylius.expired_carts_remover` | `sylius.remover.expired_carts` | + | `sylius.sequential_order_number_generator` | `sylius.number_generator.sequential_order` | + | `Sylius\Bundle\OrderBundle\Console\Command\RemoveExpiredCartsCommand` | `sylius.console.command.remove_expired_carts` | + | **ProductBundle** | + | `sylius.form.type.sylius_product_associations` | `sylius.form.type.product_associations` | + | `sylius.form.event_subscriber.product_variant_generator` | `sylius.form.event_subscriber.generate_product_variants` | + | `Sylius\Bundle\ProductBundle\Validator\ProductVariantOptionValuesConfigurationValidator` | `sylius.validator.product_variant_option_values_configuration` | + | `sylius.validator.product_code_uniqueness` | `sylius.validator.unique_simple_product_code` | + | `sylius.product_variant_resolver.default` | `sylius.resolver.product_variant.default` | + | `sylius.available_product_option_values_resolver` | `sylius.resolver.available_product_option_values` | + | **PromotionBundle** | | + | `Sylius\Bundle\PromotionBundle\Console\Command\GenerateCouponsCommand` | `sylius.console.command.generate_coupons` | + | `sylius.promotion_coupon_duration_eligibility_checker` | `sylius.eligibility_checker.promotion_coupon.duration` | + | `sylius.promotion_coupon_usage_limit_eligibility_checker` | `sylius.eligibility_checker.promotion_coupon.usage_limit` | + | `sylius.promotion_coupon_eligibility_checker` | `sylius.eligibility_checker.promotion_coupon` | + | `sylius.promotion_duration_eligibility_checker` | `sylius.eligibility_checker.promotion.duration` | + | `sylius.promotion_usage_limit_eligibility_checker` | `sylius.eligibility_checker.promotion.usage_limit` | + | `sylius.promotion_subject_coupon_eligibility_checker` | `sylius.eligibility_checker.promotion.subject_coupon` | + | `sylius.promotion_rules_eligibility_checker` | `sylius.eligibility_checker.promotion.rules` | + | `sylius.promotion_archival_eligibility_checker` | `sylius.eligibility_checker.promotion.archival` | + | `sylius.promotion_eligibility_checker` | `sylius.eligibility_checker.promotion` | + | `Sylius\Bundle\PromotionBundle\Form\Type\CatalogPromotionType` | `sylius.form.type.catalog_promotion` | + | `Sylius\Bundle\PromotionBundle\Form\Type\CatalogPromotionScopeType` | `sylius.form.type.catalog_promotion_scope` | + | `Sylius\Bundle\PromotionBundle\Form\Type\CatalogPromotionAction\PercentageDiscountActionConfigurationType` | `sylius.form.type.catalog_promotion_action.percentage_discount_action_configuration` | + | `Sylius\Bundle\PromotionBundle\Form\Type\CatalogPromotionActionType` | `sylius.form.type.catalog_promotion_action` | + | `Sylius\Bundle\PromotionBundle\Form\Type\CatalogPromotionTranslationType` | `sylius.form.type.catalog_promotion_translation` | + | `Sylius\Bundle\PromotionBundle\Form\Type\PromotionTranslationType` | `sylius.form.type.promotion_translation` | + | `sylius.form.type.promotion_action.collection` | `sylius.form.type.promotion_action_collection` | + | `sylius.form.type.promotion_rule.collection` | `sylius.form.type.promotion_rule_collection` | + | `sylius.validator.date_range` | `sylius.validator.promotion_date_range` | + | `Sylius\Bundle\PromotionBundle\Validator\CatalogPromotionActionValidator` | `sylius.validator.catalog_promotion_action` | + | `Sylius\Bundle\PromotionBundle\Validator\CatalogPromotionActionGroupValidator` | `sylius.validator.catalog_promotion_action_group` | + | `Sylius\Bundle\PromotionBundle\Validator\CatalogPromotionActionTypeValidator` | `sylius.validator.catalog_promotion_action_type` | + | `Sylius\Bundle\PromotionBundle\Validator\CatalogPromotionScopeValidator` | `sylius.validator.catalog_promotion_scope` | + | `Sylius\Bundle\PromotionBundle\Validator\CatalogPromotionScopeGroupValidator` | `sylius.validator.catalog_promotion_scope_group` | + | `Sylius\Bundle\PromotionBundle\Validator\CatalogPromotionScopeTypeValidator` | `sylius.validator.catalog_promotion_scope_type` | + | `Sylius\Bundle\PromotionBundle\Validator\PromotionActionGroupValidator` | `sylius.validator.promotion_action_group` | + | `Sylius\Bundle\PromotionBundle\Validator\PromotionActionTypeValidator` | `sylius.validator.promotion_action_type` | + | `Sylius\Bundle\PromotionBundle\Validator\PromotionRuleGroupValidator` | `sylius.validator.promotion_role_group` | + | `Sylius\Bundle\PromotionBundle\Validator\PromotionRuleTypeValidator` | `sylius.validator.promotion_role_type` | + | `Sylius\Bundle\PromotionBundle\Validator\PromotionNotCouponBasedValidator` | `sylius.validator.promotion_not_coupon_based` | + | `sylius.promotion_processor` | `sylius.processor.promotion` | + | `sylius.promotion_applicator` | `sylius.action.applicator.promotion` | + | `sylius.registry_promotion_rule_checker` | `sylius.registry.promotion.rule_checker` | + | `sylius.form_registry.promotion_rule_checker` | `sylius.form.registry.promotion.rule_checker` | + | `sylius.registry_promotion_action` | `sylius.registry.promotion.action` | + | `sylius.form_registry.promotion_action` | `sylius.form.registry.promotion.action` | + | `sylius.active_promotions_provider` | `sylius.provider.active_promotions` | + | `sylius.promotion_coupon_generator` | `sylius.generator.promotion_coupon` | + | `sylius.promotion_coupon_generator.percentage_policy` | `sylius.generator.percentage_generation_policy` | The old service IDs are now deprecated and will be removed in Sylius 2.0. Please update your service references accordingly to ensure compatibility with Sylius 2.0. 1. For the following services, new aliases have been added in Sylius 1.14. These aliases will become the primary services IDs in Sylius 2.0, while the current service IDs will be converted into aliases: - | Current ID | New Alias | - |--------------------------------------------------------------------------------|---------------------------------------------| - | **AddressingBundle** | | - | `Sylius\Component\Addressing\Checker\ZoneDeletionCheckerInterface` | `sylius.checker.zone_deletion` | - | `Sylius\Component\Addressing\Checker\CountryProvincesDeletionCheckerInterface` | `sylius.checker.country_provinces_deletion` | - | **LocaleBundle** | | - | `Sylius\Bundle\LocaleBundle\Checker\LocaleUsageCheckerInterface` | `sylius.checker.locale_usage` | - | **ProductBundle** | - | `Sylius\Component\Product\Resolver\ProductVariantResolverInterface` | `sylius.resolver.product_variant` | + | Current ID | New Alias | + |-------------------------------------------------------------------------------------|-----------------------------------------------| + | **AddressingBundle** | | + | `Sylius\Component\Addressing\Checker\ZoneDeletionCheckerInterface` | `sylius.checker.zone_deletion` | + | `Sylius\Component\Addressing\Checker\CountryProvincesDeletionCheckerInterface` | `sylius.checker.country_provinces_deletion` | + | **LocaleBundle** | | + | `Sylius\Bundle\LocaleBundle\Checker\LocaleUsageCheckerInterface` | `sylius.checker.locale_usage` | + | **ProductBundle** | + | `Sylius\Component\Product\Resolver\ProductVariantResolverInterface` | `sylius.resolver.product_variant` | + | **PromotionBundle** | | + | `Sylius\Bundle\PromotionBundle\Provider\EligibleCatalogPromotionsProviderInterface` | `sylius.provider.eligible_catalog_promotions` | We recommend using the new aliases introduced in Sylius 1.14 to ensure compatibility with Sylius 2.0. From 10829c1aa3eb188d224d87b3d7f260191c4b5a32 Mon Sep 17 00:00:00 2001 From: Wojdylak Date: Mon, 7 Oct 2024 14:56:09 +0200 Subject: [PATCH 06/16] Mirror improvements --- UPGRADE-1.14.md | 80 ++++++++++++++++++++++++------------------------- 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/UPGRADE-1.14.md b/UPGRADE-1.14.md index b655b841e0..a1fd74f84d 100644 --- a/UPGRADE-1.14.md +++ b/UPGRADE-1.14.md @@ -79,46 +79,46 @@ | `sylius.validator.product_code_uniqueness` | `sylius.validator.unique_simple_product_code` | | `sylius.product_variant_resolver.default` | `sylius.resolver.product_variant.default` | | `sylius.available_product_option_values_resolver` | `sylius.resolver.available_product_option_values` | - | **PromotionBundle** | | - | `Sylius\Bundle\PromotionBundle\Console\Command\GenerateCouponsCommand` | `sylius.console.command.generate_coupons` | - | `sylius.promotion_coupon_duration_eligibility_checker` | `sylius.eligibility_checker.promotion_coupon.duration` | - | `sylius.promotion_coupon_usage_limit_eligibility_checker` | `sylius.eligibility_checker.promotion_coupon.usage_limit` | - | `sylius.promotion_coupon_eligibility_checker` | `sylius.eligibility_checker.promotion_coupon` | - | `sylius.promotion_duration_eligibility_checker` | `sylius.eligibility_checker.promotion.duration` | - | `sylius.promotion_usage_limit_eligibility_checker` | `sylius.eligibility_checker.promotion.usage_limit` | - | `sylius.promotion_subject_coupon_eligibility_checker` | `sylius.eligibility_checker.promotion.subject_coupon` | - | `sylius.promotion_rules_eligibility_checker` | `sylius.eligibility_checker.promotion.rules` | - | `sylius.promotion_archival_eligibility_checker` | `sylius.eligibility_checker.promotion.archival` | - | `sylius.promotion_eligibility_checker` | `sylius.eligibility_checker.promotion` | - | `Sylius\Bundle\PromotionBundle\Form\Type\CatalogPromotionType` | `sylius.form.type.catalog_promotion` | - | `Sylius\Bundle\PromotionBundle\Form\Type\CatalogPromotionScopeType` | `sylius.form.type.catalog_promotion_scope` | - | `Sylius\Bundle\PromotionBundle\Form\Type\CatalogPromotionAction\PercentageDiscountActionConfigurationType` | `sylius.form.type.catalog_promotion_action.percentage_discount_action_configuration` | - | `Sylius\Bundle\PromotionBundle\Form\Type\CatalogPromotionActionType` | `sylius.form.type.catalog_promotion_action` | - | `Sylius\Bundle\PromotionBundle\Form\Type\CatalogPromotionTranslationType` | `sylius.form.type.catalog_promotion_translation` | - | `Sylius\Bundle\PromotionBundle\Form\Type\PromotionTranslationType` | `sylius.form.type.promotion_translation` | - | `sylius.form.type.promotion_action.collection` | `sylius.form.type.promotion_action_collection` | - | `sylius.form.type.promotion_rule.collection` | `sylius.form.type.promotion_rule_collection` | - | `sylius.validator.date_range` | `sylius.validator.promotion_date_range` | - | `Sylius\Bundle\PromotionBundle\Validator\CatalogPromotionActionValidator` | `sylius.validator.catalog_promotion_action` | - | `Sylius\Bundle\PromotionBundle\Validator\CatalogPromotionActionGroupValidator` | `sylius.validator.catalog_promotion_action_group` | - | `Sylius\Bundle\PromotionBundle\Validator\CatalogPromotionActionTypeValidator` | `sylius.validator.catalog_promotion_action_type` | - | `Sylius\Bundle\PromotionBundle\Validator\CatalogPromotionScopeValidator` | `sylius.validator.catalog_promotion_scope` | - | `Sylius\Bundle\PromotionBundle\Validator\CatalogPromotionScopeGroupValidator` | `sylius.validator.catalog_promotion_scope_group` | - | `Sylius\Bundle\PromotionBundle\Validator\CatalogPromotionScopeTypeValidator` | `sylius.validator.catalog_promotion_scope_type` | - | `Sylius\Bundle\PromotionBundle\Validator\PromotionActionGroupValidator` | `sylius.validator.promotion_action_group` | - | `Sylius\Bundle\PromotionBundle\Validator\PromotionActionTypeValidator` | `sylius.validator.promotion_action_type` | - | `Sylius\Bundle\PromotionBundle\Validator\PromotionRuleGroupValidator` | `sylius.validator.promotion_role_group` | - | `Sylius\Bundle\PromotionBundle\Validator\PromotionRuleTypeValidator` | `sylius.validator.promotion_role_type` | - | `Sylius\Bundle\PromotionBundle\Validator\PromotionNotCouponBasedValidator` | `sylius.validator.promotion_not_coupon_based` | - | `sylius.promotion_processor` | `sylius.processor.promotion` | - | `sylius.promotion_applicator` | `sylius.action.applicator.promotion` | - | `sylius.registry_promotion_rule_checker` | `sylius.registry.promotion.rule_checker` | - | `sylius.form_registry.promotion_rule_checker` | `sylius.form.registry.promotion.rule_checker` | - | `sylius.registry_promotion_action` | `sylius.registry.promotion.action` | - | `sylius.form_registry.promotion_action` | `sylius.form.registry.promotion.action` | - | `sylius.active_promotions_provider` | `sylius.provider.active_promotions` | - | `sylius.promotion_coupon_generator` | `sylius.generator.promotion_coupon` | - | `sylius.promotion_coupon_generator.percentage_policy` | `sylius.generator.percentage_generation_policy` | + | **PromotionBundle** | | + | `Sylius\Bundle\PromotionBundle\Console\Command\GenerateCouponsCommand` | `sylius.console.command.generate_coupons` | + | `sylius.promotion_coupon_duration_eligibility_checker` | `sylius.eligibility_checker.promotion_coupon.duration` | + | `sylius.promotion_coupon_usage_limit_eligibility_checker` | `sylius.eligibility_checker.promotion_coupon.usage_limit` | + | `sylius.promotion_coupon_eligibility_checker` | `sylius.eligibility_checker.promotion_coupon` | + | `sylius.promotion_duration_eligibility_checker` | `sylius.eligibility_checker.promotion.duration` | + | `sylius.promotion_usage_limit_eligibility_checker` | `sylius.eligibility_checker.promotion.usage_limit` | + | `sylius.promotion_subject_coupon_eligibility_checker` | `sylius.eligibility_checker.promotion.subject_coupon` | + | `sylius.promotion_rules_eligibility_checker` | `sylius.eligibility_checker.promotion.rules` | + | `sylius.promotion_archival_eligibility_checker` | `sylius.eligibility_checker.promotion.archival` | + | `sylius.promotion_eligibility_checker` | `sylius.eligibility_checker.promotion` | + | `Sylius\Bundle\PromotionBundle\Form\Type\CatalogPromotionType` | `sylius.form.type.catalog_promotion` | + | `Sylius\Bundle\PromotionBundle\Form\Type\CatalogPromotionScopeType` | `sylius.form.type.catalog_promotion_scope` | + | `Sylius\Bundle\PromotionBundle\Form\Type\CatalogPromotionAction\PercentageDiscountActionConfigurationType` | `sylius.form.type.catalog_promotion_action.percentage_discount_action_configuration` | + | `Sylius\Bundle\PromotionBundle\Form\Type\CatalogPromotionActionType` | `sylius.form.type.catalog_promotion_action` | + | `Sylius\Bundle\PromotionBundle\Form\Type\CatalogPromotionTranslationType` | `sylius.form.type.catalog_promotion_translation` | + | `Sylius\Bundle\PromotionBundle\Form\Type\PromotionTranslationType` | `sylius.form.type.promotion_translation` | + | `sylius.form.type.promotion_action.collection` | `sylius.form.type.promotion_action_collection` | + | `sylius.form.type.promotion_rule.collection` | `sylius.form.type.promotion_rule_collection` | + | `sylius.validator.date_range` | `sylius.validator.promotion_date_range` | + | `Sylius\Bundle\PromotionBundle\Validator\CatalogPromotionActionValidator` | `sylius.validator.catalog_promotion_action` | + | `Sylius\Bundle\PromotionBundle\Validator\CatalogPromotionActionGroupValidator` | `sylius.validator.catalog_promotion_action_group` | + | `Sylius\Bundle\PromotionBundle\Validator\CatalogPromotionActionTypeValidator` | `sylius.validator.catalog_promotion_action_type` | + | `Sylius\Bundle\PromotionBundle\Validator\CatalogPromotionScopeValidator` | `sylius.validator.catalog_promotion_scope` | + | `Sylius\Bundle\PromotionBundle\Validator\CatalogPromotionScopeGroupValidator` | `sylius.validator.catalog_promotion_scope_group` | + | `Sylius\Bundle\PromotionBundle\Validator\CatalogPromotionScopeTypeValidator` | `sylius.validator.catalog_promotion_scope_type` | + | `Sylius\Bundle\PromotionBundle\Validator\PromotionActionGroupValidator` | `sylius.validator.promotion_action_group` | + | `Sylius\Bundle\PromotionBundle\Validator\PromotionActionTypeValidator` | `sylius.validator.promotion_action_type` | + | `Sylius\Bundle\PromotionBundle\Validator\PromotionRuleGroupValidator` | `sylius.validator.promotion_role_group` | + | `Sylius\Bundle\PromotionBundle\Validator\PromotionRuleTypeValidator` | `sylius.validator.promotion_role_type` | + | `Sylius\Bundle\PromotionBundle\Validator\PromotionNotCouponBasedValidator` | `sylius.validator.promotion_not_coupon_based` | + | `sylius.promotion_processor` | `sylius.processor.promotion` | + | `sylius.promotion_applicator` | `sylius.action.applicator.promotion` | + | `sylius.registry_promotion_rule_checker` | `sylius.registry.promotion.rule_checker` | + | `sylius.form_registry.promotion_rule_checker` | `sylius.form.registry.promotion.rule_checker` | + | `sylius.registry_promotion_action` | `sylius.registry.promotion.action` | + | `sylius.form_registry.promotion_action` | `sylius.form.registry.promotion.action` | + | `sylius.active_promotions_provider` | `sylius.provider.active_promotions` | + | `sylius.promotion_coupon_generator` | `sylius.generator.promotion_coupon` | + | `sylius.promotion_coupon_generator.percentage_policy` | `sylius.generator.percentage_generation_policy` | The old service IDs are now deprecated and will be removed in Sylius 2.0. Please update your service references accordingly to ensure compatibility with Sylius 2.0. From 695310999d09ca4788163cb8e90f0ff068704916 Mon Sep 17 00:00:00 2001 From: Wojdylak Date: Tue, 8 Oct 2024 09:00:05 +0200 Subject: [PATCH 07/16] Mirror improvements --- UPGRADE-1.14.md | 2 -- .../Bundle/CoreBundle/Resources/config/services/form.xml | 2 +- .../Bundle/PromotionBundle/Resources/config/services.xml | 2 -- .../PromotionBundle/Resources/config/services/forms.xml | 6 +++--- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/UPGRADE-1.14.md b/UPGRADE-1.14.md index a1fd74f84d..d56455fe2b 100644 --- a/UPGRADE-1.14.md +++ b/UPGRADE-1.14.md @@ -113,9 +113,7 @@ | `sylius.promotion_processor` | `sylius.processor.promotion` | | `sylius.promotion_applicator` | `sylius.action.applicator.promotion` | | `sylius.registry_promotion_rule_checker` | `sylius.registry.promotion.rule_checker` | - | `sylius.form_registry.promotion_rule_checker` | `sylius.form.registry.promotion.rule_checker` | | `sylius.registry_promotion_action` | `sylius.registry.promotion.action` | - | `sylius.form_registry.promotion_action` | `sylius.form.registry.promotion.action` | | `sylius.active_promotions_provider` | `sylius.provider.active_promotions` | | `sylius.promotion_coupon_generator` | `sylius.generator.promotion_coupon` | | `sylius.promotion_coupon_generator.percentage_policy` | `sylius.generator.percentage_generation_policy` | diff --git a/src/Sylius/Bundle/CoreBundle/Resources/config/services/form.xml b/src/Sylius/Bundle/CoreBundle/Resources/config/services/form.xml index 1bc966e68e..6d30383539 100644 --- a/src/Sylius/Bundle/CoreBundle/Resources/config/services/form.xml +++ b/src/Sylius/Bundle/CoreBundle/Resources/config/services/form.xml @@ -88,7 +88,7 @@ - + diff --git a/src/Sylius/Bundle/PromotionBundle/Resources/config/services.xml b/src/Sylius/Bundle/PromotionBundle/Resources/config/services.xml index c986c06a90..bdc1e930d7 100644 --- a/src/Sylius/Bundle/PromotionBundle/Resources/config/services.xml +++ b/src/Sylius/Bundle/PromotionBundle/Resources/config/services.xml @@ -57,7 +57,6 @@ - Sylius\Component\Promotion\Action\PromotionActionCommandInterface @@ -66,7 +65,6 @@ - diff --git a/src/Sylius/Bundle/PromotionBundle/Resources/config/services/forms.xml b/src/Sylius/Bundle/PromotionBundle/Resources/config/services/forms.xml index 66070fd3bc..8f213775ba 100644 --- a/src/Sylius/Bundle/PromotionBundle/Resources/config/services/forms.xml +++ b/src/Sylius/Bundle/PromotionBundle/Resources/config/services/forms.xml @@ -49,7 +49,7 @@ %sylius.model.catalog_promotion.class% %sylius.form.type.catalog_promotion.validation_groups% - sylius.form.type.catalog_promotion_translation + Sylius\Bundle\PromotionBundle\Form\Type\CatalogPromotionTranslationType @@ -86,7 +86,7 @@ %sylius.model.promotion.class% %sylius.form.type.promotion.validation_groups% - sylius.form.type.promotion_translation + Sylius\Bundle\PromotionBundle\Form\Type\PromotionTranslationType @@ -107,7 +107,7 @@ %sylius.model.promotion_rule.class% %sylius.form.type.promotion_scope.validation_groups% - + From b28105c8509d249a21b33a1da2a1d0824e07aafa Mon Sep 17 00:00:00 2001 From: Wojdylak Date: Tue, 8 Oct 2024 09:18:58 +0200 Subject: [PATCH 08/16] Fix GenerateCouponsCommandTest --- .../Tests/Console/Command/GenerateCouponsCommandTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Sylius/Bundle/PromotionBundle/Tests/Console/Command/GenerateCouponsCommandTest.php b/src/Sylius/Bundle/PromotionBundle/Tests/Console/Command/GenerateCouponsCommandTest.php index 8023c8aaef..fe2917ff36 100644 --- a/src/Sylius/Bundle/PromotionBundle/Tests/Console/Command/GenerateCouponsCommandTest.php +++ b/src/Sylius/Bundle/PromotionBundle/Tests/Console/Command/GenerateCouponsCommandTest.php @@ -46,7 +46,7 @@ final class GenerateCouponsCommandTest extends KernelTestCase $kernel->getContainer()->set('sylius.repository.promotion', $this->promotionRepository); $this->couponGenerator = $this->createMock(PromotionCouponGeneratorInterface::class); - $kernel->getContainer()->set('sylius.generator.promotion_coupon', $this->couponGenerator); + $kernel->getContainer()->set('sylius.promotion_coupon_generator', $this->couponGenerator); $this->command = $application->find('sylius:promotion:generate-coupons'); $this->commandTester = new CommandTester($this->command); From d396c04c37d02ce47e21587dd055c65d49390372 Mon Sep 17 00:00:00 2001 From: Wojdylak Date: Tue, 8 Oct 2024 09:48:26 +0200 Subject: [PATCH 09/16] Revert extended type for tags --- .../Bundle/AdminBundle/Resources/config/services/form.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Sylius/Bundle/AdminBundle/Resources/config/services/form.xml b/src/Sylius/Bundle/AdminBundle/Resources/config/services/form.xml index c227c5b417..f31e880fd7 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/config/services/form.xml +++ b/src/Sylius/Bundle/AdminBundle/Resources/config/services/form.xml @@ -27,13 +27,13 @@ - + - + From 92f119867a55fc76915d15482fe35d38948b9204 Mon Sep 17 00:00:00 2001 From: Wojdylak Date: Tue, 8 Oct 2024 11:13:04 +0200 Subject: [PATCH 10/16] [OrderBundle] Unification of service names --- .../CoreBundle/Resources/config/services.xml | 4 +-- .../OrderBundle/Resources/config/services.xml | 32 +++++++------------ .../Resources/config/services/listeners.xml | 4 +-- 3 files changed, 16 insertions(+), 24 deletions(-) diff --git a/src/Sylius/Bundle/CoreBundle/Resources/config/services.xml b/src/Sylius/Bundle/CoreBundle/Resources/config/services.xml index e18e7e187c..bd4faf71de 100644 --- a/src/Sylius/Bundle/CoreBundle/Resources/config/services.xml +++ b/src/Sylius/Bundle/CoreBundle/Resources/config/services.xml @@ -114,7 +114,7 @@ - + @@ -220,7 +220,7 @@ - + diff --git a/src/Sylius/Bundle/OrderBundle/Resources/config/services.xml b/src/Sylius/Bundle/OrderBundle/Resources/config/services.xml index 2378d0313d..128d894848 100644 --- a/src/Sylius/Bundle/OrderBundle/Resources/config/services.xml +++ b/src/Sylius/Bundle/OrderBundle/Resources/config/services.xml @@ -24,14 +24,12 @@ - + %sylius_order.cart_expiration_period% - - @@ -41,48 +39,42 @@ - + - - + - + - - + - + - - + - - + - - - + + - + %sylius_order.cart_expiration_period% - - + diff --git a/src/Sylius/Bundle/ShopBundle/Resources/config/services/listeners.xml b/src/Sylius/Bundle/ShopBundle/Resources/config/services/listeners.xml index 28027c35fb..0bfb5b3fc2 100644 --- a/src/Sylius/Bundle/ShopBundle/Resources/config/services/listeners.xml +++ b/src/Sylius/Bundle/ShopBundle/Resources/config/services/listeners.xml @@ -94,12 +94,12 @@ - + - + From 3c67a4e253da5346da79b3480bdc4307080204dd Mon Sep 17 00:00:00 2001 From: Wojdylak Date: Tue, 8 Oct 2024 11:13:14 +0200 Subject: [PATCH 11/16] Update upgrade file --- UPGRADE-2.0.md | 52 +++++++++++++++++++++++++++++--------------------- 1 file changed, 30 insertions(+), 22 deletions(-) diff --git a/UPGRADE-2.0.md b/UPGRADE-2.0.md index 882abb0f70..275b719161 100644 --- a/UPGRADE-2.0.md +++ b/UPGRADE-2.0.md @@ -41,28 +41,36 @@ * Aliases introduced in Sylius 1.14 have now become the primary service IDs in Sylius 2.0. The old service IDs have been removed, and all references must be updated accordingly: -| Old ID | New ID | -|-------------------------------------------------------------|-------------------------------------------------------------------------------------| -| **AttributeBundle** | | -| `sylius.form.type.attribute_type.select.choices_collection` | `sylius.form.type.attribute_type.configuration.select_attribute_choices_collection` | -| `sylius.attribute_type.select.value.translations` | `sylius.form.type.attribute_type.configuration.select_attribute_value_translations` | -| `sylius.validator.valid_text_attribute` | `sylius.validator.valid_text_attribute_configuration` | -| `sylius.validator.valid_select_attribute` | `sylius.validator.valid_select_attribute_configuration` | -| **AddressingBundle** | | -| `sylius.province_naming_provider` | `sylius.provider.province_naming` | -| `sylius.zone_matcher` | `sylius.matcher.zone` | -| `sylius.address_comparator` | `sylius.comparator.address` | -| **ChannelBundle** | | -| `sylius.channel_collector` | `sylius.collector.channel` | -| **CurrencyBundle** | | -| `sylius.currency_converter` | `sylius.converter.currency` | -| `sylius.currency_name_converter` | `sylius.converter.currency_name` | -| **InventoryBundle** | | -| `sylius.availability_checker.default` | `sylius.availability_checker` | -| **MoneyBundle** | | -| `sylius.twig.extension.convert_amount` | `sylius.twig.extension.convert_money` | -| `sylius.twig.extension.money` | `sylius.twig.extension.format_money` | -| `sylius.money_formatter` | `sylius.formatter.money` | +| Old ID | New ID | +|-----------------------------------------------------------------------|-------------------------------------------------------------------------------------| +| **AttributeBundle** | | +| `sylius.form.type.attribute_type.select.choices_collection` | `sylius.form.type.attribute_type.configuration.select_attribute_choices_collection` | +| `sylius.attribute_type.select.value.translations` | `sylius.form.type.attribute_type.configuration.select_attribute_value_translations` | +| `sylius.validator.valid_text_attribute` | `sylius.validator.valid_text_attribute_configuration` | +| `sylius.validator.valid_select_attribute` | `sylius.validator.valid_select_attribute_configuration` | +| **AddressingBundle** | | +| `sylius.province_naming_provider` | `sylius.provider.province_naming` | +| `sylius.zone_matcher` | `sylius.matcher.zone` | +| `sylius.address_comparator` | `sylius.comparator.address` | +| **ChannelBundle** | | +| `sylius.channel_collector` | `sylius.collector.channel` | +| **CurrencyBundle** | | +| `sylius.currency_converter` | `sylius.converter.currency` | +| `sylius.currency_name_converter` | `sylius.converter.currency_name` | +| **InventoryBundle** | | +| `sylius.availability_checker.default` | `sylius.availability_checker` | +| **MoneyBundle** | | +| `sylius.twig.extension.convert_amount` | `sylius.twig.extension.convert_money` | +| `sylius.twig.extension.money` | `sylius.twig.extension.format_money` | +| `sylius.money_formatter` | `sylius.formatter.money` | +| **OrderBundle** | +| `sylius.order_modifier` | `sylius.modifier.order` | +| `sylius.order_item_quantity_modifier` | `sylius.modifier.order_item_quantity` | +| `sylius.order_number_assigner` | `sylius.number_assigner.order_number` | +| `sylius.adjustments_aggregator` | `sylius.aggregator.adjustments_by_label` | +| `sylius.expired_carts_remover` | `sylius.remover.expired_carts` | +| `sylius.sequential_order_number_generator` | `sylius.number_generator.sequential_order` | +| `Sylius\Bundle\OrderBundle\Console\Command\RemoveExpiredCartsCommand` | `sylius.console.command.remove_expired_carts` | The old service IDs are no longer available in Sylius 2.0. Please ensure your configurations and service references use the new service IDs. From 54dcd3d53a90c405f85ed0d8d8c3938c583c5281 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bart=C5=82omiej=20S=C4=99k?= Date: Tue, 8 Oct 2024 11:25:28 +0200 Subject: [PATCH 12/16] Move menu to the left side --- .../Resources/config/app/twig_hooks/product/create.yaml | 3 ++- .../Resources/config/app/twig_hooks/product/update.yaml | 3 ++- .../config/app/twig_hooks/product_variant/create.yaml | 3 ++- .../config/app/twig_hooks/product_variant/update.yaml | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/Sylius/Bundle/AdminBundle/Resources/config/app/twig_hooks/product/create.yaml b/src/Sylius/Bundle/AdminBundle/Resources/config/app/twig_hooks/product/create.yaml index 556b39d3bf..986f38cdb0 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/config/app/twig_hooks/product/create.yaml +++ b/src/Sylius/Bundle/AdminBundle/Resources/config/app/twig_hooks/product/create.yaml @@ -14,6 +14,7 @@ twig_hooks: 'sylius_admin.product.create.content.form': side_navigation: template: '@SyliusAdmin/product/form/side_navigation.html.twig' + priority: 1 sections: template: '@SyliusAdmin/product/form/sections.html.twig' @@ -66,7 +67,7 @@ twig_hooks: template: '@SyliusAdmin/product/form/sections/media.html.twig' 'sylius_admin.product.create.content.form.sections.general': - default: + default: enabled: false code: template: '@SyliusAdmin/product/form/sections/general/code.html.twig' diff --git a/src/Sylius/Bundle/AdminBundle/Resources/config/app/twig_hooks/product/update.yaml b/src/Sylius/Bundle/AdminBundle/Resources/config/app/twig_hooks/product/update.yaml index ad0da3521c..aace1f558a 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/config/app/twig_hooks/product/update.yaml +++ b/src/Sylius/Bundle/AdminBundle/Resources/config/app/twig_hooks/product/update.yaml @@ -32,6 +32,7 @@ twig_hooks: 'sylius_admin.product.update.content.form': side_navigation: template: '@SyliusAdmin/product/form/side_navigation.html.twig' + priority: 1 sections: template: '@SyliusAdmin/product/form/sections.html.twig' @@ -84,7 +85,7 @@ twig_hooks: template: '@SyliusAdmin/product/form/sections/media.html.twig' 'sylius_admin.product.update.content.form.sections.general': - default: + default: enabled: false code: template: '@SyliusAdmin/product/form/sections/general/code.html.twig' diff --git a/src/Sylius/Bundle/AdminBundle/Resources/config/app/twig_hooks/product_variant/create.yaml b/src/Sylius/Bundle/AdminBundle/Resources/config/app/twig_hooks/product_variant/create.yaml index 4991694305..e43ca2c10e 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/config/app/twig_hooks/product_variant/create.yaml +++ b/src/Sylius/Bundle/AdminBundle/Resources/config/app/twig_hooks/product_variant/create.yaml @@ -3,7 +3,7 @@ twig_hooks: 'sylius_admin.product_variant.create.content': form: template: '@SyliusAdmin/product_variant/form.html.twig' - + 'sylius_admin.product_variant.create.content.header': breadcrumbs: template: '@SyliusAdmin/product_variant/form/content/create/header/breadcrumbs.html.twig' @@ -11,6 +11,7 @@ twig_hooks: 'sylius_admin.product_variant.create.content.form': side_navigation: template: '@SyliusAdmin/product_variant/form/side_navigation.html.twig' + priority: 1 sections: template: '@SyliusAdmin/product_variant/form/sections.html.twig' diff --git a/src/Sylius/Bundle/AdminBundle/Resources/config/app/twig_hooks/product_variant/update.yaml b/src/Sylius/Bundle/AdminBundle/Resources/config/app/twig_hooks/product_variant/update.yaml index c6b4ec6a2c..df37db805a 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/config/app/twig_hooks/product_variant/update.yaml +++ b/src/Sylius/Bundle/AdminBundle/Resources/config/app/twig_hooks/product_variant/update.yaml @@ -21,6 +21,7 @@ twig_hooks: 'sylius_admin.product_variant.update.content.form': side_navigation: template: '@SyliusAdmin/product_variant/form/side_navigation.html.twig' + priority: 1 sections: template: '@SyliusAdmin/product_variant/form/sections.html.twig' @@ -49,7 +50,7 @@ twig_hooks: template: '@SyliusAdmin/product_variant/form/sections/translations.html.twig' taxes: template: '@SyliusAdmin/product_variant/form/sections/taxes.html.twig' - + 'sylius_admin.product_variant.update.content.form.sections.translations': name: template: '@SyliusAdmin/product_variant/form/sections/translations/name.html.twig' From 66e2a5d81947f7219ffb2ca0bf87ef8acb407d3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bart=C5=82omiej=20S=C4=99k?= Date: Tue, 8 Oct 2024 11:51:40 +0200 Subject: [PATCH 13/16] Fix customers grid icon --- .../Bundle/AdminBundle/Resources/config/grids/customer.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Sylius/Bundle/AdminBundle/Resources/config/grids/customer.yml b/src/Sylius/Bundle/AdminBundle/Resources/config/grids/customer.yml index 4fee99c83b..6aecdce259 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/config/grids/customer.yml +++ b/src/Sylius/Bundle/AdminBundle/Resources/config/grids/customer.yml @@ -74,7 +74,7 @@ sylius_grid: show_orders: type: show label: sylius.ui.show_orders - icon: shopping-bag + icon: shopping_bag options: link: route: sylius_admin_customer_order_index From b51c1f0987509d4e1b01efc1d2e4f8a9f3f162c8 Mon Sep 17 00:00:00 2001 From: Wojdylak Date: Tue, 8 Oct 2024 12:19:43 +0200 Subject: [PATCH 14/16] [ProductBundle] Unification of service names --- ...aultProductVariantResolverCompilerPass.php | 35 ---------- .../Resources/config/services.xml | 7 +- .../Resources/config/services/form.xml | 6 +- .../Resources/config/services/validators.xml | 6 +- .../ProductBundle/SyliusProductBundle.php | 9 --- ...ProductVariantResolverCompilerPassTest.php | 67 ------------------- .../services/twig/component/product.xml | 4 +- 7 files changed, 9 insertions(+), 125 deletions(-) delete mode 100644 src/Sylius/Bundle/ProductBundle/DependencyInjection/Compiler/DefaultProductVariantResolverCompilerPass.php delete mode 100644 src/Sylius/Bundle/ProductBundle/Tests/DependencyInjection/Compiler/DefaultProductVariantResolverCompilerPassTest.php diff --git a/src/Sylius/Bundle/ProductBundle/DependencyInjection/Compiler/DefaultProductVariantResolverCompilerPass.php b/src/Sylius/Bundle/ProductBundle/DependencyInjection/Compiler/DefaultProductVariantResolverCompilerPass.php deleted file mode 100644 index e1617494cd..0000000000 --- a/src/Sylius/Bundle/ProductBundle/DependencyInjection/Compiler/DefaultProductVariantResolverCompilerPass.php +++ /dev/null @@ -1,35 +0,0 @@ -has('sylius.product_variant_resolver.default')) { - return; - } - - // In case someone overwritten the service, we need to make sure it's tagged - $defaultResolver = $container->getDefinition('sylius.product_variant_resolver.default'); - if (!$defaultResolver->hasTag('sylius.product_variant_resolver')) { - $defaultResolver->addTag('sylius.product_variant_resolver', ['priority' => self::DEFAULT_PRIORITY]); - } - } -} diff --git a/src/Sylius/Bundle/ProductBundle/Resources/config/services.xml b/src/Sylius/Bundle/ProductBundle/Resources/config/services.xml index 2f12c9738c..89291838b8 100644 --- a/src/Sylius/Bundle/ProductBundle/Resources/config/services.xml +++ b/src/Sylius/Bundle/ProductBundle/Resources/config/services.xml @@ -46,17 +46,16 @@ - + - + - + - %sylius.model.product_attribute_value.class% diff --git a/src/Sylius/Bundle/ProductBundle/Resources/config/services/form.xml b/src/Sylius/Bundle/ProductBundle/Resources/config/services/form.xml index a0d84ec690..d9b74d3012 100644 --- a/src/Sylius/Bundle/ProductBundle/Resources/config/services/form.xml +++ b/src/Sylius/Bundle/ProductBundle/Resources/config/services/form.xml @@ -93,12 +93,11 @@ - + - %sylius.model.product_attribute.class% @@ -205,11 +204,10 @@ - + - diff --git a/src/Sylius/Bundle/ProductBundle/Resources/config/services/validators.xml b/src/Sylius/Bundle/ProductBundle/Resources/config/services/validators.xml index 6e6c79b705..ebd0a2aa33 100644 --- a/src/Sylius/Bundle/ProductBundle/Resources/config/services/validators.xml +++ b/src/Sylius/Bundle/ProductBundle/Resources/config/services/validators.xml @@ -24,15 +24,13 @@ - + - - + - diff --git a/src/Sylius/Bundle/ProductBundle/SyliusProductBundle.php b/src/Sylius/Bundle/ProductBundle/SyliusProductBundle.php index 7f4dfa6071..9f9eb76ae0 100644 --- a/src/Sylius/Bundle/ProductBundle/SyliusProductBundle.php +++ b/src/Sylius/Bundle/ProductBundle/SyliusProductBundle.php @@ -13,20 +13,11 @@ declare(strict_types=1); namespace Sylius\Bundle\ProductBundle; -use Sylius\Bundle\ProductBundle\DependencyInjection\Compiler\DefaultProductVariantResolverCompilerPass; use Sylius\Bundle\ResourceBundle\AbstractResourceBundle; use Sylius\Bundle\ResourceBundle\SyliusResourceBundle; -use Symfony\Component\DependencyInjection\ContainerBuilder; final class SyliusProductBundle extends AbstractResourceBundle { - public function build(ContainerBuilder $container): void - { - parent::build($container); - - $container->addCompilerPass(new DefaultProductVariantResolverCompilerPass()); - } - /** @return string[] */ public function getSupportedDrivers(): array { diff --git a/src/Sylius/Bundle/ProductBundle/Tests/DependencyInjection/Compiler/DefaultProductVariantResolverCompilerPassTest.php b/src/Sylius/Bundle/ProductBundle/Tests/DependencyInjection/Compiler/DefaultProductVariantResolverCompilerPassTest.php deleted file mode 100644 index c8d4a5fdcc..0000000000 --- a/src/Sylius/Bundle/ProductBundle/Tests/DependencyInjection/Compiler/DefaultProductVariantResolverCompilerPassTest.php +++ /dev/null @@ -1,67 +0,0 @@ -compile(); - - $this->assertContainerBuilderNotHasService('sylius.product_variant_resolver.default'); - } - - /** @test */ - public function it_does_nothing_when_default_resolver_already_has_the_tag(): void - { - $defaultResolver = $this->registerService( - 'sylius.product_variant_resolver.default', - ProductVariantResolverInterface::class, - ); - $defaultResolver->addTag('sylius.product_variant_resolver'); - - $this->compile(); - - $this->assertContainerBuilderHasServiceDefinitionWithTag( - 'sylius.product_variant_resolver.default', - 'sylius.product_variant_resolver', - ); - } - - /** @test */ - public function it_adds_variant_resolver_tag_with_very_low_priority_to_the_default_resolver(): void - { - $this->setDefinition('sylius.product_variant_resolver.default', new Definition()); - - $this->compile(); - - $this->assertContainerBuilderHasServiceDefinitionWithTag( - 'sylius.product_variant_resolver.default', - 'sylius.product_variant_resolver', - ['priority' => -999], - ); - } - - protected function registerCompilerPass(ContainerBuilder $container): void - { - $container->addCompilerPass(new DefaultProductVariantResolverCompilerPass()); - } -} diff --git a/src/Sylius/Bundle/ShopBundle/Resources/config/services/twig/component/product.xml b/src/Sylius/Bundle/ShopBundle/Resources/config/services/twig/component/product.xml index bf4ca3fcdd..24e976387f 100644 --- a/src/Sylius/Bundle/ShopBundle/Resources/config/services/twig/component/product.xml +++ b/src/Sylius/Bundle/ShopBundle/Resources/config/services/twig/component/product.xml @@ -57,7 +57,7 @@ class="Sylius\Bundle\ShopBundle\Twig\Component\Product\CardComponent" > - + @@ -103,7 +103,7 @@ id="sylius_shop.twig.component.product.summary" class="Sylius\Bundle\ShopBundle\Twig\Component\Product\SummaryComponent" > - + From ee5c3e04d3ab9fefa53b3f6ecf8c15e795cbd7d6 Mon Sep 17 00:00:00 2001 From: Wojdylak Date: Tue, 8 Oct 2024 12:19:58 +0200 Subject: [PATCH 15/16] Update upgrade file --- UPGRADE-2.0.md | 53 +++++++++++++++++++++++++++++--------------------- 1 file changed, 31 insertions(+), 22 deletions(-) diff --git a/UPGRADE-2.0.md b/UPGRADE-2.0.md index 882abb0f70..e0af735750 100644 --- a/UPGRADE-2.0.md +++ b/UPGRADE-2.0.md @@ -41,28 +41,35 @@ * Aliases introduced in Sylius 1.14 have now become the primary service IDs in Sylius 2.0. The old service IDs have been removed, and all references must be updated accordingly: -| Old ID | New ID | -|-------------------------------------------------------------|-------------------------------------------------------------------------------------| -| **AttributeBundle** | | -| `sylius.form.type.attribute_type.select.choices_collection` | `sylius.form.type.attribute_type.configuration.select_attribute_choices_collection` | -| `sylius.attribute_type.select.value.translations` | `sylius.form.type.attribute_type.configuration.select_attribute_value_translations` | -| `sylius.validator.valid_text_attribute` | `sylius.validator.valid_text_attribute_configuration` | -| `sylius.validator.valid_select_attribute` | `sylius.validator.valid_select_attribute_configuration` | -| **AddressingBundle** | | -| `sylius.province_naming_provider` | `sylius.provider.province_naming` | -| `sylius.zone_matcher` | `sylius.matcher.zone` | -| `sylius.address_comparator` | `sylius.comparator.address` | -| **ChannelBundle** | | -| `sylius.channel_collector` | `sylius.collector.channel` | -| **CurrencyBundle** | | -| `sylius.currency_converter` | `sylius.converter.currency` | -| `sylius.currency_name_converter` | `sylius.converter.currency_name` | -| **InventoryBundle** | | -| `sylius.availability_checker.default` | `sylius.availability_checker` | -| **MoneyBundle** | | -| `sylius.twig.extension.convert_amount` | `sylius.twig.extension.convert_money` | -| `sylius.twig.extension.money` | `sylius.twig.extension.format_money` | -| `sylius.money_formatter` | `sylius.formatter.money` | +| Old ID | New ID | +|------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------------| +| **AttributeBundle** | | +| `sylius.form.type.attribute_type.select.choices_collection` | `sylius.form.type.attribute_type.configuration.select_attribute_choices_collection` | +| `sylius.attribute_type.select.value.translations` | `sylius.form.type.attribute_type.configuration.select_attribute_value_translations` | +| `sylius.validator.valid_text_attribute` | `sylius.validator.valid_text_attribute_configuration` | +| `sylius.validator.valid_select_attribute` | `sylius.validator.valid_select_attribute_configuration` | +| **AddressingBundle** | | +| `sylius.province_naming_provider` | `sylius.provider.province_naming` | +| `sylius.zone_matcher` | `sylius.matcher.zone` | +| `sylius.address_comparator` | `sylius.comparator.address` | +| **ChannelBundle** | | +| `sylius.channel_collector` | `sylius.collector.channel` | +| **CurrencyBundle** | | +| `sylius.currency_converter` | `sylius.converter.currency` | +| `sylius.currency_name_converter` | `sylius.converter.currency_name` | +| **InventoryBundle** | | +| `sylius.availability_checker.default` | `sylius.availability_checker` | +| **MoneyBundle** | | +| `sylius.twig.extension.convert_amount` | `sylius.twig.extension.convert_money` | +| `sylius.twig.extension.money` | `sylius.twig.extension.format_money` | +| `sylius.money_formatter` | `sylius.formatter.money` | +| **ProductBundle** | +| `sylius.form.type.sylius_product_associations` | `sylius.form.type.product_associations` | +| `sylius.form.event_subscriber.product_variant_generator` | `sylius.form.event_subscriber.generate_product_variants` | +| `Sylius\Bundle\ProductBundle\Validator\ProductVariantOptionValuesConfigurationValidator` | `sylius.validator.product_variant_option_values_configuration` | +| `sylius.validator.product_code_uniqueness` | `sylius.validator.unique_simple_product_code` | +| `sylius.product_variant_resolver.default` | `sylius.resolver.product_variant.default` | +| `sylius.available_product_option_values_resolver` | `sylius.resolver.available_product_option_values` | The old service IDs are no longer available in Sylius 2.0. Please ensure your configurations and service references use the new service IDs. @@ -73,6 +80,8 @@ | **AddressingBundle** | | | `Sylius\Component\Addressing\Checker\ZoneDeletionCheckerInterface` | `sylius.checker.zone_deletion` | | `Sylius\Component\Addressing\Checker\CountryProvincesDeletionCheckerInterface` | `sylius.checker.country_provinces_deletion` | +| **ProductBundle** | +| `Sylius\Component\Product\Resolver\ProductVariantResolverInterface` | `sylius.resolver.product_variant` | * The following parameters were removed: From c8fef88e0d8a8ca9f962f140ebbf11a10e376ea7 Mon Sep 17 00:00:00 2001 From: Wojdylak Date: Tue, 8 Oct 2024 13:00:03 +0200 Subject: [PATCH 16/16] Move aliases to CoreBundle --- UPGRADE-1.14.md | 4 ++++ .../Bundle/CoreBundle/Resources/config/services/form.xml | 4 ++++ .../PromotionBundle/Resources/config/services/forms.xml | 2 -- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/UPGRADE-1.14.md b/UPGRADE-1.14.md index d56455fe2b..0114f2372b 100644 --- a/UPGRADE-1.14.md +++ b/UPGRADE-1.14.md @@ -137,6 +137,10 @@ We recommend using the new aliases introduced in Sylius 1.14 to ensure compatibility with Sylius 2.0. +1. The following class definitions will be moved to `CoreBundle` in Sylius 2.0: + - `Sylius\Bundle\PromotionBundle\Form\Type\CatalogPromotionAction\PercentageDiscountActionConfigurationType` + - `Sylius\Bundle\PromotionBundle\Form\Type\CatalogPromotionActionType` + 1. The following form extensions have been deprecated and will be removed in Sylius 2.0: - `Sylius\Bundle\AdminBundle\Form\Extension\CatalogPromotionScopeTypeExtension` - `Sylius\Bundle\AdminBundle\Form\Extension\CatalogPromotionActionTypeExtension` diff --git a/src/Sylius/Bundle/CoreBundle/Resources/config/services/form.xml b/src/Sylius/Bundle/CoreBundle/Resources/config/services/form.xml index 6d30383539..df8cd7bafd 100644 --- a/src/Sylius/Bundle/CoreBundle/Resources/config/services/form.xml +++ b/src/Sylius/Bundle/CoreBundle/Resources/config/services/form.xml @@ -165,6 +165,8 @@ + + @@ -298,6 +300,8 @@ + + %sylius.model.catalog_promotion_scope.class% %sylius.form.type.catalog_promotion.validation_groups% diff --git a/src/Sylius/Bundle/PromotionBundle/Resources/config/services/forms.xml b/src/Sylius/Bundle/PromotionBundle/Resources/config/services/forms.xml index 8f213775ba..ca8d84eb4e 100644 --- a/src/Sylius/Bundle/PromotionBundle/Resources/config/services/forms.xml +++ b/src/Sylius/Bundle/PromotionBundle/Resources/config/services/forms.xml @@ -66,7 +66,6 @@ - %sylius.model.catalog_promotion_action.class% @@ -74,7 +73,6 @@ - %sylius.model.catalog_promotion_translation.class%