[Shipment] Improve interface inheritance

src/Converter/ShipmentLineItemsConverter.php

@@ -4,6 +4,7 @@
 
 namespace Sylius\RefundPlugin\Converter;
 
+use Sylius\Component\Order\Model\AdjustableInterface;
 use Sylius\Component\Resource\Repository\RepositoryInterface;
 use Sylius\RefundPlugin\Entity\AdjustmentInterface;
 use Sylius\RefundPlugin\Entity\LineItem;
@@ -46,7 +47,7 @@ private function convertUnitRefundToLineItem(ShipmentRefund $shipmentRefund): Li
 
         $shipment = $shippingAdjustment->getShipment();
         Assert::notNull($shipment);
-
+        Assert::isInstanceOf($shipment, AdjustableInterface::class);
         Assert::lessThanEq($shipmentRefund->total(), $shipment->getAdjustmentsTotal());
 
         return new LineItem(

src/Entity/AdjustmentInterface.php

@@ -14,6 +14,7 @@
 namespace Sylius\RefundPlugin\Entity;
 
 use Sylius\Component\Core\Model\AdjustmentInterface as BaseAdjustmentInterface;
+use Sylius\Component\Core\Model\ShipmentInterface as BaseShipmentInterface;
 
 /**
  * @internal
@@ -27,7 +28,7 @@ public function getDetails(): array;
 
     public function setDetails(array $details): void;
 
-    public function getShipment(): ?ShipmentInterface;
+    public function getShipment(): ?BaseShipmentInterface;
 
-    public function setShipment(?ShipmentInterface $shipment): void;
+    public function setShipment(?BaseShipmentInterface $shipment): void;
 }

src/Entity/AdjustmentTrait.php

@@ -13,6 +13,8 @@
 
 namespace Sylius\RefundPlugin\Entity;
 
+use Sylius\Component\Core\Model\ShipmentInterface as BaseShipmentInterface;
+
 /**
  * @internal
  *
@@ -44,12 +46,12 @@ public function setDetails(array $details): void
         $this->details = $details;
     }
 
-    public function getShipment(): ?ShipmentInterface
+    public function getShipment(): ?BaseShipmentInterface
     {
         return $this->shipment;
     }
 
-    public function setShipment(?ShipmentInterface $shipment): void
+    public function setShipment(?BaseShipmentInterface $shipment): void
     {
         if ($this->shipment === $shipment) {
             return;

src/Entity/ShipmentInterface.php

@@ -22,6 +22,12 @@
  * This class is not covered by the backward compatibility promise and it will be removed after update Sylius to 1.9.
  * It is a duplication of a logic from Sylius to provide proper adjustments handling.
  */
-interface ShipmentInterface extends BaseShipmentInterface, AdjustableInterface
-{
+if (is_a(BaseShipmentInterface::class, AdjustableInterface::class, true)) {
+    interface ShipmentInterface extends BaseShipmentInterface
+    {
+    }
+} else {
+    interface ShipmentInterface extends BaseShipmentInterface, AdjustableInterface
+    {
+    }
 }

src/Provider/RemainingTotalProvider.php

@@ -5,6 +5,7 @@
 namespace Sylius\RefundPlugin\Provider;
 
 use Sylius\Component\Core\Model\OrderItemUnitInterface;
+use Sylius\Component\Order\Model\AdjustableInterface;
 use Sylius\Component\Resource\Repository\RepositoryInterface;
 use Sylius\RefundPlugin\Entity\AdjustmentInterface;
 use Sylius\RefundPlugin\Entity\RefundInterface;
@@ -69,6 +70,7 @@ private function getRefundUnitTotal(int $id, RefundType $refundType): int
 
         $shipment = $shippingAdjustment->getShipment();
         Assert::notNull($shipment);
+        Assert::isInstanceOf($shipment, AdjustableInterface::class);
 
         return $shipment->getAdjustmentsTotal();
     }