[UPMERGE] 2.0 -> payment-request (#17183)

This PR has been generated automatically. For more details see [upmerge_pr.yaml](/Sylius/Sylius/blob/1.13/.github/workflows/upmerge_pr.yaml). **Remember!** The upmerge should always be merged with using `Merge pull request` button. In case of conflicts, please resolve them manually with usign the following commands: ``` git fetch upstream gh pr checkout <this-pr-number> git merge upstream/payment-request -m "Resolve conflicts between 2.0 and payment-request" ``` If you use other name for the upstream remote, please replace `upstream` with the name of your remote pointing to the `Sylius/Sylius` repository. Once the conflicts are resolved, please run `git merge --continue` and push the changes to this PR.
2026-07-14 09:02:12 +00:00 · 2024-10-11 09:03:13 +02:00 · 2024-10-11 09:03:13 +02:00 · 58f1cffea0
commit 58f1cffea0
parent fd2b99e775 3b1aa8d8e3
33 changed files with 155 additions and 81 deletions
--- a/.gitattributes
+++ b/.gitattributes
@ -28,7 +28,7 @@ ecs.php                         export-ignore
 gulpfile.babel.js               export-ignore
 Makefile                        export-ignore
 monorepo-builder.php            export-ignore
-package.json                    export-ignore
+/package.json                   export-ignore
 phparkitect.php                 export-ignore
 phpspec.yml.dist                export-ignore
 phpstan.neon.dist               export-ignore
--- a/features/shop/checkout/shipping_order/preventing_shipping_step_completion_without_a_selected_method.feature
+++ b/features/shop/checkout/shipping_order/preventing_shipping_step_completion_without_a_selected_method.feature
@ -56,35 +56,6 @@ Feature: Prevent shipping step completion without a selected shipping method
        Then I should be informed that my order cannot be shipped to this address
        And I should not be able to complete the shipping step

-    @api @no-ui
-    Scenario: Preventing shipping step completion if there are no available shipping methods for selected country
-        Given the store operates on a channel named "Web"
-        And the store has a product "PHP T-Shirt" priced at "$19.99"
-        And the store operates in "United States"
-        And the store operates in "France"
-        And the store has a zone "Europe" with code "EU"
-        And this zone has the "France" country member
-        And the store has "DHL" shipping method with "$20.00" fee within the "EU" zone
-        And I have product "PHP T-Shirt" in the cart
-        And I specified the billing address as "Ankh Morpork", "Frost Alley", "90210", "United States" for "Jon Snow"
-        When I try to complete the shipping step
-        Then I should see that this shipping method is not available for this address
-
-    @no-api @ui @javascript
-    Scenario: Preventing shipping step completion if there are no available shipping methods for selected country
-        Given the store operates on a channel named "Web"
-        And the store has a product "PHP T-Shirt" priced at "$19.99"
-        And the store operates in "United States"
-        And the store operates in "France"
-        And the store has a zone "Europe" with code "EU"
-        And this zone has the "France" country member
-        And the store has "DHL" shipping method with "$20.00" fee within the "EU" zone
-        And I have product "PHP T-Shirt" in the cart
-        And I specified the billing address as "Ankh Morpork", "Frost Alley", "90210", "United States" for "Jon Snow"
-        When I want to complete the shipping step
-        Then I should be informed that my order cannot be shipped to this address
-        And I should not be able to complete the shipping step
-
    @api @no-ui
    Scenario: Preventing shipping step completion if there are no available shipping methods for selected country
        Given the store operates on a channel named "Web"
--- a/src/Sylius/Bundle/ApiBundle/Resources/config/services/command_handlers.xml
+++ b/src/Sylius/Bundle/ApiBundle/Resources/config/services/command_handlers.xml
@ -71,7 +71,7 @@
            <argument type="service" id="sylius.repository.order" />
            <argument type="service" id="sylius.repository.shipping_method" />
            <argument type="service" id="sylius.repository.shipment" />
-            <argument type="service" id="sylius.shipping_method_eligibility_checker" />
+            <argument type="service" id="sylius.eligibility_checker.shipping_method" />
            <argument type="service" id="sylius_abstraction.state_machine" />
            <tag name="messenger.message_handler" bus="sylius.command_bus" />
        </service>
--- a/src/Sylius/Bundle/ApiBundle/Resources/config/services/validator.xml
+++ b/src/Sylius/Bundle/ApiBundle/Resources/config/services/validator.xml
@ -52,7 +52,7 @@
            class="Sylius\Bundle\ApiBundle\Validator\Constraints\OrderShippingMethodEligibilityValidator"
        >
            <argument type="service" id="sylius.repository.order" />
-            <argument type="service" id="sylius.shipping_method_eligibility_checker" />
+            <argument type="service" id="sylius.eligibility_checker.shipping_method" />
            <tag name="validator.constraint_validator" alias="sylius_api_validator_order_shipping_method_eligibility" />
        </service>

@ -71,7 +71,7 @@
        >
            <argument type="service" id="sylius.repository.shipment" />
            <argument type="service" id="sylius.repository.shipping_method" />
-            <argument type="service" id="sylius.shipping_methods_resolver" />
+            <argument type="service" id="sylius.resolver.shipping_methods" />
            <tag name="validator.constraint_validator" alias="sylius_api_validator_chosen_shipping_method_eligibility" />
        </service>

--- a/src/Sylius/Bundle/CoreBundle/Resources/config/services.xml
+++ b/src/Sylius/Bundle/CoreBundle/Resources/config/services.xml
@ -69,7 +69,7 @@
        <service id="sylius.shipping_methods_resolver.zones_and_channel_based" class="Sylius\Component\Core\Resolver\ZoneAndChannelBasedShippingMethodsResolver">
            <argument type="service" id="sylius.repository.shipping_method" />
            <argument type="service" id="sylius.matcher.zone" />
-            <argument type="service" id="sylius.shipping_method_eligibility_checker" />
+            <argument type="service" id="sylius.eligibility_checker.shipping_method" />
            <tag name="sylius.shipping_method_resolver" type="zones_and_channel_based" label="sylius.shipping_methods_resolver.zones_and_channel_based" priority="1" />
        </service>

@ -85,7 +85,7 @@

        <service id="sylius.shipping_method_resolver.default" class="Sylius\Component\Core\Resolver\EligibleDefaultShippingMethodResolver">
            <argument type="service" id="sylius.repository.shipping_method" />
-            <argument type="service" id="sylius.shipping_method_eligibility_checker" />
+            <argument type="service" id="sylius.eligibility_checker.shipping_method" />
            <argument type="service" id="sylius.matcher.zone" />
        </service>
        <service id="Sylius\Component\Shipping\Resolver\DefaultShippingMethodResolverInterface" alias="sylius.shipping_method_resolver.default" />
@ -184,7 +184,7 @@
        <service id="sylius.reviewer_reviews_remover" class="Sylius\Bundle\CoreBundle\Remover\ReviewerReviewsRemover">
            <argument type="service" id="sylius.repository.product_review" />
            <argument type="service" id="sylius.manager.product_review" />
-            <argument type="service" id="sylius.product_review.average_rating_updater" />
+            <argument type="service" id="sylius.updater.product_review.average_rating" />
        </service>
        <service id="Sylius\Bundle\CoreBundle\Remover\ReviewerReviewsRemoverInterface" alias="sylius.reviewer_reviews_remover" />

--- a/src/Sylius/Bundle/CoreBundle/Resources/config/services/checkers.xml
+++ b/src/Sylius/Bundle/CoreBundle/Resources/config/services/checkers.xml
@ -16,7 +16,7 @@
        <defaults public="true" />

        <service id="sylius.checker.order_shipping_method_selection_requirement" class="Sylius\Component\Core\Checker\OrderShippingMethodSelectionRequirementChecker">
-            <argument type="service" id="sylius.shipping_methods_resolver" />
+            <argument type="service" id="sylius.resolver.shipping_methods" />
        </service>
        <service id="Sylius\Component\Core\Checker\OrderShippingMethodSelectionRequirementCheckerInterface" alias="sylius.checker.order_shipping_method_selection_requirement" />

--- a/src/Sylius/Bundle/CoreBundle/Resources/config/services/form.xml
+++ b/src/Sylius/Bundle/CoreBundle/Resources/config/services/form.xml
@ -102,7 +102,7 @@
            <tag name="form.type_extension" priority="100" />
        </service>
        <service id="sylius.form.extension.type.shipping_method" class="Sylius\Bundle\CoreBundle\Form\Extension\ShippingMethodTypeExtension">
-            <argument type="service" id="Sylius\Bundle\ShippingBundle\Validator\GroupsGenerator\ShippingMethodConfigurationGroupsGenerator" />
+            <argument type="service" id="sylius.validator.groups_generator.shipping_method_configuration" />
            <tag name="form.type_extension" priority="100" />
        </service>
        <service id="sylius.form.extension.type.product" class="Sylius\Bundle\CoreBundle\Form\Extension\ProductTypeExtension">
--- a/src/Sylius/Bundle/CoreBundle/Resources/config/services/listeners/workflow/shipment.xml
+++ b/src/Sylius/Bundle/CoreBundle/Resources/config/services/listeners/workflow/shipment.xml
@ -24,7 +24,7 @@
        </service>

        <service id="Sylius\Bundle\CoreBundle\EventListener\Workflow\Shipment\AssignShippingDateListener">
-            <argument type="service" id="sylius.shipping_date_assigner" />
+            <argument type="service" id="sylius.assigner.shipping_date" />
            <tag name="kernel.event_listener"
                 event="workflow.sylius_shipment.transition.ship"
                 priority="100"
--- a/src/Sylius/Bundle/CoreBundle/Resources/config/services/order_processing.xml
+++ b/src/Sylius/Bundle/CoreBundle/Resources/config/services/order_processing.xml
@ -43,9 +43,9 @@
        </service>

        <service id="sylius.order_processing.order_shipment_processor" class="Sylius\Component\Core\OrderProcessing\OrderShipmentProcessor">
-            <argument type="service" id="sylius.shipping_method_resolver.default" />
+            <argument type="service" id="sylius.resolver.shipping_method.default" />
            <argument type="service" id="sylius.factory.shipment" />
-            <argument type="service" id="sylius.shipping_methods_resolver" />
+            <argument type="service" id="sylius.resolver.shipping_methods" />
            <tag name="sylius.order_processor" priority="40"/>
        </service>

--- a/src/Sylius/Bundle/CoreBundle/Resources/config/services/taxation.xml
+++ b/src/Sylius/Bundle/CoreBundle/Resources/config/services/taxation.xml
@ -26,7 +26,7 @@
        <service id="sylius.taxation.order_shipment_taxes_applicator" class="Sylius\Component\Core\Taxation\Applicator\OrderShipmentTaxesApplicator">
            <argument type="service" id="sylius.tax_calculator" />
            <argument type="service" id="sylius.factory.adjustment" />
-            <argument type="service" id="sylius.tax_rate_resolver" />
+            <argument type="service" id="sylius.resolver.tax_rate" />
            <tag name="sylius.taxation.items.applicator" />
            <tag name="sylius.taxation.item_units.applicator" />
        </service>
@ -34,14 +34,14 @@
            <argument type="service" id="sylius.tax_calculator" />
            <argument type="service" id="sylius.factory.adjustment" />
            <argument type="service" id="sylius.integer_distributor" />
-            <argument type="service" id="sylius.tax_rate_resolver" />
+            <argument type="service" id="sylius.resolver.tax_rate" />
            <argument type="service" id="sylius.proportional_integer_distributor" />
            <tag name="sylius.taxation.items.applicator" />
        </service>
        <service id="sylius.taxation.order_item_units_taxes_applicator" class="Sylius\Component\Core\Taxation\Applicator\OrderItemUnitsTaxesApplicator">
            <argument type="service" id="sylius.tax_calculator" />
            <argument type="service" id="sylius.factory.adjustment" />
-            <argument type="service" id="sylius.tax_rate_resolver" />
+            <argument type="service" id="sylius.resolver.tax_rate" />
            <argument type="service" id="sylius.proportional_integer_distributor" />
            <tag name="sylius.taxation.item_units.applicator" />
        </service>
--- a/src/Sylius/Bundle/CoreBundle/Resources/config/services/validators.xml
+++ b/src/Sylius/Bundle/CoreBundle/Resources/config/services/validators.xml
@ -58,7 +58,7 @@
        </service>

        <service id="sylius.validator.shipping_method_integrity" class="Sylius\Bundle\CoreBundle\Validator\Constraints\OrderShippingMethodEligibilityValidator">
-            <argument type="service" id="sylius.shipping_method_eligibility_checker" />
+            <argument type="service" id="sylius.eligibility_checker.shipping_method" />
            <tag name="validator.constraint_validator" alias="sylius_order_shipping_method_eligibility_validator" />
        </service>
        <service id="sylius.validator.payment_method_integrity" class="Sylius\Bundle\CoreBundle\Validator\Constraints\OrderPaymentMethodEligibilityValidator">
--- a/src/Sylius/Bundle/InventoryBundle/Resources/config/services.xml
+++ b/src/Sylius/Bundle/InventoryBundle/Resources/config/services.xml
@ -16,7 +16,7 @@
        <defaults public="true" />

        <service id="sylius.availability_checker" class="Sylius\Component\Inventory\Checker\AvailabilityChecker" />
-        <service id="Sylius\Component\Inventory\Checker\AvailabilityCheckerInterface" class="Sylius\Component\Inventory\Checker\AvailabilityChecker" />
+        <service id="Sylius\Component\Inventory\Checker\AvailabilityCheckerInterface" alias="sylius.availability_checker" />

        <service id="sylius.validator.in_stock" class="Sylius\Bundle\InventoryBundle\Validator\Constraints\InStockValidator">
            <argument type="service" id="sylius.availability_checker" />
--- a/src/Sylius/Bundle/PromotionBundle/Resources/config/services/forms.xml
+++ b/src/Sylius/Bundle/PromotionBundle/Resources/config/services/forms.xml
@ -60,6 +60,14 @@
            <tag name="form.type" />
        </service>

+        <service id="Sylius\Bundle\PromotionBundle\Form\Type\CatalogPromotionActionType">
+            <argument>%sylius.model.catalog_promotion_action.class%</argument>
+            <argument>%sylius.form.type.catalog_promotion.validation_groups%</argument>
+            <argument type="tagged_iterator" tag="sylius.catalog_promotion.action_configuration_type" index-by="key" />
+            <tag name="form.type" />
+        </service>
+        <service id="sylius.form.type.catalog_promotion_action" alias="Sylius\Bundle\PromotionBundle\Form\Type\CatalogPromotionActionType" />
+
        <service id="sylius.form.type.catalog_promotion_translation" class="Sylius\Bundle\PromotionBundle\Form\Type\CatalogPromotionTranslationType">
            <argument>%sylius.model.catalog_promotion_translation.class%</argument>
            <argument>%sylius.form.type.catalog_promotion_translation.validation_groups%</argument>
@ -133,6 +141,5 @@
            <argument>%sylius.form.type.promotion_coupon_generator_instruction.validation_groups%</argument>
            <tag name="form.type" />
        </service>
-
    </services>
 </container>
--- a/src/Sylius/Bundle/ReviewBundle/DependencyInjection/SyliusReviewExtension.php
+++ b/src/Sylius/Bundle/ReviewBundle/DependencyInjection/SyliusReviewExtension.php
@ -77,13 +77,19 @@ final class SyliusReviewExtension extends AbstractResourceExtension
                ])
            ;

