kenaug74/Sylius
1
0
Fork 0
mirror of https://github.com/Sylius/Sylius.git synced 2026-07-14 17:10:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

[OrderBundle] Unification of service names

Browse source
This commit is contained in:
Wojdylak 2024-10-04 14:46:56 +02:00
parent 8dfedae34c
commit acd58d0be1
No known key found for this signature in database
GPG key ID: 7509E560A6821ABE
15 changed files with 53 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Sylius/Behat/Resources/config/services/contexts/domain.xml
View file

@ -66,7 +66,7 @@
<service id="sylius.behat.context.domain.cart" class="Sylius\Behat\Context\Domain\CartContext">
<argument type="service" id="sylius.manager.order" />
<argument type="service" id="sylius.expired_carts_remover" />
<argument type="service" id="sylius.remover.expired_carts" />
</service>
<service id="sylius.behat.context.domain.managing_shipping_methods" class="Sylius\Behat\Context\Domain\ManagingShippingMethodsContext">

2
src/Sylius/Behat/Resources/config/services/contexts/setup.xml
View file

@ -117,7 +117,7 @@
<argument type="service" id="sylius.repository.payment_method" />
<argument type="service" id="sylius.repository.shipping_method" />
<argument type="service" id="Sylius\Component\Product\Resolver\ProductVariantResolverInterface" />
<argument type="service" id="sylius.order_item_quantity_modifier" />
<argument type="service" id="sylius.modifier.order_item_quantity" />
<argument type="service" id="doctrine.orm.entity_manager" />
<argument type="service" id="Sylius\Calendar\Provider\DateTimeProviderInterface" />
<argument type="service" id="Sylius\Resource\Generator\RandomnessGeneratorInterface" />

8
src/Sylius/Bundle/ApiBundle/Resources/config/services/command_handlers.xml
View file

@ -44,16 +44,16 @@
<service id="Sylius\Bundle\ApiBundle\CommandHandler\Cart\AddItemToCartHandler">
<argument type="service" id="sylius.repository.order" />
<argument type="service" id="sylius.repository.product_variant" />
<argument type="service" id="sylius.order_modifier" />
<argument type="service" id="sylius.modifier.order" />
<argument type="service" id="sylius.factory.order_item" />
<argument type="service" id="sylius.order_item_quantity_modifier" />
<argument type="service" id="sylius.modifier.order_item_quantity" />
<tag name="messenger.message_handler" bus="sylius.command_bus" />
<tag name="messenger.message_handler" bus="sylius_default.bus" />
</service>
<service id="Sylius\Bundle\ApiBundle\CommandHandler\Cart\RemoveItemFromCartHandler">
<argument type="service" id="sylius.repository.order_item" />
<argument type="service" id="sylius.order_modifier" />
<argument type="service" id="sylius.modifier.order" />
<tag name="messenger.message_handler" bus="sylius.command_bus" />
<tag name="messenger.message_handler" bus="sylius_default.bus" />
</service>
@ -120,7 +120,7 @@
<service id="Sylius\Bundle\ApiBundle\CommandHandler\Cart\ChangeItemQuantityInCartHandler">
<argument type="service" id="sylius.repository.order_item" />
<argument type="service" id="sylius.order_item_quantity_modifier" />
<argument type="service" id="sylius.modifier.order_item_quantity" />
<argument type="service" id="sylius.order_processing.order_processor" />
<tag name="messenger.message_handler" bus="sylius.command_bus" />
<tag name="messenger.message_handler" bus="sylius_default.bus" />

2
src/Sylius/Bundle/CoreBundle/Resources/config/app/state_machine/sylius_order.yml
View file

@ -23,7 +23,7 @@ winzou_state_machine:
before:
sylius_assign_number:
on: ["create"]
do: ["@sylius.order_number_assigner", "assignNumber"]
do: ["@sylius.number_assigner.order_number", "assignNumber"]
args: ["object"]
priority: -200
sylius_assign_token:

3
src/Sylius/Bundle/CoreBundle/Resources/config/services.xml
View file

@ -171,7 +171,7 @@
</service>
<service id="Sylius\Component\Core\Customer\OrderAddressesSaverInterface" alias="sylius.customer_order_addresses_saver" />
<service id="sylius.order_item_quantity_modifier.limiting" class="Sylius\Component\Core\Cart\Modifier\LimitingOrderItemQuantityModifier" decorates="sylius.order_item_quantity_modifier" decoration-priority="256">
<service id="sylius.order_item_quantity_modifier.limiting" class="Sylius\Component\Core\Cart\Modifier\LimitingOrderItemQuantityModifier" decorates="sylius.modifier.order_item_quantity" decoration-priority="256">
<argument type="service" id="sylius.order_item_quantity_modifier.limiting.inner" />
<argument>%sylius.order_item_quantity_modifier.limit%</argument>
</service>
@ -237,6 +237,7 @@
<argument type="service" id="sylius.factory.order_sequence" />
<argument type="service" id="sylius.manager.order_sequence" />
</service>
<service id="sylius.number_generator.sequential_order" alias="sylius.sequential_order_number_generator" />
<service id="sylius.custom_resource_controller.resource_update_handler" class="Sylius\Bundle\CoreBundle\Doctrine\ORM\Handler\ResourceUpdateHandler" decorates="sylius.resource_controller.resource_update_handler" public="false">
<argument type="service" id="sylius.custom_resource_controller.resource_update_handler.inner" />

