CS fixes

psalm.xml

@@ -29,4 +29,11 @@
         <function name="var_dump"/>
         <function name="print_r"/>
     </forbiddenFunctions>
+    <issueHandlers>
+        <PropertyNotSetInConstructor>
+            <errorLevel type="suppress">
+                <file name="src/Form/Type/CustomDiscountCollectionType.php"/>
+            </errorLevel>
+        </PropertyNotSetInConstructor>
+    </issueHandlers>
 </psalm>

src/Form/Type/CustomDiscountCollectionType.php

@@ -4,8 +4,6 @@
 
 namespace Setono\SyliusOrderEditPlugin\Form\Type;
 
-use Setono\SyliusOrderEditPlugin\Model\OrderEditDiscountTypes;
-use Sylius\Component\Core\Model\OrderInterface;
 use Sylius\Component\Order\Factory\AdjustmentFactoryInterface;
 use Sylius\Component\Order\Model\AdjustableInterface;
 use Sylius\Component\Order\Model\AdjustmentInterface;
@@ -16,6 +14,7 @@
 abstract class CustomDiscountCollectionType extends AbstractType
 {
     protected string $label;
+
     protected string $adjustmentType;
 
     public function __construct(

src/Form/Type/OrderDiscountCollectionType.php

@@ -5,7 +5,6 @@
 namespace Setono\SyliusOrderEditPlugin\Form\Type;
 
 use Setono\SyliusOrderEditPlugin\Model\AdjustmentTypes;
-use Sylius\Component\Core\Model\OrderInterface;
 use Sylius\Component\Order\Factory\AdjustmentFactoryInterface;
 
 final class OrderDiscountCollectionType extends CustomDiscountCollectionType

tests/Application/templates/bundles/SyliusAdminBundle/Order/Show/Summary/_item.html.twig

@@ -2,7 +2,7 @@
 
 {% set orderPromotionAdjustment = constant('Sylius\\Component\\Core\\Model\\AdjustmentInterface::ORDER_PROMOTION_ADJUSTMENT') %}
 {% set unitPromotionAdjustment = constant('Sylius\\Component\\Core\\Model\\AdjustmentInterface::ORDER_UNIT_PROMOTION_ADJUSTMENT') %}
-{% set adminOrderItemDiscountAdjustment = constant('Setono\\SyliusOrderEditPlugin\\Model\\OrderEditDiscountTypes::SETONO_ADMIN_ORDER_ITEM_DISCOUNT') %}
+{% set adminOrderItemDiscountAdjustment = constant('Setono\\SyliusOrderEditPlugin\\Model\\AdjustmentTypes::SETONO_ADMIN_ORDER_ITEM_DISCOUNT') %}
 {% set shippingAdjustment = constant('Sylius\\Component\\Core\\Model\\AdjustmentInterface::SHIPPING_ADJUSTMENT') %}
 {% set taxAdjustment = constant('Sylius\\Component\\Core\\Model\\AdjustmentInterface::TAX_ADJUSTMENT') %}
 

tests/Application/templates/bundles/SyliusAdminBundle/Order/Show/Summary/_totalsPromotions.html.twig

@@ -2,7 +2,7 @@
 
 {% set orderPromotionAdjustment = constant('Sylius\\Component\\Core\\Model\\AdjustmentInterface::ORDER_PROMOTION_ADJUSTMENT') %}
 {% set unitPromotionAdjustment = constant('Sylius\\Component\\Core\\Model\\AdjustmentInterface::ORDER_UNIT_PROMOTION_ADJUSTMENT') %}
-{% set adminOrderDiscountAdjustment = constant('Setono\\SyliusOrderEditPlugin\\Model\\OrderEditDiscountTypes::SETONO_ADMIN_ORDER_DISCOUNT') %}
+{% set adminOrderDiscountAdjustment = constant('Setono\\SyliusOrderEditPlugin\\Model\\AdjustmentTypes::SETONO_ADMIN_ORDER_DISCOUNT') %}
 
 <tr>
     <td colspan="5" id="promotion-discounts" class="promotion-disabled">

tests/Functional/OrderUpdateTest.php

@@ -7,7 +7,7 @@
 use Doctrine\ORM\EntityManagerInterface;
 use Setono\SyliusOrderEditPlugin\Entity\EditableOrderInterface;
 use Setono\SyliusOrderEditPlugin\Entity\InitialTotalAwareOrderInterface;
-use Setono\SyliusOrderEditPlugin\Model\OrderEditDiscountTypes;
+use Setono\SyliusOrderEditPlugin\Model\AdjustmentTypes;
 use Sylius\Bundle\ApiBundle\Command\Cart\AddItemToCart;
 use Sylius\Bundle\ApiBundle\Command\Cart\PickupCart;
 use Sylius\Bundle\ApiBundle\Command\Checkout\ChoosePaymentMethod;
@@ -116,7 +116,7 @@ public function testItAllowsToAddAndRemoveDiscountsForTheWholeOrderMultipleTimes
         /** @var EditableOrderInterface $order */
         $order = $this->getOrderRepository()->findOneBy(['tokenValue' => 'TOKEN']);
         self::assertSame($initialOrderTotal - 200, $order->getTotal());
-        self::assertSame(-200, $order->getAdjustmentsTotal(OrderEditDiscountTypes::SETONO_ADMIN_ORDER_DISCOUNT));
+        self::assertSame(-200, $order->getAdjustmentsTotal(AdjustmentTypes::SETONO_ADMIN_ORDER_DISCOUNT));
     }
 
     public function testItDoesNotAllowToExceedTheInitialOrderTotal(): void
@@ -154,10 +154,10 @@ public function testItAllowsToAddDiscountsForTheSpecificOrderItem(): void
 
         $order = $this->getOrderRepository()->findOneBy(['tokenValue' => 'TOKEN']);
         self::assertSame($initialOrderTotal - 100, $order->getTotal());
-        self::assertSame(0, $order->getAdjustmentsTotal(OrderEditDiscountTypes::SETONO_ADMIN_ORDER_DISCOUNT));
+        self::assertSame(0, $order->getAdjustmentsTotal(AdjustmentTypes::SETONO_ADMIN_ORDER_DISCOUNT));
         self::assertSame(
             -100,
-            $order->getItems()->first()->getAdjustmentsTotal(OrderEditDiscountTypes::SETONO_ADMIN_ORDER_ITEM_DISCOUNT),
+            $order->getItems()->first()->getAdjustmentsTotal(AdjustmentTypes::SETONO_ADMIN_ORDER_ITEM_DISCOUNT),
         );
     }
 
@@ -178,10 +178,10 @@ public function testItAllowsToAddAndRemoveDiscountsForTheOrderItemMultipleTimes(
         /** @var EditableOrderInterface $order */
         $order = $this->getOrderRepository()->findOneBy(['tokenValue' => 'TOKEN']);
         self::assertSame($initialOrderTotal - 200, $order->getTotal());
-        self::assertSame(0, $order->getAdjustmentsTotal(OrderEditDiscountTypes::SETONO_ADMIN_ORDER_DISCOUNT));
+        self::assertSame(0, $order->getAdjustmentsTotal(AdjustmentTypes::SETONO_ADMIN_ORDER_DISCOUNT));
         self::assertSame(
             -200,
-            $order->getItems()->first()->getAdjustmentsTotal(OrderEditDiscountTypes::SETONO_ADMIN_ORDER_ITEM_DISCOUNT),
+            $order->getItems()->first()->getAdjustmentsTotal(AdjustmentTypes::SETONO_ADMIN_ORDER_ITEM_DISCOUNT),
         );
     }