Fixed phpstan, rector, ecs errors

Author: rez1dent3

src/Internal/Dto/BasketDto.php

@@ -39,7 +39,7 @@ public function total(): int
     public function cursor(): Generator
     {
         foreach ($this->items as $item) {
-            yield from $item->items();
+            yield from $item->getItems();
         }
     }
 

src/Internal/Dto/ItemDto.php

@@ -12,24 +12,24 @@ final class ItemDto implements ItemDtoInterface
     public function __construct(
         private ProductInterface $product,
         private int $quantity,
-        private int|string|null $price,
+        private int|string|null $pricePerItem,
     ) {
     }
 
     /**
      * @return ProductInterface[]
      */
-    public function items(): array
+    public function getItems(): array
     {
         return array_fill(0, $this->quantity, $this->product);
     }
 
-    public function getPrice(): int|string|null
+    public function getPricePerItem(): int|string|null
     {
-        return $this->price;
+        return $this->pricePerItem;
     }
 
-    public function product(): ProductInterface
+    public function getProduct(): ProductInterface
     {
         return $this->product;
     }

src/Internal/Dto/ItemDtoInterface.php

@@ -12,11 +12,11 @@ interface ItemDtoInterface extends Countable
     /**
      * @return ProductInterface[]
      */
-    public function items(): array;
+    public function getItems(): array;
 
     public function count(): int;
 
-    public function getPrice(): int|string|null;
+    public function getPricePerItem(): int|string|null;
 
-    public function product(): ProductInterface;
+    public function getProduct(): ProductInterface;
 }

src/Objects/Cart.php

@@ -46,16 +46,14 @@ public function withMeta(array $meta): self
         return $self;
     }
 
-    public function withItem(ProductInterface $product, int $quantity = 1, int|string|null $price = null): self
+    public function withItem(ProductInterface $product, int $quantity = 1, int|string|null $pricePerItem = null): self
     {
         $self = clone $this;
 
         $productId = $self->productId($product);
-        if (!isset($self->items[$productId])) {
-            $self->items[$productId] = [];
-        }
 
-        $self->items[$productId][] = new ItemDto($product, $quantity, $price);
+        $self->items[$productId] ??= [];
+        $self->items[$productId][] = new ItemDto($product, $quantity, $pricePerItem);
 
         return $self;
     }
@@ -78,7 +76,7 @@ public function getItems(): array
         $items = [];
         foreach ($this->items as $item) {
             foreach ($item as $datum) {
-                $items[] = $datum->items();
+                $items[] = $datum->getItems();
             }
         }
 
@@ -91,10 +89,12 @@ public function getTotal(Customer $customer): string
         $prices = [];
         foreach ($this->items as $productId => $_items) {
             foreach ($_items as $item) {
-                $product = $item->product();
-                $prices[$productId] = $item->getPrice()
+                $product = $item->getProduct();
+                $prices[$productId] = $item->getPricePerItem()
                     ?? $prices[$productId]
-                    ?? $item->product()->getAmountProduct($customer);
+                    ?? $item->getProduct()
+                        ->getAmountProduct($customer)
+                    ;
 
                 $price = $this->math->mul($this->getQuantity($product), $prices[$productId]);
                 $result = $this->math->add($result, $price);
@@ -111,7 +111,6 @@ public function count(): int
 
     public function getQuantity(ProductInterface $product): int
     {
-        /** @var ItemDtoInterface[] $items */
         $quantity = 0;
         $items = $this->items[$this->productId($product)] ?? [];
         foreach ($items as $item) {
@@ -126,11 +125,13 @@ public function getQuantity(ProductInterface $product): int
      */
     public function getBasketDto(): BasketDtoInterface
     {
-        if ($this->items === []) {
+        $items = array_merge(...array_values($this->items));
+
+        if ($items === []) {
             throw new CartEmptyException('Cart is empty', ExceptionInterface::CART_EMPTY);
         }
 
-        return new BasketDto(array_merge(...array_values($this->items)), $this->getMeta());
+        return new BasketDto($items, $this->getMeta());
     }
 
     private function productId(ProductInterface $product): string

src/Services/BasketService.php

@@ -14,7 +14,7 @@ public function availability(AvailabilityDtoInterface $availabilityDto): bool
         $basketDto = $availabilityDto->getBasketDto();
         $customer = $availabilityDto->getCustomer();
         foreach ($basketDto->items() as $itemDto) {
-            $product = $itemDto->product();
+            $product = $itemDto->getProduct();
             if ($product instanceof ProductLimitedInterface && !$product->canBuy(
                 $customer,
                 $itemDto->count(),

src/Services/PurchaseService.php

@@ -23,7 +23,7 @@ public function already(Customer $customer, BasketDtoInterface $basketDto, bool
         $arrays = [];
         $query = $customer->transfers();
         foreach ($basketDto->items() as $itemDto) {
-            $wallet = $this->castService->getWallet($itemDto->product());
+            $wallet = $this->castService->getWallet($itemDto->getProduct());
 
             /**
              * As part of my work, "with" was added, it gives a 50x boost for a huge number of returns. In this case,

src/Traits/CartPay.php

@@ -121,13 +121,13 @@ public function payCart(CartInterface $cart, bool $force = false): array
             $prepareService = app(PrepareServiceInterface::class);
             $assistantService = app(AssistantServiceInterface::class);
             foreach ($cart->getBasketDto()->items() as $item) {
-                foreach ($item->items() as $_item) {
-                    $product = $item->product();
+                foreach ($item->getItems() as $_item) {
+                    $product = $item->getProduct();
                     $transfers[] = $prepareService->transferLazy(
                         $this,
                         $product,
                         Transfer::STATUS_PAID,
-                        $item->getPrice() ?? $product->getAmountProduct($this),
+                        $item->getPricePerItem() ?? $product->getAmountProduct($this),
                         $assistantService->getMeta($basketDto, $product)
                     );
                 }

tests/Units/Domain/ProductTest.php

@@ -277,7 +277,8 @@ public function testPayCustomPrice(): void
         self::assertSame(1_000, $buyer->balanceInt);
 
         $cart = app(Cart::class)
-            ->withItem($product, price: 1_000);
+            ->withItem($product, pricePerItem: 1_000)
+        ;
 
         $transfers = $buyer->payCart($cart);
         self::assertCount(1, $transfers);