2
src/Sylius/Bundle/CoreBundle/Resources/config/services/fixtures.xml
View file

@ -190,7 +190,7 @@
<service id="sylius.fixture.order" class="Sylius\Bundle\CoreBundle\Fixture\OrderFixture">
<argument type="service" id="sylius.factory.order" />
<argument type="service" id="sylius.factory.order_item" />
<argument type="service" id="sylius.order_item_quantity_modifier" />
<argument type="service" id="sylius.modifier.order_item_quantity" />
<argument type="service" id="sylius.manager.order" />
<argument type="service" id="sylius.repository.channel" />
<argument type="service" id="sylius.repository.customer" />

2
src/Sylius/Bundle/CoreBundle/Resources/config/services/fixtures_factories.xml
View file

@ -169,7 +169,7 @@
<service id="sylius.fixture.example_factory.order" class="Sylius\Bundle\CoreBundle\Fixture\Factory\OrderExampleFactory">
<argument type="service" id="sylius.factory.order" />
<argument type="service" id="sylius.factory.order_item" />
<argument type="service" id="sylius.order_item_quantity_modifier" />
<argument type="service" id="sylius.modifier.order_item_quantity" />
<argument type="service" id="sylius.manager.order" />
<argument type="service" id="sylius.repository.channel" />
<argument type="service" id="sylius.repository.customer" />

2
src/Sylius/Bundle/OrderBundle/Console/Command/RemoveExpiredCartsCommand.php
View file

@ -66,7 +66,7 @@ class RemoveExpiredCartsCommand extends ContainerAwareCommand
ExpiredCartsRemoverInterface::class,
self::class,
);
$this->getContainer()->get('sylius.expired_carts_remover')->remove();
$this->getContainer()->get('sylius.remover.expired_carts')->remove();
} else {
$this->expiredCartsRemover->remove();
}

4
src/Sylius/Bundle/OrderBundle/Controller/OrderItemController.php
View file

@ -204,12 +204,12 @@ class OrderItemController extends ResourceController
protected function getQuantityModifier(): OrderItemQuantityModifierInterface
{
return $this->get('sylius.order_item_quantity_modifier');
return $this->get('sylius.modifier.order_item_quantity');
}
protected function getOrderModifier(): OrderModifierInterface
{
return $this->get('sylius.order_modifier');
return $this->get('sylius.modifier.order');
}
protected function getCartManager(): EntityManagerInterface

2
src/Sylius/Bundle/OrderBundle/Resources/config/app/state_machine.yml
View file

@ -26,5 +26,5 @@ winzou_state_machine:
before:
sylius_assign_number:
on: "create"
do: ["@sylius.order_number_assigner", "assignNumber"]
do: ["@sylius.number_assigner.order_number", "assignNumber"]
args: ["object"]

20
src/Sylius/Bundle/OrderBundle/Resources/config/services.xml
View file