+            $averageRatingUpdaterOldId = sprintf('sylius.%s_review.average_rating_updater', $reviewSubject);
            $container->addDefinitions([
-                sprintf('sylius.%s_review.average_rating_updater', $reviewSubject) => (new Definition(AverageRatingUpdater::class, [
-                    new Reference('sylius.average_rating_calculator'),
+                $averageRatingUpdaterOldId => (new Definition(AverageRatingUpdater::class, [
+                    new Reference('sylius.calculator.average_rating'),
                    new Reference(sprintf('sylius.manager.%s_review', $reviewSubject)),
                ]))->setPublic(true),
                sprintf('sylius.listener.%s_review_change', $reviewSubject) => $reviewChangeListener,
            ]);
+
+            $container->setAlias(
+                sprintf('sylius.updater.%s_review.average_rating', $reviewSubject),
+                $averageRatingUpdaterOldId
+            );
        }
    }
 }
--- a/src/Sylius/Bundle/ReviewBundle/Resources/config/integrations/doctrine/orm.xml
+++ b/src/Sylius/Bundle/ReviewBundle/Resources/config/integrations/doctrine/orm.xml
@ -11,7 +11,11 @@

 -->

-<container xmlns="http://symfony.com/schema/dic/services" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
+<container
+    xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd"
+>
    <services>
        <defaults public="true" />

