refactor #271 Unify service definitions of line items converters (GSa…

…dee) This PR was merged into the 1.0-dev branch. Discussion ---------- Fixes #269 Commits ------- 9761e1d Unify service definitions of line items converters
Sylius · Mar 17, 2021 · 7e2ce6b · 7e2ce6b
2 parents e52b624 + 9761e1d
commit 7e2ce6b
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 9 deletions.
diff --git a/UPGRADE.md b/UPGRADE.md
@@ -9,10 +9,16 @@ from `provide(OrderItemUnitInterface $orderItemUnit): ?string` to `provide(Adjus
 
 1. The `TaxRateProviderInterface $taxRateProvider` has been added as the second argument in constructor of `Sylius\RefundPlugin\Converter\ShipmentLineItemsConverter`
 
+1. Service definition for `Sylius\RefundPlugin\Converter\ShipmentLineItemsConverter` has been changed from 
+`Sylius\RefundPlugin\Converter\ShipmentLineItemsConverterInterface` to `Sylius\RefundPlugin\Converter\ShipmentLineItemsConverter`
+
+1. `Sylius\RefundPlugin\Converter\LineItemsConverter` has been changed to `Sylius\RefundPlugin\Converter\OrderItemUnitLineItemsConverter`
+and its service definition has been changed from `Sylius\RefundPlugin\Converter\LineItemsConverterInterface` to `Sylius\RefundPlugin\Converter\OrderItemUnitLineItemsConverter`
+
 1. The suffix `Exception` has been removed from classes: 
     * `Sylius\RefundPlugin\Exception\InvalidRefundAmountException` 
     * `Sylius\RefundPlugin\Exception\OrderNotAvailableForRefundingException`
-    * `Sylius\RefundPlugin\Exception\UnitAlreadyRefundedException` 
+    * `Sylius\RefundPlugin\Exception\UnitAlreadyRefundedException`
 
 ### UPGRADE FROM 1.0.0-RC.5 TO 1.0.0-RC.6
 

diff --git a/spec/Converter/LineItemsConverterSpec.php → ...r/OrderItemUnitLineItemsConverterSpec.php b/spec/Converter/LineItemsConverterSpec.php → ...r/OrderItemUnitLineItemsConverterSpec.php
@@ -13,7 +13,7 @@
 use Sylius\RefundPlugin\Model\OrderItemUnitRefund;
 use Sylius\RefundPlugin\Provider\TaxRateProviderInterface;
 
-final class LineItemsConverterSpec extends ObjectBehavior
+final class OrderItemUnitLineItemsConverterSpec extends ObjectBehavior
 {
     function let(RepositoryInterface $orderItemUnitRepository, TaxRateProviderInterface $taxRateProvider): void
     {

diff --git a/src/Converter/LineItemsConverter.php → ...erter/OrderItemUnitLineItemsConverter.php b/src/Converter/LineItemsConverter.php → ...erter/OrderItemUnitLineItemsConverter.php
@@ -13,7 +13,7 @@
 use Sylius\RefundPlugin\Provider\TaxRateProviderInterface;
 use Webmozart\Assert\Assert;
 
-final class LineItemsConverter implements LineItemsConverterInterface
+final class OrderItemUnitLineItemsConverter implements LineItemsConverterInterface
 {
     /** @var RepositoryInterface */
     private $orderItemUnitRepository;

diff --git a/src/Converter/ShipmentLineItemsConverter.php b/src/Converter/ShipmentLineItemsConverter.php
@@ -37,13 +37,13 @@ public function convert(array $units): array
 
         /** @var ShipmentRefund $shipmentRefund */
         foreach ($units as $shipmentRefund) {
-            $lineItems[] = $this->convertUnitRefundToLineItem($shipmentRefund);
+            $lineItems[] = $this->convertShipmentRefundToLineItem($shipmentRefund);
         }
 
         return $lineItems;
     }
 
-    private function convertUnitRefundToLineItem(ShipmentRefund $shipmentRefund): LineItemInterface
+    private function convertShipmentRefundToLineItem(ShipmentRefund $shipmentRefund): LineItemInterface
     {
         /** @var AdjustmentInterface|null $shippingAdjustment */
         $shippingAdjustment = $this

diff --git a/src/Resources/config/services/converter.xml b/src/Resources/config/services/converter.xml
@@ -4,12 +4,12 @@
     <services>
         <defaults autowire="false" autoconfigure="false" public="true" />
 
-        <service id="Sylius\RefundPlugin\Converter\LineItemsConverterInterface" class="Sylius\RefundPlugin\Converter\LineItemsConverter">
+        <service id="Sylius\RefundPlugin\Converter\OrderItemUnitLineItemsConverter">
             <argument type="service" id="sylius.repository.order_item_unit" />
             <argument type="service" id="Sylius\RefundPlugin\Provider\TaxRateProviderInterface" />
         </service>
 
-        <service id="Sylius\RefundPlugin\Converter\ShipmentLineItemsConverterInterface" class="Sylius\RefundPlugin\Converter\ShipmentLineItemsConverter">
+        <service id="Sylius\RefundPlugin\Converter\ShipmentLineItemsConverter">
             <argument type="service" id="sylius.repository.adjustment" />
             <argument type="service" id="Sylius\RefundPlugin\Provider\TaxRateProviderInterface" />
         </service>

diff --git a/src/Resources/config/services/generator.xml b/src/Resources/config/services/generator.xml
@@ -12,8 +12,8 @@
         </service>
 
         <service id="Sylius\RefundPlugin\Generator\CreditMemoGenerator">
-            <argument type="service" id="Sylius\RefundPlugin\Converter\LineItemsConverterInterface" />
-            <argument type="service" id="Sylius\RefundPlugin\Converter\ShipmentLineItemsConverterInterface" />
+            <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\RefundPlugin\Generator\SequentialNumberGenerator" />
             <argument type="service" id="Sylius\RefundPlugin\Provider\CurrentDateTimeImmutableProviderInterface" />