@ -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"/>
<import resource="services/templating.xml"/>
@ -22,13 +26,13 @@
<defaults public="true" />
<service id="Sylius\Bundle\OrderBundle\Console\Command\RemoveExpiredCartsCommand">
<argument type="service" id="sylius.expired_carts_remover" />
<argument type="service" id="sylius.remover.expired_carts" />
<argument>%sylius_order.cart_expiration_period%</argument>
<tag name="console.command" />
</service>
<service id="Sylius\Bundle\OrderBundle\Command\RemoveExpiredCartsCommand" alias="Sylius\Bundle\OrderBundle\Console\Command\RemoveExpiredCartsCommand" />
<service id="sylius.console.command.remove_expired_carts" alias="Sylius\Bundle\OrderBundle\Console\Command\RemoveExpiredCartsCommand" />
<service id="sylius.context.cart.new" class="Sylius\Component\Order\Context\CartContext">
<argument type="service" id="sylius.factory.order" />
@ -40,27 +44,32 @@
<service id="sylius.order_modifier" class="Sylius\Component\Order\Modifier\OrderModifier">
<argument type="service" id="sylius.order_processing.order_processor" />
<argument type="service" id="sylius.order_item_quantity_modifier" />
<argument type="service" id="sylius.modifier.order_item_quantity" />
</service>
<service id="Sylius\Component\Order\Modifier\OrderModifierInterface" alias="sylius.order_modifier" />
<service id="sylius.modifier.order" alias="sylius.order_modifier" />
<service id="sylius.order_item_quantity_modifier" class="Sylius\Component\Order\Modifier\OrderItemQuantityModifier">
<argument type="service" id="sylius.factory.order_item_unit" />
</service>
<service id="Sylius\Component\Order\Modifier\OrderItemQuantityModifierInterface" alias="sylius.order_item_quantity_modifier" />
<service id="sylius.modifier.order_item_quantity" alias="sylius.order_item_quantity_modifier" />
<service id="sylius.sequential_order_number_generator" class="Sylius\Bundle\OrderBundle\NumberGenerator\SequentialOrderNumberGenerator">
<argument type="service" id="sylius.repository.order_sequence" />
<argument type="service" id="sylius.factory.order_sequence" />
</service>
<service id="sylius.number_generator.sequential_order" alias="sylius.sequential_order_number_generator" />
<service id="sylius.order_number_assigner" class="Sylius\Bundle\OrderBundle\NumberAssigner\OrderNumberAssigner">
<argument type="service" id="sylius.sequential_order_number_generator" />
<argument type="service" id="sylius.number_generator.sequential_order" />
</service>
<service id="Sylius\Bundle\OrderBundle\NumberAssigner\OrderNumberAssignerInterface" alias="sylius.order_number_assigner" />
<service id="sylius.number_assigner.order_number" alias="sylius.order_number_assigner" />
<service id="sylius.adjustments_aggregator" class="Sylius\Component\Order\Aggregator\AdjustmentsByLabelAggregator" />
<service id="Sylius\Component\Order\Aggregator\AdjustmentsAggregatorInterface" alias="sylius.adjustments_aggregator" />
<service id="sylius.aggregator.adjustments_by_label" alias="sylius.adjustments_aggregator" />
<service id="sylius.custom_factory.adjustment" class="Sylius\Component\Order\Factory\AdjustmentFactory" decorates="sylius.factory.adjustment" decoration-priority="256" public="false">
<argument type="service" id="sylius.custom_factory.adjustment.inner" />
@ -74,6 +83,7 @@
<argument>%sylius_order.cart_expiration_period%</argument>
</service>
<service id="Sylius\Component\Order\Remover\ExpiredCartsRemoverInterface" alias="sylius.expired_carts_remover" />
<service id="sylius.remover.expired_carts" alias="sylius.expired_carts_remover" />
<service id="sylius.factory.add_to_cart_command" class="Sylius\Bundle\OrderBundle\Factory\AddToCartCommandFactory" />
</services>

8
src/Sylius/Bundle/OrderBundle/Resources/config/services/form.xml
View file

@ -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.order.validation_groups" type="collection">
<parameter>sylius</parameter>
@ -31,7 +35,7 @@
<defaults public="true" />
<service id="sylius.form.data_mapper.order_item_quantity" class="Sylius\Bundle\OrderBundle\Form\DataMapper\OrderItemQuantityDataMapper">
<argument type="service" id="sylius.order_item_quantity_modifier" />
<argument type="service" id="sylius.modifier.order_item_quantity" />
<argument type="service">
<service class="\Symfony\Component\Form\Extension\Core\DataMapper\DataMapper" />
</argument>

6
src/Sylius/Bundle/OrderBundle/Resources/config/services/integrations/doctrine/orm.xml
View file

@ -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.order.class">Sylius\Bundle\OrderBundle\Doctrine\ORM\OrderRepository</parameter>
<parameter key="sylius.repository.order_item.class">Sylius\Bundle\OrderBundle\Doctrine\ORM\OrderItemRepository</parameter>

8
src/Sylius/Bundle/OrderBundle/Resources/config/services/templating.xml
View file

@ -11,12 +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>
<defaults public="true" />
<service id="sylius.templating.helper.adjustment" class="Sylius\Bundle\OrderBundle\Templating\Helper\AdjustmentsHelper">
<argument type="service" id="sylius.adjustments_aggregator" />
<argument type="service" id="sylius.aggregator.adjustments_by_label" />
<tag name="templating.helper" alias="sylius_adjustments" />
<deprecated package="sylius/order-bundle" version="1.14">The "%service_id%" is deprecated since Sylius 1.14 and will be removed in 2.0.</deprecated>
</service>

8
src/Sylius/Bundle/OrderBundle/Resources/config/services/twig.xml
View file

@ -11,12 +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>
<defaults public="true" />
<service id="sylius.twig.extension.aggregate_adjustments" class="Sylius\Bundle\OrderBundle\Twig\AggregateAdjustmentsExtension" public="false">
<argument type="service" id="sylius.adjustments_aggregator" />
<argument type="service" id="sylius.aggregator.adjustments_by_label" />
<tag name="twig.extension" />
</service>
</services>