--- a/src/Sylius/Bundle/ReviewBundle/Resources/config/services.xml
+++ b/src/Sylius/Bundle/ReviewBundle/Resources/config/services.xml
@ -11,10 +11,15 @@

 -->

-<container xmlns="http://symfony.com/schema/dic/services" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
+<container
+    xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd"
+>
    <services>
        <defaults public="true" />

        <service id="sylius.average_rating_calculator" class="Sylius\Component\Review\Calculator\AverageRatingCalculator" />
+        <service id="sylius.calculator.average_rating" alias="sylius.average_rating_calculator" />
    </services>
 </container>
--- a/src/Sylius/Bundle/ShippingBundle/Resources/config/services.xml
+++ b/src/Sylius/Bundle/ShippingBundle/Resources/config/services.xml
@ -11,8 +11,11 @@

 -->

-<container xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://symfony.com/schema/dic/services"
-           xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
+<container
+    xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd"
+>
    <imports>
        <import resource="services/**.xml"/>
    </imports>
@ -34,28 +37,29 @@
                 class="Sylius\Component\Shipping\Resolver\CompositeMethodsResolver">
            <argument type="service" id="sylius.registry.shipping_methods_resolver"/>
        </service>
-        <service id="Sylius\Component\Shipping\Resolver\ShippingMethodsResolverInterface"
-                 alias="sylius.shipping_methods_resolver"/>
+        <service id="sylius.resolver.shipping_methods" alias="sylius.shipping_methods_resolver"/>
+        <service id="sylius.resolver.shipping_methods.composite" alias="sylius.shipping_methods_resolver"/>
+        <service id="Sylius\Component\Shipping\Resolver\ShippingMethodsResolverInterface" alias="sylius.shipping_methods_resolver"/>

        <service id="sylius.shipping_methods_resolver.default"
                 class="Sylius\Component\Shipping\Resolver\ShippingMethodsResolver">
            <argument type="service" id="sylius.repository.shipping_method"/>
