[Shipment] Improve interface inheritance

Sylius · Jan 20, 2021 · af901b6 · af901b6
1 parent e23ab6f
commit af901b6
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 6 deletions.
diff --git a/src/Entity/AdjustmentInterface.php b/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;
 }
diff --git a/src/Entity/AdjustmentTrait.php b/src/Entity/AdjustmentTrait.php
@@ -13,6 +13,9 @@
 
 namespace Sylius\RefundPlugin\Entity;
 
+use Sylius\Component\Order\Model\AdjustableInterface;
+use Sylius\Component\Core\Model\ShipmentInterface as BaseShipmentInterface;
+
 /**
  * @internal
  *
@@ -44,12 +47,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;

diff --git a/src/Entity/ShipmentInterface.php b/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
+    {
+    }
 }