From 5859e2b2397607161a69bb7be88df04daac79f80 Mon Sep 17 00:00:00 2001
From: Grzegorz Sadowski <sadowskigp@gmail.com>
Date: Mon, 31 May 2021 14:57:41 +0200
Subject: [PATCH] Use interfaces instead of FQCN as services ids + minor files
 refactor

---
 src/Resources/config/services.xml             | 109 ++++--------------
 src/Resources/config/services/actions.xml     |  14 +--
 src/Resources/config/services/checkers.xml    |  40 +++++++
 src/Resources/config/services/command_bus.xml |   6 +-
 .../{converter.xml => converters.xml}         |   0
 src/Resources/config/services/creators.xml    |  26 +++++
 src/Resources/config/services/event_bus.xml   |   8 +-
 src/Resources/config/services/factories.xml   |  34 ++++++
 src/Resources/config/services/factory.xml     |  25 ----
 src/Resources/config/services/generator.xml   |  33 ------
 src/Resources/config/services/generators.xml  |  48 ++++++++
 src/Resources/config/services/listeners.xml   |  34 ++++++
 src/Resources/config/services/provider.xml    |  56 ---------
 src/Resources/config/services/providers.xml   |  69 +++++++++++
 .../config/services/state_resolvers.xml       |  37 ++++++
 src/Resources/config/services/validator.xml   |  16 ---
 src/Resources/config/services/validators.xml  |  25 ++++
 tests/Application/config/services_test.yaml   |   4 +-
 tests/Behat/Resources/services.xml            |   2 +-
 19 files changed, 353 insertions(+), 233 deletions(-)
 create mode 100644 src/Resources/config/services/checkers.xml
 rename src/Resources/config/services/{converter.xml => converters.xml} (100%)
 create mode 100644 src/Resources/config/services/creators.xml
 create mode 100644 src/Resources/config/services/factories.xml
 delete mode 100644 src/Resources/config/services/factory.xml
 delete mode 100644 src/Resources/config/services/generator.xml
 create mode 100644 src/Resources/config/services/generators.xml
 create mode 100644 src/Resources/config/services/listeners.xml
 delete mode 100644 src/Resources/config/services/provider.xml
 create mode 100644 src/Resources/config/services/providers.xml
 create mode 100644 src/Resources/config/services/state_resolvers.xml
 delete mode 100644 src/Resources/config/services/validator.xml
 create mode 100644 src/Resources/config/services/validators.xml

diff --git a/src/Resources/config/services.xml b/src/Resources/config/services.xml
index 272f6832..1bb3e6e7 100644
--- a/src/Resources/config/services.xml
+++ b/src/Resources/config/services.xml
@@ -1,122 +1,59 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<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/actions.xml" />
-        <import resource="services/command_bus.xml" />
-        <import resource="services/converter.xml" />
-        <import resource="services/event_bus.xml" />
-        <import resource="services/factory.xml" />
-        <import resource="services/generator.xml" />
-        <import resource="services/provider.xml" />
-        <import resource="services/validator.xml" />
+        <import resource="services/**/*.xml" />
     </imports>
+
     <services>
         <defaults autowire="false" autoconfigure="false" public="true" />
 
-        <service id="Sylius\RefundPlugin\Creator\RefundCreator">
-            <argument type="service" id="sylius_refund.factory.refund" />
-            <argument type="service" id="Sylius\RefundPlugin\Provider\RemainingTotalProvider" />
-            <argument type="service" id="sylius_refund.manager.refund" />
-        </service>
-        <service id="Sylius\RefundPlugin\Creator\RefundUnitsCommandCreator">
-            <argument type="service" id="Sylius\RefundPlugin\Calculator\UnitRefundTotalCalculator" />
+        <service id="Sylius\RefundPlugin\Calculator\UnitRefundTotalCalculatorInterface" class="Sylius\RefundPlugin\Calculator\UnitRefundTotalCalculator">
+            <argument type="service" id="Sylius\RefundPlugin\Provider\RemainingTotalProviderInterface" />
         </service>
-
-        <service id="Sylius\RefundPlugin\Calculator\UnitRefundTotalCalculator">
-            <argument type="service" id="Sylius\RefundPlugin\Provider\RemainingTotalProvider" />
+        <service id="Sylius\RefundPlugin\Calculator\UnitRefundTotalCalculator" alias="Sylius\RefundPlugin\Calculator\UnitRefundTotalCalculatorInterface">
+            <deprecated>The "%alias_id%" service alias is deprecated and will be removed in RefundPlugin 1.0, use Sylius\RefundPlugin\Calculator\UnitRefundTotalCalculatorInterface instead.</deprecated>
         </service>
 
         <service id="Sylius\RefundPlugin\Refunder\OrderItemUnitsRefunder">
-            <argument type="service" id="Sylius\RefundPlugin\Creator\RefundCreator" />
+            <argument type="service" id="Sylius\RefundPlugin\Creator\RefundCreatorInterface" />
             <argument type="service" id="sylius.event_bus" />
         </service>
+
         <service id="Sylius\RefundPlugin\Refunder\OrderShipmentsRefunder">
-            <argument type="service" id="Sylius\RefundPlugin\Creator\RefundCreator" />
+            <argument type="service" id="Sylius\RefundPlugin\Creator\RefundCreatorInterface" />
             <argument type="service" id="sylius.event_bus" />
         </service>
 
-        <service id="Sylius\RefundPlugin\Checker\OrderRefundingAvailabilityChecker">
-            <argument type="service" id="sylius.repository.order" />
-        </service>
-        <service id="Sylius\RefundPlugin\Checker\OrderRefundsListAvailabilityChecker">
-            <argument type="service" id="sylius.repository.order" />
-        </service>
-
-        <service id="Sylius\RefundPlugin\Checker\UnitRefundingAvailabilityChecker">
-            <argument type="service" id="Sylius\RefundPlugin\Provider\RemainingTotalProvider" />
-        </service>
-
         <service id="Sylius\RefundPlugin\Twig\OrderRefundsExtension">