-            <argument type="service" id="sylius.shipping_method_eligibility_checker"/>
+            <argument type="service" id="sylius.eligibility_checker.shipping_method"/>
            <tag name="sylius.shipping_method_resolver" type="default" label="Default"/>
        </service>
+        <service id="sylius.resolver.shipping_methods.default" alias="sylius.shipping_methods_resolver.default"/>

        <service id="sylius.shipping_method_resolver.default"
                 class="Sylius\Component\Shipping\Resolver\DefaultShippingMethodResolver">
            <argument type="service" id="sylius.repository.shipping_method"/>
        </service>
-        <service id="Sylius\Component\Shipping\Resolver\DefaultShippingMethodResolverInterface"
-                 alias="sylius.shipping_method_resolver.default"/>
+        <service id="sylius.resolver.shipping_method.default" alias="sylius.shipping_method_resolver.default"/>
+        <service id="Sylius\Component\Shipping\Resolver\DefaultShippingMethodResolverInterface" alias="sylius.shipping_method_resolver.default"/>

        <service id="sylius.shipping_calculator" class="Sylius\Component\Shipping\Calculator\DelegatingCalculator">
            <argument type="service" id="sylius.registry.shipping_calculator"/>
        </service>
-        <service id="Sylius\Component\Shipping\Calculator\DelegatingCalculatorInterface"
-                 alias="sylius.shipping_calculator"/>
+        <service id="Sylius\Component\Shipping\Calculator\DelegatingCalculatorInterface" alias="sylius.shipping_calculator"/>

        <service id="sylius.shipping_calculator.flat_rate"
                 class="Sylius\Component\Shipping\Calculator\FlatRateCalculator">
