[TASK] Some __construct cleanups

extcode · Jun 8, 2024 · 3fdd445 · 3fdd445
1 parent 30b8b5c
commit 3fdd445
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 88 deletions.
diff --git a/Classes/EventListener/Order/Create/Order.php b/Classes/EventListener/Order/Create/Order.php
@@ -18,17 +18,10 @@
 
 class Order
 {
-    private EventDispatcherInterface $eventDispatcher;
-
-    private PersistenceManager $persistenceManager;
-
     public function __construct(
-        EventDispatcherInterface $eventDispatcher,
-        PersistenceManager $persistenceManager
-    ) {
-        $this->eventDispatcher = $eventDispatcher;
-        $this->persistenceManager = $persistenceManager;
-    }
+        private readonly EventDispatcherInterface $eventDispatcher,
+        private readonly PersistenceManager $persistenceManager
+    ) {}
 
     public function __invoke(EventInterface $event): void
     {

diff --git a/Classes/EventListener/Order/Create/PersistOrder/Coupons.php b/Classes/EventListener/Order/Create/PersistOrder/Coupons.php
@@ -22,25 +22,12 @@
 
 class Coupons
 {
-    private PersistenceManager $persistenceManager;
-
-    private ItemRepository $itemRepository;
-
-    private DiscountRepository $discountRepository;
-
-    private CouponRepository $couponRepository;
-
     public function __construct(
-        PersistenceManager $persistenceManager,
-        ItemRepository $itemRepository,
-        DiscountRepository $discountRepository,
-        CouponRepository $couponRepository
-    ) {
-        $this->persistenceManager = $persistenceManager;
-        $this->itemRepository = $itemRepository;
-        $this->discountRepository = $discountRepository;
-        $this->couponRepository = $couponRepository;
-    }
+        private readonly PersistenceManager $persistenceManager,
+        private readonly ItemRepository $itemRepository,
+        private readonly DiscountRepository $discountRepository,
+        private readonly CouponRepository $couponRepository
+    ) {}
 
     public function __invoke(PersistOrderEventInterface $event): void
     {

diff --git a/Classes/EventListener/Order/Create/PersistOrder/Item.php b/Classes/EventListener/Order/Create/PersistOrder/Item.php
@@ -22,25 +22,12 @@
 
 class Item
 {
-    private PersistenceManager $persistenceManager;
-
-    private ItemRepository $itemRepository;
-
-    private BillingAddressRepository $billingAddressRepository;
-
-    private ShippingAddressRepository $shippingAddressRepository;
-
     public function __construct(
-        PersistenceManager $persistenceManager,
-        ItemRepository $itemRepository,
-        BillingAddressRepository $billingAddressRepository,
-        ShippingAddressRepository $shippingAddressRepository
-    ) {
-        $this->persistenceManager = $persistenceManager;
-        $this->itemRepository = $itemRepository;
-        $this->billingAddressRepository = $billingAddressRepository;
-        $this->shippingAddressRepository = $shippingAddressRepository;
-    }
+        private readonly PersistenceManager $persistenceManager,
+        private readonly ItemRepository $itemRepository,
+        private readonly BillingAddressRepository $billingAddressRepository,
+        private readonly ShippingAddressRepository $shippingAddressRepository
+    ) {}
 
     public function __invoke(PersistOrderEventInterface $event): void
     {

diff --git a/Classes/EventListener/Order/Create/PersistOrder/Payment.php b/Classes/EventListener/Order/Create/PersistOrder/Payment.php
@@ -19,21 +19,11 @@
 
 class Payment
 {
-    private PersistenceManager $persistenceManager;
-
-    private ItemRepository $itemRepository;
-
-    private PaymentRepository $paymentRepository;
-
     public function __construct(
-        PersistenceManager $persistenceManager,
-        ItemRepository $itemRepository,
-        PaymentRepository $paymentRepository
-    ) {
-        $this->persistenceManager = $persistenceManager;
-        $this->itemRepository = $itemRepository;
-        $this->paymentRepository = $paymentRepository;
-    }
+        private readonly PersistenceManager $persistenceManager,
+        private readonly ItemRepository $itemRepository,
+        private readonly PaymentRepository $paymentRepository
+    ) {}
 
     public function __invoke(PersistOrderEventInterface $event): void
     {

diff --git a/Classes/EventListener/Order/Create/PersistOrder/Shipping.php b/Classes/EventListener/Order/Create/PersistOrder/Shipping.php
@@ -19,21 +19,11 @@
 
 class Shipping
 {
-    private PersistenceManager $persistenceManager;
-
-    private ItemRepository $itemRepository;
-
-    private ShippingRepository $shippingRepository;
-
     public function __construct(
-        PersistenceManager $persistenceManager,
-        ItemRepository $itemRepository,
-        ShippingRepository $shippingRepository
-    ) {
-        $this->persistenceManager = $persistenceManager;
-        $this->itemRepository = $itemRepository;
-        $this->shippingRepository = $shippingRepository;
-    }
+        private readonly PersistenceManager $persistenceManager,
+        private readonly ItemRepository $itemRepository,
+        private readonly ShippingRepository $shippingRepository
+    ) {}
 
     public function __invoke(PersistOrderEventInterface $event): void
     {

diff --git a/Classes/EventListener/Order/Create/PersistOrder/TaxClasses.php b/Classes/EventListener/Order/Create/PersistOrder/TaxClasses.php
@@ -20,21 +20,11 @@
 
 class TaxClasses
 {
-    private PersistenceManager $persistenceManager;
-
-    private ItemRepository $itemRepository;
-
-    private TaxClassRepository $taxClassRepository;
-
     public function __construct(
-        PersistenceManager $persistenceManager,
-        ItemRepository $itemRepository,
-        TaxClassRepository $taxClassRepository
-    ) {
-        $this->persistenceManager = $persistenceManager;
-        $this->itemRepository = $itemRepository;
-        $this->taxClassRepository = $taxClassRepository;
-    }
+        private readonly PersistenceManager $persistenceManager,
+        private readonly ItemRepository $itemRepository,
+        private readonly TaxClassRepository $taxClassRepository
+    ) {}
 
     public function __invoke(PersistOrderEventInterface $event): void
     {