-            <argument type="service" id="Sylius\RefundPlugin\Provider\OrderRefundedTotalProvider" />
-            <argument type="service" id="Sylius\RefundPlugin\Provider\UnitRefundedTotalProvider" />
-            <argument type="service" id="Sylius\RefundPlugin\Checker\UnitRefundingAvailabilityChecker" />
+            <argument type="service" id="Sylius\RefundPlugin\Provider\OrderRefundedTotalProviderInterface" />
+            <argument type="service" id="Sylius\RefundPlugin\Provider\UnitRefundedTotalProviderInterface" />
+            <argument type="service" id="Sylius\RefundPlugin\Checker\UnitRefundingAvailabilityCheckerInterface" />
             <tag name="twig.extension"/>
         </service>
 
-        <service id="Sylius\RefundPlugin\Menu\OrderShowMenuListener">
-            <argument type="service" id="Sylius\RefundPlugin\Checker\OrderRefundsListAvailabilityChecker" />
-            <tag name="kernel.event_listener" event="sylius.menu.admin.order.show" method="addRefundsButton" />
-        </service>
-        <service id="Sylius\RefundPlugin\Menu\AdminMainMenuListener">
-            <tag name="kernel.event_listener" event="sylius.menu.admin.main" method="addCreditMemosSection" />
-        </service>
-
-        <service id="Sylius\RefundPlugin\StateResolver\OrderFullyRefundedStateResolver">
-            <argument type="service" id="sm.factory" />
-            <argument type="service" id="sylius.manager.order" />
-            <argument type="service" id="Sylius\RefundPlugin\Checker\OrderFullyRefundedTotalChecker" />
-            <argument type="service" id="sylius.repository.order" />
-        </service>
-
-        <service id="Sylius\RefundPlugin\StateResolver\OrderPartiallyRefundedStateResolver">
-            <argument type="service" id="sylius.repository.order" />
-            <argument type="service" id="sm.factory" />
-            <argument type="service" id="sylius.manager.order" />
-        </service>
-
-        <service id="Sylius\RefundPlugin\Checker\OrderFullyRefundedTotalChecker">
-            <argument type="service" id="Sylius\RefundPlugin\Provider\OrderRefundedTotalProvider" />
-        </service>
-
-        <service id="sylius_refund_plugin.block_event_listener.order_show.credit_memos" class="Sylius\Bundle\UiBundle\Block\BlockEventListener">
-            <argument>@SyliusRefundPlugin/Order/Admin/creditMemos.html.twig</argument>
-            <tag name="kernel.event_listener" event="sonata.block.event.sylius.admin.order.show.after_summary" method="onBlockEvent" />
-        </service>
-
-        <service id="sylius_refund_plugin.block_event_listener.order_show.refund_payments" class="Sylius\Bundle\UiBundle\Block\BlockEventListener">
-            <argument>@SyliusRefundPlugin/Order/Admin/refundPayments.html.twig</argument>
-            <tag name="kernel.event_listener" event="sonata.block.event.sylius.admin.order.show.after_summary" method="onBlockEvent" />
-        </service>
-
         <service id="sylius_refund_plugin.repository.credit_memo_sequence" class="Doctrine\ORM\EntityRepository">
             <factory service="doctrine.orm.entity_manager" method="getRepository"/>
             <argument type="string">Sylius\RefundPlugin\Entity\CreditMemoSequence</argument>
         </service>
 
-        <service id="Sylius\RefundPlugin\Sender\CreditMemoEmailSender">
-            <argument type="service" id="Sylius\RefundPlugin\Generator\CreditMemoPdfFileGenerator" />
+        <service id="Sylius\RefundPlugin\Sender\CreditMemoEmailSenderInterface" class="Sylius\RefundPlugin\Sender\CreditMemoEmailSender">
+            <argument type="service" id="Sylius\RefundPlugin\Generator\CreditMemoPdfFileGeneratorInterface" />
             <argument type="service" id="sylius.email_sender" />
             <argument type="service" id="Sylius\RefundPlugin\File\TemporaryFileManager" />
         </service>
-
-        <service id="sylius_refund_plugin.block_event_listener.account.order_show" class="Sylius\Bundle\UiBundle\Block\BlockEventListener">
-            <argument>@SyliusRefundPlugin/Order/Shop/creditMemos.html.twig</argument>
-            <tag name="kernel.event_listener" event="sonata.block.event.sylius.shop.account.order.show.after_summary" method="onBlockEvent" />
+        <service id="Sylius\RefundPlugin\Sender\CreditMemoEmailSender" alias="Sylius\RefundPlugin\Sender\CreditMemoEmailSenderInterface">
+            <deprecated>The "%alias_id%" service alias is deprecated and will be removed in RefundPlugin 1.0, use Sylius\RefundPlugin\Sender\CreditMemoEmailSenderInterface instead.</deprecated>
         </service>
 
         <service id="Sylius\RefundPlugin\File\TemporaryFileManager" />
 
-        <service id="Sylius\RefundPlugin\StateResolver\RefundPaymentCompletedStateApplier">
-            <argument type="service" id="sm.factory" />
-            <argument type="service" id="sylius_refund.manager.refund_payment" />
-        </service>
-
-        <service id="Sylius\RefundPlugin\ResponseBuilder\CreditMemoFileResponseBuilder" />
-
-        <service id="Sylius\RefundPlugin\Checker\CreditMemoCustomerRelationChecker">
-            <argument type="service" id="sylius.context.customer"/>
-            <argument type="service" id="sylius_refund.repository.credit_memo"/>
+        <service id="Sylius\RefundPlugin\ResponseBuilder\CreditMemoFileResponseBuilderInterface" class="Sylius\RefundPlugin\ResponseBuilder\CreditMemoFileResponseBuilder" />
+        <service id="Sylius\RefundPlugin\ResponseBuilder\CreditMemoFileResponseBuilder" alias="Sylius\RefundPlugin\ResponseBuilder\CreditMemoFileResponseBuilderInterface">
+            <deprecated>The "%alias_id%" service alias is deprecated and will be removed in RefundPlugin 1.0, use Sylius\RefundPlugin\ResponseBuilder\CreditMemoFileResponseBuilderInterface instead.</deprecated>
         </service>
     </services>
 </container>
diff --git a/src/Resources/config/services/actions.xml b/src/Resources/config/services/actions.xml
index 14129b69..0d09bd26 100644
--- a/src/Resources/config/services/actions.xml
+++ b/src/Resources/config/services/actions.xml
@@ -5,14 +5,14 @@
         <defaults autowire="false" autoconfigure="false" public="true" />
 
         <service id="Sylius\RefundPlugin\Action\Admin\DownloadCreditMemoAction">