@ -74,6 +78,7 @@
        <service id="sylius.shipping_date_assigner" class="Sylius\Bundle\ShippingBundle\Assigner\ShippingDateAssigner">
            <argument type="service" id="clock"/>
        </service>
+        <service id="sylius.assigner.shipping_date" alias="sylius.shipping_date_assigner"/>

        <service id="sylius.shipping_method_rule_checker.total_weight_greater_than_or_equal"
                 class="Sylius\Component\Shipping\Checker\Rule\TotalWeightGreaterThanOrEqualRuleChecker">
@ -81,6 +86,8 @@
                 label="sylius.form.shipping_method_rule.total_weight_greater_than_or_equal"
                 form-type="Sylius\Bundle\ShippingBundle\Form\Type\Rule\TotalWeightGreaterThanOrEqualConfigurationType"/>
        </service>
+        <service id="sylius.rule_checker.shipping_method.total_weight_greater_than_or_equal"
+                 alias="sylius.shipping_method_rule_checker.total_weight_greater_than_or_equal"/>

        <service id="sylius.shipping_method_rule_checker.total_weight_less_than_or_equal"
                 class="Sylius\Component\Shipping\Checker\Rule\TotalWeightLessThanOrEqualRuleChecker">
@ -88,5 +95,7 @@
                 label="sylius.form.shipping_method_rule.total_weight_less_than_or_equal"
                 form-type="Sylius\Bundle\ShippingBundle\Form\Type\Rule\TotalWeightLessThanOrEqualConfigurationType"/>
        </service>
+        <service id="sylius.rule_checker.shipping_method.total_weight_less_than_or_equal"
+                 alias="sylius.shipping_method_rule_checker.total_weight_less_than_or_equal"/>
    </services>
 </container>
--- a/src/Sylius/Bundle/ShippingBundle/Resources/config/services/checker.xml
+++ b/src/Sylius/Bundle/ShippingBundle/Resources/config/services/checker.xml
@ -11,8 +11,11 @@

 -->

-<container xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://symfony.com/schema/dic/services"
-           xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
+<container
+    xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd"
+>
    <services>
        <defaults public="true"/>

@ -20,17 +23,21 @@
                 class="Sylius\Component\Shipping\Checker\Eligibility\CategoryRequirementEligibilityChecker">
            <tag name="sylius.shipping_method_eligibility_checker"/>
        </service>
+        <service id="sylius.eligibility_checker.shipping_method.category_requirement" alias="sylius.category_requirement_shipping_method_eligibility_checker"/>

        <service id="sylius.shipping_method_rules_shipping_method_eligibility_checker"
                 class="Sylius\Component\Shipping\Checker\Eligibility\ShippingMethodRulesEligibilityChecker">
            <argument type="service" id="sylius.registry.shipping_method_rule_checker"/>
            <tag name="sylius.shipping_method_eligibility_checker"/>
        </service>
+        <service id="sylius.eligibility_checker.shipping_method.rules" alias="sylius.shipping_method_rules_shipping_method_eligibility_checker"/>

        <service id="sylius.shipping_method_eligibility_checker"
                 class="Sylius\Component\Shipping\Checker\Eligibility\CompositeShippingMethodEligibilityChecker">
            <argument type="collection"/>
        </service>
+        <service id="sylius.eligibility_checker.shipping_method" alias="sylius.shipping_method_eligibility_checker"/>
+        <service id="sylius.eligibility_checker.shipping_method.composite" alias="sylius.shipping_method_eligibility_checker"/>
        <service id="Sylius\Component\Shipping\Checker\Eligibility\ShippingMethodEligibilityCheckerInterface"
                 alias="sylius.shipping_method_eligibility_checker"/>
    </services>