-            <argument type="service" id="Sylius\RefundPlugin\Generator\CreditMemoPdfFileGenerator" />
-            <argument type="service" id="Sylius\RefundPlugin\ResponseBuilder\CreditMemoFileResponseBuilder"/>
+            <argument type="service" id="Sylius\RefundPlugin\Generator\CreditMemoPdfFileGeneratorInterface" />
+            <argument type="service" id="Sylius\RefundPlugin\ResponseBuilder\CreditMemoFileResponseBuilderInterface" />
         </service>
 
         <service id="Sylius\RefundPlugin\Action\Shop\DownloadCreditMemoAction">
-            <argument type="service" id="Sylius\RefundPlugin\Generator\CreditMemoPdfFileGenerator" />
-            <argument type="service" id="Sylius\RefundPlugin\Checker\CreditMemoCustomerRelationChecker"/>
-            <argument type="service" id="Sylius\RefundPlugin\ResponseBuilder\CreditMemoFileResponseBuilder"/>
+            <argument type="service" id="Sylius\RefundPlugin\Generator\CreditMemoPdfFileGeneratorInterface" />
+            <argument type="service" id="Sylius\RefundPlugin\Checker\CreditMemoCustomerRelationCheckerInterface" />
+            <argument type="service" id="Sylius\RefundPlugin\ResponseBuilder\CreditMemoFileResponseBuilderInterface" />
         </service>
 
         <service id="Sylius\RefundPlugin\Action\Admin\OrderRefundsListAction">
@@ -28,7 +28,7 @@
             <argument type="service" id="sylius.command_bus" />
             <argument type="service" id="session" />
             <argument type="service" id="router" />
-            <argument type="service" id="Sylius\RefundPlugin\Creator\RefundUnitsCommandCreator" />
+            <argument type="service" id="Sylius\RefundPlugin\Creator\RefundUnitsCommandCreatorInterface" />
             <argument type="service" id="monolog.logger" />
         </service>
 
@@ -36,7 +36,7 @@
             <argument type="service" id="session" />
             <argument type="service" id="sylius_refund.repository.refund_payment" />
             <argument type="service" id="sylius.repository.order" />
-            <argument type="service" id="Sylius\RefundPlugin\StateResolver\RefundPaymentCompletedStateApplier" />
+            <argument type="service" id="Sylius\RefundPlugin\StateResolver\RefundPaymentCompletedStateApplierInterface" />
             <argument type="service" id="router" />
         </service>
 
diff --git a/src/Resources/config/services/checkers.xml b/src/Resources/config/services/checkers.xml
new file mode 100644
index 00000000..cedf4f62
--- /dev/null
+++ b/src/Resources/config/services/checkers.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<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 autowire="false" autoconfigure="false" public="true" />
+
+        <service id="Sylius\RefundPlugin\Checker\CreditMemoCustomerRelationCheckerInterface" class="Sylius\RefundPlugin\Checker\CreditMemoCustomerRelationChecker">
+            <argument type="service" id="sylius.context.customer"/>
+            <argument type="service" id="sylius_refund.repository.credit_memo"/>
+        </service>
+        <service id="Sylius\RefundPlugin\Checker\CreditMemoCustomerRelationChecker" alias="Sylius\RefundPlugin\Checker\CreditMemoCustomerRelationCheckerInterface">
+            <deprecated>The "%alias_id%" service alias is deprecated and will be removed in RefundPlugin 1.0, use Sylius\RefundPlugin\Checker\CreditMemoCustomerRelationCheckerInterface instead.</deprecated>
+        </service>
+
+        <service id="Sylius\RefundPlugin\Checker\OrderRefundingAvailabilityChecker">
+            <argument type="service" id="sylius.repository.order" />
+        </service>
+
+        <service id="Sylius\RefundPlugin\Checker\OrderRefundsListAvailabilityChecker">
+            <argument type="service" id="sylius.repository.order" />
+        </service>
+
+        <service id="Sylius\RefundPlugin\Checker\OrderFullyRefundedTotalCheckerInterface" class="Sylius\RefundPlugin\Checker\OrderFullyRefundedTotalChecker">
+            <argument type="service" id="Sylius\RefundPlugin\Provider\OrderRefundedTotalProviderInterface" />
+        </service>
+        <service id="Sylius\RefundPlugin\Checker\OrderFullyRefundedTotalChecker" alias="Sylius\RefundPlugin\Checker\OrderFullyRefundedTotalCheckerInterface">
+            <deprecated>The "%alias_id%" service alias is deprecated and will be removed in RefundPlugin 1.0, use Sylius\RefundPlugin\Checker\OrderFullyRefundedTotalCheckerInterface instead.</deprecated>
+        </service>
+
+        <service id="Sylius\RefundPlugin\Checker\UnitRefundingAvailabilityCheckerInterface" class="Sylius\RefundPlugin\Checker\UnitRefundingAvailabilityChecker">
+            <argument type="service" id="Sylius\RefundPlugin\Provider\RemainingTotalProviderInterface" />
+        </service>
+        <service id="Sylius\RefundPlugin\Checker\UnitRefundingAvailabilityChecker" alias="Sylius\RefundPlugin\Checker\UnitRefundingAvailabilityCheckerInterface">
+            <deprecated>The "%alias_id%" service alias is deprecated and will be removed in RefundPlugin 1.0, use Sylius\RefundPlugin\Checker\UnitRefundingAvailabilityCheckerInterface instead.</deprecated>
+        </service>
+    </services>
+</container>
diff --git a/src/Resources/config/services/command_bus.xml b/src/Resources/config/services/command_bus.xml
index b1f53156..6a57d1c5 100644
--- a/src/Resources/config/services/command_bus.xml
+++ b/src/Resources/config/services/command_bus.xml
@@ -9,12 +9,12 @@
             <argument type="service" id="Sylius\RefundPlugin\Refunder\OrderShipmentsRefunder" />
             <argument type="service" id="sylius.event_bus" />
             <argument type="service" id="sylius.repository.order" />
-            <argument type="service" id="Sylius\RefundPlugin\Validator\RefundUnitsCommandValidator" />
+            <argument type="service" id="Sylius\RefundPlugin\Validator\RefundUnitsCommandValidatorInterface" />
             <tag name="messenger.message_handler" bus="sylius.command_bus" />
         </service>
 
         <service id="Sylius\RefundPlugin\CommandHandler\GenerateCreditMemoHandler">
-            <argument type="service" id="Sylius\RefundPlugin\Generator\CreditMemoGenerator" />
+            <argument type="service" id="Sylius\RefundPlugin\Generator\CreditMemoGeneratorInterface" />
             <argument type="service" id="sylius_refund.manager.credit_memo" />
             <argument type="service" id="sylius.event_bus" />
             <argument type="service" id="sylius.repository.order" />
@@ -23,7 +23,7 @@
 
         <service id="Sylius\RefundPlugin\CommandHandler\SendCreditMemoHandler" >
             <argument type="service" id="sylius_refund.repository.credit_memo"/>
-            <argument type="service" id="Sylius\RefundPlugin\Sender\CreditMemoEmailSender"/>
+            <argument type="service" id="Sylius\RefundPlugin\Sender\CreditMemoEmailSenderInterface" />
             <tag name="messenger.message_handler" bus="sylius.command_bus" />
         </service>
     </services>
diff --git a/src/Resources/config/services/converter.xml b/src/Resources/config/services/converters.xml
similarity index 100%
rename from src/Resources/config/services/converter.xml
rename to src/Resources/config/services/converters.xml
diff --git a/src/Resources/config/services/creators.xml b/src/Resources/config/services/creators.xml
new file mode 100644
index 00000000..e6f298a5
--- /dev/null
+++ b/src/Resources/config/services/creators.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<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 autowire="false" autoconfigure="false" public="true" />
+
+        <service id="Sylius\RefundPlugin\Creator\RefundCreatorInterface" class="Sylius\RefundPlugin\Creator\RefundCreator">
+            <argument type="service" id="sylius_refund.factory.refund" />
+            <argument type="service" id="Sylius\RefundPlugin\Provider\RemainingTotalProviderInterface" />
+            <argument type="service" id="sylius_refund.manager.refund" />
+        </service>
+        <service id="Sylius\RefundPlugin\Creator\RefundCreator" alias="Sylius\RefundPlugin\Creator\RefundCreatorInterface">
+            <deprecated>The "%alias_id%" service alias is deprecated and will be removed in RefundPlugin 1.0, use Sylius\RefundPlugin\Creator\RefundCreatorInterface instead.</deprecated>
+        </service>
+
+        <service id="Sylius\RefundPlugin\Creator\RefundUnitsCommandCreatorInterface" class="Sylius\RefundPlugin\Creator\RefundUnitsCommandCreator">
+            <argument type="service" id="Sylius\RefundPlugin\Calculator\UnitRefundTotalCalculatorInterface" />
+        </service>
+        <service id="Sylius\RefundPlugin\Creator\RefundUnitsCommandCreator" alias="Sylius\RefundPlugin\Creator\RefundUnitsCommandCreatorInterface">
+            <deprecated>The "%alias_id%" service alias is deprecated and will be removed in RefundPlugin 1.0, use Sylius\RefundPlugin\Creator\RefundUnitsCommandCreatorInterface instead.</deprecated>
+        </service>
+    </services>
+</container>
diff --git a/src/Resources/config/services/event_bus.xml b/src/Resources/config/services/event_bus.xml
index 2eff99da..ec1eb7d4 100644
--- a/src/Resources/config/services/event_bus.xml
+++ b/src/Resources/config/services/event_bus.xml
@@ -10,12 +10,12 @@
         </service>
 
         <service id="Sylius\RefundPlugin\Listener\UnitRefundedEventListener">
-            <argument type="service" id="Sylius\RefundPlugin\StateResolver\OrderPartiallyRefundedStateResolver" />
+            <argument type="service" id="Sylius\RefundPlugin\StateResolver\OrderPartiallyRefundedStateResolverInterface" />
             <tag name="messenger.message_handler" bus="sylius.event_bus" />
         </service>
 
         <service id="Sylius\RefundPlugin\Listener\ShipmentRefundedEventListener">
-            <argument type="service" id="Sylius\RefundPlugin\StateResolver\OrderPartiallyRefundedStateResolver" />
+            <argument type="service" id="Sylius\RefundPlugin\StateResolver\OrderPartiallyRefundedStateResolverInterface" />
             <tag name="messenger.message_handler" bus="sylius.event_bus" />
         </service>
 
@@ -28,9 +28,9 @@
         </service>
 
         <service id="Sylius\RefundPlugin\ProcessManager\RefundPaymentProcessManager">
-            <argument type="service" id="Sylius\RefundPlugin\StateResolver\OrderFullyRefundedStateResolver" />
+            <argument type="service" id="Sylius\RefundPlugin\StateResolver\OrderFullyRefundedStateResolverInterface" />
             <argument type="service" id="Sylius\RefundPlugin\Provider\RelatedPaymentIdProviderInterface" />
-            <argument type="service" id="Sylius\RefundPlugin\Factory\RefundPaymentFactory" />
+            <argument type="service" id="Sylius\RefundPlugin\Factory\RefundPaymentFactoryInterface" />
             <argument type="service" id="doctrine.orm.default_entity_manager" />
             <argument type="service" id="sylius.event_bus" />
             <tag name="sylius_refund.units_refunded.process_step" priority="50" />