--- a/src/Sylius/Bundle/ShippingBundle/Resources/config/services/form.xml
+++ b/src/Sylius/Bundle/ShippingBundle/Resources/config/services/form.xml
@ -11,7 +11,11 @@

 -->

-<container xmlns="http://symfony.com/schema/dic/services" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
+<container
+    xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd"
+>
    <parameters>
        <parameter key="sylius.form.type.shipping_method.validation_groups" type="collection">
            <parameter>sylius</parameter>
@ -54,7 +58,7 @@
        </service>

        <service id="sylius.form.type.shipping_method_choice" class="Sylius\Bundle\ShippingBundle\Form\Type\ShippingMethodChoiceType">
-            <argument type="service" id="sylius.shipping_methods_resolver" />
+            <argument type="service" id="sylius.resolver.shipping_methods" />
            <argument type="service" id="sylius.registry.shipping_calculator" />
            <argument type="service" id="sylius.repository.shipping_method" />
            <tag name="form.type" />
@ -71,6 +75,7 @@
            <argument type="service" id="sylius.registry.shipping_method_rule_checker" />
            <tag name="form.type" />
        </service>
+        <service id="sylius.form.type.shipping_method_rule_collection" alias="sylius.form.type.shipping_method_rule.collection" />

        <service id="sylius.form.type.shipping_method_rule_choice" class="Sylius\Bundle\ShippingBundle\Form\Type\ShippingMethodRuleChoiceType">
            <argument>%sylius.shipping_method_rules%</argument>
--- a/src/Sylius/Bundle/ShippingBundle/Resources/config/services/integrations/doctrine/orm.xml
+++ b/src/Sylius/Bundle/ShippingBundle/Resources/config/services/integrations/doctrine/orm.xml
@ -11,7 +11,11 @@

 -->

-<container xmlns="http://symfony.com/schema/dic/services" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
+<container
+    xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd"
+>
    <parameters>
        <parameter key="sylius.repository.shipping_method.class">Sylius\Bundle\ShippingBundle\Doctrine\ORM\ShippingMethodRepository</parameter>
    </parameters>
--- a/src/Sylius/Bundle/ShippingBundle/Resources/config/services/registry.xml
+++ b/src/Sylius/Bundle/ShippingBundle/Resources/config/services/registry.xml
@ -11,7 +11,11 @@

 -->

-<container xmlns="http://symfony.com/schema/dic/services" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
+<container
+    xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd"
+>
    <services>
        <defaults public="true" />

--- a/src/Sylius/Bundle/ShippingBundle/Resources/config/services/validator.xml
+++ b/src/Sylius/Bundle/ShippingBundle/Resources/config/services/validator.xml
@ -11,24 +11,29 @@

 -->

-<container xmlns="http://symfony.com/schema/dic/services"
-           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-           xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd"
+<container
+    xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd"
 >
    <services>
        <service id="Sylius\Bundle\ShippingBundle\Validator\ShippingMethodCalculatorExistsValidator" public="true" >
            <argument>%sylius.shipping_calculators%</argument>
            <tag name="validator.constraint_validator" alias="sylius_shipping_method_calculator_exists" />
        </service>
+        <service id="sylius.validator.shipping_method_calculator_exists" alias="Sylius\Bundle\ShippingBundle\Validator\ShippingMethodCalculatorExistsValidator" />

        <service id="Sylius\Bundle\ShippingBundle\Validator\ShippingMethodRuleValidator" public="true">
            <argument>%sylius.shipping_method_rules%</argument>
            <argument>%sylius.shipping.shipping_method_rule.validation_groups%</argument>
            <tag name="validator.constraint_validator" alias="sylius_shipping_method_rule" />
        </service>
+        <service id="sylius.validator.shipping_method_rule" alias="Sylius\Bundle\ShippingBundle\Validator\ShippingMethodRuleValidator" />

        <service id="Sylius\Bundle\ShippingBundle\Validator\GroupsGenerator\ShippingMethodConfigurationGroupsGenerator" public="true">
            <argument>%sylius.shipping.shipping_method_calculator.validation_groups%</argument>
        </service>
+        <service id="sylius.validator.groups_generator.shipping_method_configuration"
+                 alias="Sylius\Bundle\ShippingBundle\Validator\GroupsGenerator\ShippingMethodConfigurationGroupsGenerator" />
    </services>
 </container>
--- a/src/Sylius/Bundle/ShopBundle/templates/checkout/select_payment/form/navigation.html.twig
+++ b/src/Sylius/Bundle/ShopBundle/templates/checkout/select_payment/form/navigation.html.twig
@ -3,6 +3,10 @@
 {% set order = hookable_metadata.context.order %}
 {% set enabled = order.payments|length %}