diff --git a/src/Resources/config/services/factories.xml b/src/Resources/config/services/factories.xml
new file mode 100644
index 00000000..7040cf21
--- /dev/null
+++ b/src/Resources/config/services/factories.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<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 autowire="false" autoconfigure="false" public="true" />
+
+        <service id="Sylius\RefundPlugin\Factory\CreditMemoSequenceFactoryInterface" class="Sylius\RefundPlugin\Factory\CreditMemoSequenceFactory" />
+        <service id="Sylius\RefundPlugin\Factory\CreditMemoSequenceFactory" alias="Sylius\RefundPlugin\Factory\CreditMemoSequenceFactoryInterface">
+            <deprecated>The "%alias_id%" service alias is deprecated and will be removed in RefundPlugin 1.0, use Sylius\RefundPlugin\Factory\CreditMemoSequenceFactoryInterface instead.</deprecated>
+        </service>
+
+        <service id="Sylius\RefundPlugin\Factory\RefundPaymentFactoryInterface" class="Sylius\RefundPlugin\Factory\RefundPaymentFactory">
+            <argument type="service" id="sylius.repository.payment_method" />
+        </service>
+        <service id="Sylius\RefundPlugin\Factory\RefundPaymentFactory" alias="Sylius\RefundPlugin\Factory\RefundPaymentFactoryInterface">
+            <deprecated>The "%alias_id%" service alias is deprecated and will be removed in RefundPlugin 1.0, use Sylius\RefundPlugin\Factory\RefundPaymentFactoryInterface instead.</deprecated>
+        </service>
+
+        <service
+            id="Sylius\RefundPlugin\Factory\CreditMemoFactory"
+            decorates="sylius_refund.factory.credit_memo"
+            decoration-priority="256"
+            public="false"
+        >
+            <argument type="service" id="Sylius\RefundPlugin\Factory\CreditMemoFactory.inner" />
+            <argument type="service" id="Sylius\RefundPlugin\Generator\CreditMemoIdentifierGeneratorInterface" />
+            <argument type="service" id="Sylius\RefundPlugin\Generator\CreditMemoNumberGeneratorInterface" />
+            <argument type="service" id="Sylius\RefundPlugin\Provider\CurrentDateTimeImmutableProviderInterface" />
+        </service>
+    </services>
+</container>
diff --git a/src/Resources/config/services/factory.xml b/src/Resources/config/services/factory.xml
deleted file mode 100644
index e63121aa..00000000
--- a/src/Resources/config/services/factory.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<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 autowire="false" autoconfigure="false" public="true" />
-
-        <service id="Sylius\RefundPlugin\Factory\CreditMemoSequenceFactory" />
-
-        <service id="Sylius\RefundPlugin\Factory\RefundPaymentFactory">
-            <argument type="service" id="sylius.repository.payment_method" />
-        </service>
-
-        <service
-            id="Sylius\RefundPlugin\Factory\CreditMemoFactory"
-            decorates="sylius_refund.factory.credit_memo"
-            decoration-priority="256"
-            public="false"
-        >
-            <argument type="service" id="Sylius\RefundPlugin\Factory\CreditMemoFactory.inner" />
-            <argument type="service" id="Sylius\RefundPlugin\Generator\UuidCreditMemoIdentifierGenerator" />
-            <argument type="service" id="Sylius\RefundPlugin\Generator\SequentialCreditMemoNumberGenerator" />
-            <argument type="service" id="Sylius\RefundPlugin\Provider\CurrentDateTimeImmutableProviderInterface" />
-        </service>
-    </services>
-</container>
diff --git a/src/Resources/config/services/generator.xml b/src/Resources/config/services/generator.xml
deleted file mode 100644
index 1cd02885..00000000
--- a/src/Resources/config/services/generator.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<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 autowire="false" autoconfigure="false" public="true" />
-
-        <service id="Sylius\RefundPlugin\Generator\SequentialCreditMemoNumberGenerator">
-            <argument type="service" id="sylius_refund_plugin.repository.credit_memo_sequence" />
-            <argument type="service" id="Sylius\RefundPlugin\Factory\CreditMemoSequenceFactory" />
-            <argument type="service" id="doctrine.orm.entity_manager" />
-        </service>
-
-        <service id="Sylius\RefundPlugin\Generator\CreditMemoGenerator">
-            <argument type="service" id="Sylius\RefundPlugin\Converter\OrderItemUnitLineItemsConverter" />
-            <argument type="service" id="Sylius\RefundPlugin\Converter\ShipmentLineItemsConverter" />
-            <argument type="service" id="Sylius\RefundPlugin\Generator\TaxItemsGeneratorInterface" />
-            <argument type="service" id="sylius_refund.factory.credit_memo" />
-        </service>
-
-        <service id="Sylius\RefundPlugin\Generator\CreditMemoPdfFileGenerator">
-            <argument type="service" id="sylius_refund.repository.credit_memo" />
-            <argument type="service" id="twig" />
-            <argument type="service" id="knp_snappy.pdf" />
-            <argument type="service" id="file_locator" />
-            <argument>@SyliusRefundPlugin/Download/creditMemo.html.twig</argument>
-            <argument>@SyliusRefundPlugin/Resources/assets/sylius-logo.png</argument>
-        </service>
-
-        <service id="Sylius\RefundPlugin\Generator\TaxItemsGeneratorInterface" class="Sylius\RefundPlugin\Generator\TaxItemsGenerator" />
-
-        <service id="Sylius\RefundPlugin\Generator\UuidCreditMemoIdentifierGenerator" />
-    </services>
-</container>
diff --git a/src/Resources/config/services/generators.xml b/src/Resources/config/services/generators.xml
new file mode 100644
index 00000000..1a5108bb
--- /dev/null
+++ b/src/Resources/config/services/generators.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<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 autowire="false" autoconfigure="false" public="true" />
+
+        <service id="Sylius\RefundPlugin\Generator\CreditMemoNumberGeneratorInterface" class="Sylius\RefundPlugin\Generator\SequentialCreditMemoNumberGenerator">
+            <argument type="service" id="sylius_refund_plugin.repository.credit_memo_sequence" />
+            <argument type="service" id="Sylius\RefundPlugin\Factory\CreditMemoSequenceFactoryInterface" />
+            <argument type="service" id="doctrine.orm.entity_manager" />
+        </service>
+        <service id="Sylius\RefundPlugin\Generator\SequentialCreditMemoNumberGenerator" alias="Sylius\RefundPlugin\Generator\CreditMemoNumberGeneratorInterface">
+            <deprecated>The "%alias_id%" service alias is deprecated and will be removed in RefundPlugin 1.0, use Sylius\RefundPlugin\Generator\CreditMemoNumberGeneratorInterface instead.</deprecated>
+        </service>
+
+        <service id="Sylius\RefundPlugin\Generator\CreditMemoGeneratorInterface" class="Sylius\RefundPlugin\Generator\CreditMemoGenerator">
+            <argument type="service" id="Sylius\RefundPlugin\Converter\OrderItemUnitLineItemsConverter" />
+            <argument type="service" id="Sylius\RefundPlugin\Converter\ShipmentLineItemsConverter" />
+            <argument type="service" id="Sylius\RefundPlugin\Generator\TaxItemsGeneratorInterface" />
+            <argument type="service" id="sylius_refund.factory.credit_memo" />
+        </service>
+        <service id="Sylius\RefundPlugin\Generator\CreditMemoGenerator" alias="Sylius\RefundPlugin\Generator\CreditMemoGeneratorInterface">
+            <deprecated>The "%alias_id%" service alias is deprecated and will be removed in RefundPlugin 1.0, use Sylius\RefundPlugin\Generator\CreditMemoGeneratorInterface instead.</deprecated>
+        </service>
+
+        <service id="Sylius\RefundPlugin\Generator\CreditMemoPdfFileGeneratorInterface" class="Sylius\RefundPlugin\Generator\CreditMemoPdfFileGenerator">
+            <argument type="service" id="sylius_refund.repository.credit_memo" />
+            <argument type="service" id="twig" />
+            <argument type="service" id="knp_snappy.pdf" />
+            <argument type="service" id="file_locator" />
+            <argument>@SyliusRefundPlugin/Download/creditMemo.html.twig</argument>
+            <argument>@SyliusRefundPlugin/Resources/assets/sylius-logo.png</argument>
+        </service>
+        <service id="Sylius\RefundPlugin\Generator\CreditMemoPdfFileGenerator" alias="Sylius\RefundPlugin\Generator\CreditMemoPdfFileGeneratorInterface">
+            <deprecated>The "%alias_id%" service alias is deprecated and will be removed in RefundPlugin 1.0, use Sylius\RefundPlugin\Generator\CreditMemoPdfFileGeneratorInterface instead.</deprecated>
+        </service>
+
+        <service id="Sylius\RefundPlugin\Generator\TaxItemsGeneratorInterface" class="Sylius\RefundPlugin\Generator\TaxItemsGenerator" />
+
+        <service id="Sylius\RefundPlugin\Generator\CreditMemoIdentifierGeneratorInterface" class="Sylius\RefundPlugin\Generator\UuidCreditMemoIdentifierGenerator" />
+        <service id="Sylius\RefundPlugin\Generator\UuidCreditMemoIdentifierGenerator" alias="Sylius\RefundPlugin\Generator\CreditMemoIdentifierGeneratorInterface">
+            <deprecated>The "%alias_id%" service alias is deprecated and will be removed in RefundPlugin 1.0, use Sylius\RefundPlugin\Generator\CreditMemoIdentifierGeneratorInterface instead.</deprecated>
+        </service>
+    </services>
+</container>
diff --git a/src/Resources/config/services/listeners.xml b/src/Resources/config/services/listeners.xml
new file mode 100644
index 00000000..53d92426
--- /dev/null
+++ b/src/Resources/config/services/listeners.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<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 autowire="false" autoconfigure="false" public="true" />
+
+        <service id="Sylius\RefundPlugin\Menu\AdminMainMenuListener">
+            <tag name="kernel.event_listener" event="sylius.menu.admin.main" method="addCreditMemosSection" />
+        </service>
+
+        <service id="Sylius\RefundPlugin\Menu\OrderShowMenuListener">
+            <argument type="service" id="Sylius\RefundPlugin\Checker\OrderRefundsListAvailabilityChecker" />
+            <tag name="kernel.event_listener" event="sylius.menu.admin.order.show" method="addRefundsButton" />
+        </service>
+
+        <service id="sylius_refund_plugin.block_event_listener.account.order_show" class="Sylius\Bundle\UiBundle\Block\BlockEventListener">
+            <argument>@SyliusRefundPlugin/Order/Shop/creditMemos.html.twig</argument>
+            <tag name="kernel.event_listener" event="sonata.block.event.sylius.shop.account.order.show.after_summary" method="onBlockEvent" />
+        </service>
+
+        <service id="sylius_refund_plugin.block_event_listener.order_show.credit_memos" class="Sylius\Bundle\UiBundle\Block\BlockEventListener">
+            <argument>@SyliusRefundPlugin/Order/Admin/creditMemos.html.twig</argument>
+            <tag name="kernel.event_listener" event="sonata.block.event.sylius.admin.order.show.after_summary" method="onBlockEvent" />
+        </service>
+
+        <service id="sylius_refund_plugin.block_event_listener.order_show.refund_payments" class="Sylius\Bundle\UiBundle\Block\BlockEventListener">
+            <argument>@SyliusRefundPlugin/Order/Admin/refundPayments.html.twig</argument>
+            <tag name="kernel.event_listener" event="sonata.block.event.sylius.admin.order.show.after_summary" method="onBlockEvent" />
+        </service>
+    </services>
+</container>
diff --git a/src/Resources/config/services/provider.xml b/src/Resources/config/services/provider.xml
deleted file mode 100644
index 583e16b3..00000000
--- a/src/Resources/config/services/provider.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<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_refund.supported_gateways" type="collection">
-            <parameter>offline</parameter>
-        </parameter>
-    </parameters>
-    <services>
-        <defaults autowire="false" autoconfigure="false" public="true" />
-
-        <service id="Sylius\RefundPlugin\Provider\RefundedShipmentFeeProvider">
-            <argument type="service" id="sylius.repository.adjustment" />
-        </service>
-
-        <service id="Sylius\RefundPlugin\Provider\OrderRefundedTotalProvider">
-            <argument type="service" id="sylius_refund.repository.refund" />
-            <argument type="service" id="sylius.repository.order_item_unit" />
-        </service>
-
-        <service
-            id="Sylius\RefundPlugin\Provider\CurrentDateTimeImmutableProviderInterface"
-            class="Sylius\RefundPlugin\Provider\CurrentDateTimeImmutableProvider"
-        />
-
-        <service id="Sylius\RefundPlugin\Provider\RemainingTotalProvider">
-            <argument type="service" id="sylius.repository.order_item_unit" />
-            <argument type="service" id="sylius.repository.adjustment" />
-            <argument type="service" id="sylius_refund.repository.refund" />
-        </service>
-
-        <service id="Sylius\RefundPlugin\Provider\UnitRefundedTotalProvider">
-            <argument type="service" id="sylius_refund.repository.refund" />
-        </service>
-
-        <service
-            id="Sylius\RefundPlugin\Provider\RelatedPaymentIdProviderInterface"
-            class="Sylius\RefundPlugin\Provider\DefaultRelatedPaymentIdProvider"
-        >
-            <argument type="service" id="sylius.repository.order" />
-        </service>
-
-        <service
-            id="Sylius\RefundPlugin\Provider\RefundPaymentMethodsProviderInterface"
-            class="Sylius\RefundPlugin\Provider\SupportedRefundPaymentMethodsProvider"
-        >
-            <argument type="service" id="sylius.repository.payment_method" />
-            <argument>%sylius_refund.supported_gateways%</argument>
-        </service>
-
-        <service
-            id="Sylius\RefundPlugin\Provider\TaxRateProviderInterface"
-            class="Sylius\RefundPlugin\Provider\TaxRateProvider"
-        />
-    </services>
-</container>
diff --git a/src/Resources/config/services/providers.xml b/src/Resources/config/services/providers.xml
new file mode 100644
index 00000000..bb00f649
--- /dev/null
+++ b/src/Resources/config/services/providers.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<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_refund.supported_gateways" type="collection">
+            <parameter>offline</parameter>
+        </parameter>
+    </parameters>
+
+    <services>
+        <defaults autowire="false" autoconfigure="false" public="true" />
+
+        <service id="Sylius\RefundPlugin\Provider\RefundedShipmentFeeProviderInterface" class="Sylius\RefundPlugin\Provider\RefundedShipmentFeeProvider">
+            <argument type="service" id="sylius.repository.adjustment" />
+        </service>
+        <service id="Sylius\RefundPlugin\Provider\RefundedShipmentFeeProvider" alias="Sylius\RefundPlugin\Provider\RefundedShipmentFeeProviderInterface">
+            <deprecated>The "%alias_id%" service alias is deprecated and will be removed in RefundPlugin 1.0, use Sylius\RefundPlugin\Provider\RefundedShipmentFeeProviderInterface instead.</deprecated>
+        </service>
+
+        <service id="Sylius\RefundPlugin\Provider\OrderRefundedTotalProviderInterface" class="Sylius\RefundPlugin\Provider\OrderRefundedTotalProvider">
+            <argument type="service" id="sylius_refund.repository.refund" />
+            <argument type="service" id="sylius.repository.order_item_unit" />
+        </service>
+        <service id="Sylius\RefundPlugin\Provider\OrderRefundedTotalProvider" alias="Sylius\RefundPlugin\Provider\OrderRefundedTotalProviderInterface">
+            <deprecated>The "%alias_id%" service alias is deprecated and will be removed in RefundPlugin 1.0, use Sylius\RefundPlugin\Provider\OrderRefundedTotalProviderInterface instead.</deprecated>
+        </service>
+
+        <service
+            id="Sylius\RefundPlugin\Provider\CurrentDateTimeImmutableProviderInterface"
+            class="Sylius\RefundPlugin\Provider\CurrentDateTimeImmutableProvider"
+        />
+
+        <service id="Sylius\RefundPlugin\Provider\RemainingTotalProviderInterface" class="Sylius\RefundPlugin\Provider\RemainingTotalProvider">
+            <argument type="service" id="sylius.repository.order_item_unit" />
+            <argument type="service" id="sylius.repository.adjustment" />
+            <argument type="service" id="sylius_refund.repository.refund" />
+        </service>
+        <service id="Sylius\RefundPlugin\Provider\RemainingTotalProvider" alias="Sylius\RefundPlugin\Provider\RemainingTotalProviderInterface">
+            <deprecated>The "%alias_id%" service alias is deprecated and will be removed in RefundPlugin 1.0, use Sylius\RefundPlugin\Provider\RemainingTotalProviderInterface instead.</deprecated>
+        </service>
+
+        <service id="Sylius\RefundPlugin\Provider\UnitRefundedTotalProviderInterface" class="Sylius\RefundPlugin\Provider\UnitRefundedTotalProvider">
+            <argument type="service" id="sylius_refund.repository.refund" />
+        </service>
+        <service id="Sylius\RefundPlugin\Provider\UnitRefundedTotalProvider" alias="Sylius\RefundPlugin\Provider\UnitRefundedTotalProviderInterface">
+            <deprecated>The "%alias_id%" service alias is deprecated and will be removed in RefundPlugin 1.0, use Sylius\RefundPlugin\Provider\UnitRefundedTotalProviderInterface instead.</deprecated>
+        </service>
+
+        <service
+            id="Sylius\RefundPlugin\Provider\RelatedPaymentIdProviderInterface"
+            class="Sylius\RefundPlugin\Provider\DefaultRelatedPaymentIdProvider"
+        >
+            <argument type="service" id="sylius.repository.order" />
+        </service>
+
+        <service
+            id="Sylius\RefundPlugin\Provider\RefundPaymentMethodsProviderInterface"
+            class="Sylius\RefundPlugin\Provider\SupportedRefundPaymentMethodsProvider"
+        >
+            <argument type="service" id="sylius.repository.payment_method" />
+            <argument>%sylius_refund.supported_gateways%</argument>
+        </service>
+
+        <service id="Sylius\RefundPlugin\Provider\TaxRateProviderInterface" class="Sylius\RefundPlugin\Provider\TaxRateProvider"/>
+    </services>
+</container>
diff --git a/src/Resources/config/services/state_resolvers.xml b/src/Resources/config/services/state_resolvers.xml
new file mode 100644
index 00000000..656906c6
--- /dev/null
+++ b/src/Resources/config/services/state_resolvers.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<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 autowire="false" autoconfigure="false" public="true" />
+
+        <service id="Sylius\RefundPlugin\StateResolver\OrderFullyRefundedStateResolverInterface" class="Sylius\RefundPlugin\StateResolver\OrderFullyRefundedStateResolver">
+            <argument type="service" id="sm.factory" />
+            <argument type="service" id="sylius.manager.order" />
+            <argument type="service" id="Sylius\RefundPlugin\Checker\OrderFullyRefundedTotalCheckerInterface" />
+            <argument type="service" id="sylius.repository.order" />
+        </service>
+        <service id="Sylius\RefundPlugin\StateResolver\OrderFullyRefundedStateResolver" alias="Sylius\RefundPlugin\StateResolver\OrderFullyRefundedStateResolverInterface">
+            <deprecated>The "%alias_id%" service alias is deprecated and will be removed in RefundPlugin 1.0, use Sylius\RefundPlugin\StateResolver\OrderFullyRefundedStateResolverInterface instead.</deprecated>
+        </service>
+
+        <service id="Sylius\RefundPlugin\StateResolver\OrderPartiallyRefundedStateResolverInterface" class="Sylius\RefundPlugin\StateResolver\OrderPartiallyRefundedStateResolver">
+            <argument type="service" id="sylius.repository.order" />
+            <argument type="service" id="sm.factory" />
+            <argument type="service" id="sylius.manager.order" />
+        </service>
+        <service id="Sylius\RefundPlugin\StateResolver\OrderPartiallyRefundedStateResolver" alias="Sylius\RefundPlugin\StateResolver\OrderPartiallyRefundedStateResolverInterface">
+            <deprecated>The "%alias_id%" service alias is deprecated and will be removed in RefundPlugin 1.0, use Sylius\RefundPlugin\StateResolver\OrderPartiallyRefundedStateResolverInterface instead.</deprecated>
+        </service>
+
+        <service id="Sylius\RefundPlugin\StateResolver\RefundPaymentCompletedStateApplierInterface" class="Sylius\RefundPlugin\StateResolver\RefundPaymentCompletedStateApplier">
+            <argument type="service" id="sm.factory" />
+            <argument type="service" id="sylius_refund.manager.refund_payment" />
+        </service>
+        <service id="Sylius\RefundPlugin\StateResolver\RefundPaymentCompletedStateApplier" alias="Sylius\RefundPlugin\StateResolver\RefundPaymentCompletedStateApplierInterface">
+            <deprecated>The "%alias_id%" service alias is deprecated and will be removed in RefundPlugin 1.0, use Sylius\RefundPlugin\StateResolver\RefundPaymentCompletedStateApplierInterface instead.</deprecated>
+        </service>
+    </services>
+</container>
diff --git a/src/Resources/config/services/validator.xml b/src/Resources/config/services/validator.xml
deleted file mode 100644
index 17103ed8..00000000
--- a/src/Resources/config/services/validator.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<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 autowire="false" autoconfigure="false" public="true" />
-
-        <service id="Sylius\RefundPlugin\Validator\RefundUnitsCommandValidator">
-            <argument type="service" id="Sylius\RefundPlugin\Checker\OrderRefundingAvailabilityChecker"/>
-            <argument type="service" id="Sylius\RefundPlugin\Validator\RefundAmountValidator" />
-        </service>
-
-        <service id="Sylius\RefundPlugin\Validator\RefundAmountValidator">
-            <argument type="service" id="Sylius\RefundPlugin\Provider\RemainingTotalProvider" />
-        </service>
-    </services>
-</container>
diff --git a/src/Resources/config/services/validators.xml b/src/Resources/config/services/validators.xml
new file mode 100644
index 00000000..59c9703e
--- /dev/null
+++ b/src/Resources/config/services/validators.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<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 autowire="false" autoconfigure="false" public="true" />
+
+        <service id="Sylius\RefundPlugin\Validator\RefundUnitsCommandValidatorInterface" class="Sylius\RefundPlugin\Validator\RefundUnitsCommandValidator">
+            <argument type="service" id="Sylius\RefundPlugin\Checker\OrderRefundingAvailabilityChecker"/>
+            <argument type="service" id="Sylius\RefundPlugin\Validator\RefundAmountValidator" />
+        </service>
+        <service id="Sylius\RefundPlugin\Validator\RefundUnitsCommandValidator" alias="Sylius\RefundPlugin\Validator\RefundUnitsCommandValidatorInterface">
+            <deprecated>The "%alias_id%" service alias is deprecated and will be removed in RefundPlugin 1.0, use Sylius\RefundPlugin\Validator\RefundUnitsCommandValidatorInterface instead.</deprecated>
+        </service>
+
+        <service id="Sylius\RefundPlugin\Validator\RefundAmountValidatorInterface" class="Sylius\RefundPlugin\Validator\RefundAmountValidator">
+            <argument type="service" id="Sylius\RefundPlugin\Provider\RemainingTotalProviderInterface" />
+        </service>
+        <service id="Sylius\RefundPlugin\Validator\RefundAmountValidator" alias="Sylius\RefundPlugin\Validator\RefundAmountValidatorInterface">
+            <deprecated>The "%alias_id%" service alias is deprecated and will be removed in RefundPlugin 1.0, use Sylius\RefundPlugin\Validator\RefundAmountValidatorInterface instead.</deprecated>
+        </service>
+    </services>
+</container>
diff --git a/tests/Application/config/services_test.yaml b/tests/Application/config/services_test.yaml
index ca296442..4117f4f1 100644
--- a/tests/Application/config/services_test.yaml
+++ b/tests/Application/config/services_test.yaml
@@ -4,11 +4,11 @@ imports:
 
 services:
     Tests\Sylius\RefundPlugin\Behat\Services\Generator\FailedCreditMemoGenerator:
-        decorates: 'Sylius\RefundPlugin\Generator\CreditMemoGenerator'
+        decorates: 'Sylius\RefundPlugin\Generator\CreditMemoGeneratorInterface'
         arguments:
             - '@Tests\Sylius\RefundPlugin\Behat\Services\Generator\FailedCreditMemoGenerator.inner'
 
     Tests\Sylius\RefundPlugin\Behat\Services\Factory\FailedRefundPaymentFactory:
-        decorates: 'Sylius\RefundPlugin\Factory\RefundPaymentFactory'
+        decorates: 'Sylius\RefundPlugin\Factory\RefundPaymentFactoryInterface'
         arguments:
             - '@Tests\Sylius\RefundPlugin\Behat\Services\Factory\FailedRefundPaymentFactory.inner'
diff --git a/tests/Behat/Resources/services.xml b/tests/Behat/Resources/services.xml
index f53b3710..af4f3d95 100644
--- a/tests/Behat/Resources/services.xml
+++ b/tests/Behat/Resources/services.xml
@@ -30,7 +30,7 @@
         <service id="Tests\Sylius\RefundPlugin\Behat\Context\Application\RefundingContext">
             <argument type="service" id="sylius.repository.order" />
             <argument type="service" id="sylius_refund.repository.refund" />
-            <argument type="service" id="Sylius\RefundPlugin\Provider\RemainingTotalProvider" />
+            <argument type="service" id="Sylius\RefundPlugin\Provider\RemainingTotalProviderInterface" />
             <argument type="service" id="sylius.command_bus" />
             <argument type="service" id="sylius.behat.email_checker" />
         </service>