+{% for payment in hookable_metadata.context.form.payments %}
+    {% set enabled = enabled and payment.method|length %}
+{% endfor %}
+
 {% if sylius_is_shipping_required(order) %}
    {{ navigation.default('sylius.ui.change_shipping_method'|trans, path('sylius_shop_checkout_select_shipping'), enabled) }}
 {% else %}
--- a/src/Sylius/Bundle/TaxationBundle/Resources/config/services.xml
+++ b/src/Sylius/Bundle/TaxationBundle/Resources/config/services.xml
@ -11,7 +11,11 @@

 -->

-<container xmlns="http://symfony.com/schema/dic/services" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
+<container
+    xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd"
+>
    <imports>
        <import resource="services/form.xml" />
    </imports>
@ -42,13 +46,15 @@

        <service id="sylius.tax_rate_resolver" class="Sylius\Component\Taxation\Resolver\TaxRateResolver">
            <argument type="service" id="sylius.repository.tax_rate" />
-            <argument type="service" id="sylius.tax_rate_date_eligibility_checker" on-invalid="null" />
+            <argument type="service" id="sylius.eligibility_checker.tax_rate_date" on-invalid="null" />
        </service>
+        <service id="sylius.resolver.tax_rate" alias="sylius.tax_rate_resolver" />
        <service id="Sylius\Component\Taxation\Resolver\TaxRateResolverInterface" alias="sylius.tax_rate_resolver" />

        <service id="sylius.tax_rate_date_eligibility_checker" class="Sylius\Component\Taxation\Checker\TaxRateDateEligibilityChecker">
            <argument type="service" id="clock" />
        </service>
+        <service id="sylius.eligibility_checker.tax_rate_date" alias="sylius.tax_rate_date_eligibility_checker" />
        <service id="Sylius\Component\Taxation\Checker\TaxRateDateEligibilityCheckerInterface" alias="sylius.tax_rate_date_eligibility_checker" />
    </services>
 </container>
--- a/src/Sylius/Bundle/TaxationBundle/Resources/config/services/form.xml
+++ b/src/Sylius/Bundle/TaxationBundle/Resources/config/services/form.xml
@ -11,7 +11,11 @@

 -->

-<container xmlns="http://symfony.com/schema/dic/services" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
+<container
+    xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd"
+>
    <parameters>
        <parameter key="sylius.form.type.tax_category.validation_groups" type="collection">
            <parameter>sylius</parameter>
--- a/src/Sylius/Bundle/TaxationBundle/Resources/config/services/integrations/doctrine/orm.xml
+++ b/src/Sylius/Bundle/TaxationBundle/Resources/config/services/integrations/doctrine/orm.xml
@ -11,7 +11,11 @@

 -->

-<container xmlns="http://symfony.com/schema/dic/services" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
+<container
+    xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd"
+>
    <parameters>
        <parameter key="sylius.repository.tax_category.class">Sylius\Bundle\TaxationBundle\Doctrine\ORM\TaxCategoryRepository</parameter>
    </parameters>
--- a/src/Sylius/Bundle/TaxonomyBundle/Resources/config/services/form.xml
+++ b/src/Sylius/Bundle/TaxonomyBundle/Resources/config/services/form.xml
@ -11,7 +11,11 @@

 -->

-<container xmlns="http://symfony.com/schema/dic/services" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
+<container
+    xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd"
+>
    <parameters>
        <parameter key="sylius.form.type.taxon.validation_groups" type="collection">
            <parameter>sylius</parameter>
--- a/src/Sylius/Bundle/TaxonomyBundle/Resources/config/services/integrations/doctrine/mongodb-odm.xml
+++ b/src/Sylius/Bundle/TaxonomyBundle/Resources/config/services/integrations/doctrine/mongodb-odm.xml
@ -11,13 +11,18 @@

 -->

-<container xmlns="http://symfony.com/schema/dic/services" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
+<container
+    xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd"
+>
    <services>
        <defaults public="true" />

        <service id="sylius.doctrine.odm.mongodb.unitOfWork" class="Doctrine\ODM\MongoDB\UnitOfWork" public="false">
            <factory service="doctrine.odm.mongodb.document_manager" method="getUnitOfWork" />
        </service>
+        <service id="sylius.doctrine.odm.mongodb.unit_of_work" alias="sylius.doctrine.odm.mongodb.unitOfWork" />

        <service id="sylius.manager.taxon" alias="doctrine.odm.mongodb.document_manager" />
        <service id="sylius.doctrine.odm.mongodb.metadata.taxon" class="Doctrine\ODM\MongoDB\Mapping\ClassMetadata" public="false">
@ -27,7 +32,7 @@

        <service id="sylius.repository.taxon" class="Sylius\Bundle\ResourceBundle\Doctrine\ODM\MongoDB\DocumentRepository">
            <argument type="service" id="sylius.manager.taxon" />
-            <argument type="service" id="sylius.doctrine.odm.mongodb.unitOfWork" />
+            <argument type="service" id="sylius.doctrine.odm.mongodb.unit_of_work" />
            <argument type="service" id="sylius.doctrine.odm.mongodb.metadata.taxon" />
        </service>
    </services>
--- a/src/Sylius/Bundle/TaxonomyBundle/Resources/config/services/integrations/doctrine/orm.xml
+++ b/src/Sylius/Bundle/TaxonomyBundle/Resources/config/services/integrations/doctrine/orm.xml
@ -11,7 +11,11 @@

 -->

-<container xmlns="http://symfony.com/schema/dic/services" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
+<container
+    xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd"
+>
    <parameters>
        <parameter key="sylius.repository.taxon.class">Sylius\Bundle\TaxonomyBundle\Doctrine\ORM\TaxonRepository</parameter>
    </parameters>
--- a/src/Sylius/Bundle/TaxonomyBundle/Resources/config/services/tree_repository.xml
+++ b/src/Sylius/Bundle/TaxonomyBundle/Resources/config/services/tree_repository.xml
@ -11,11 +11,16 @@

 -->

-<container xmlns="http://symfony.com/schema/dic/services" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
+<container
+    xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd"
+>
    <services>
        <service id="Sylius\Bundle\TaxonomyBundle\Repository\TaxonTreeRepositoryInterface" class="Sylius\Bundle\TaxonomyBundle\Repository\TaxonTreeRepository" decorates="sylius.repository.tree.taxon">
            <argument type="service" id="Sylius\Bundle\TaxonomyBundle\Repository\TaxonTreeRepositoryInterface.inner" />
        </service>
+        <service id="sylius.custom_repository.tree.taxon" alias="Sylius\Bundle\TaxonomyBundle\Repository\TaxonTreeRepositoryInterface" />

        <service id="sylius.repository.tree.taxon" class="Gedmo\Tree\Entity\Repository\NestedTreeRepository">
            <argument type="service" id="doctrine.orm.entity_manager" />
--- a/src/Sylius/Bundle/UiBundle/Tests/DependencyInjection/ConfigurationTest.php
+++ b/src/Sylius/Bundle/UiBundle/Tests/DependencyInjection/ConfigurationTest.php
@ -350,7 +350,7 @@ final class ConfigurationTest extends TestCase
    {
        $this->assertProcessedConfigurationEquals(
            [
-                ['twig_ux' => ['component_default_template' => 'components/my_default_component.html.twig'],],
+                ['twig_ux' => ['component_default_template' => 'components/my_default_component.html.twig']],
            ],
            ['twig_ux' => ['component_default_template' => 'components/my_default_component.html.twig']],
            'twig_ux.component_default_template',
--- a/src/Sylius/Bundle/UserBundle/Resources/config/services.xml
+++ b/src/Sylius/Bundle/UserBundle/Resources/config/services.xml
@ -11,7 +11,11 @@

 -->

-<container xmlns="http://symfony.com/schema/dic/services" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
+<container
+    xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd"
+>
    <parameters>
        <parameter key="sylius.form.type.user_request_password_reset.validation_groups" type="collection">
            <parameter>sylius</parameter>
@ -32,12 +36,14 @@
            <argument>%sylius.user.users%</argument>
            <tag name="console.command" />
        </service>
+        <service id="sylius.console.command.demote_user" alias="Sylius\Bundle\UserBundle\Console\Command\DemoteUserCommand" />

        <service id="Sylius\Bundle\UserBundle\Console\Command\PromoteUserCommand">
            <argument type="service" id="doctrine" />
            <argument>%sylius.user.users%</argument>
            <tag name="console.command" />
        </service>
+        <service id="sylius.console.command.promote_user" alias="Sylius\Bundle\UserBundle\Console\Command\PromoteUserCommand" />

        <service id="sylius.authentication.success_handler" class="Sylius\Bundle\UserBundle\Authentication\AuthenticationSuccessHandler" parent="security.authentication.success_handler" public="false" />

@ -57,6 +63,7 @@
        <service id="sylius.security.password_hasher" class="Sylius\Bundle\UserBundle\Security\UserPasswordHasher">
            <argument type="service" id="security.password_hasher_factory" />
        </service>
+        <service id="Sylius\Component\User\Security\UserPasswordHasherInterface" alias="sylius.security.password_hasher" />

        <service id="sylius.security.password_updater" class="Sylius\Component\User\Security\PasswordUpdater">
            <argument type="service" id="sylius.security.password_hasher" />
--- a/src/Sylius/Bundle/UserBundle/Resources/config/services/integrations/doctrine/orm.xml
+++ b/src/Sylius/Bundle/UserBundle/Resources/config/services/integrations/doctrine/orm.xml
@ -11,7 +11,11 @@

 -->

-<container xmlns="http://symfony.com/schema/dic/services" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
+<container
+    xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd"
+>
    <parameters>
        <parameter key="sylius.repository.user.class">Sylius\Bundle\UserBundle\Doctrine\ORM\UserRepository</parameter>
    </parameters>