HP-1928: array => string type (#64)

Author: bladeroot

src/sale/Sale.php

@@ -129,9 +129,9 @@ public function setId($id)
         $this->id = $id;
     }
 
-    public function getData()
+    public function getData(): ?array
     {
-        return $this->data;
+        return !empty($this->data) ? $this->data : null;
     }
 
     public function jsonSerialize(): array

src/sale/SaleCreationDto.php

@@ -28,4 +28,6 @@ class SaleCreationDto
     public $closeTime;
 
     public $data;
+
+    public $reason;
 }

src/sale/SaleFactory.php

@@ -23,7 +23,7 @@ class SaleFactory implements SaleFactoryInterface
      */
     public function create(SaleCreationDto $dto)
     {
-        $sale = new Sale($dto->id, $dto->target, $dto->customer, $dto->plan, $dto->time);
+        $sale = new Sale($dto->id, $dto->target, $dto->customer, $dto->plan, $dto->time, $dto->data);
 
         if ($dto->closeTime !== null) {
             $sale->close($dto->closeTime);

src/sale/SaleInterface.php

@@ -62,9 +62,9 @@ public function getTime();
     public function getCloseTime(): ?DateTimeImmutable;
 
     /**
-     * @return string|array|null
+     * @return array|null
      */
-    public function getData();
+    public function getData(): ?array;
 
     /**
      * @param DateTimeImmutable $time

tests/behat/bootstrap/BillingContext.php

@@ -188,14 +188,6 @@ public function setConsumption(string $type, int $amount, string $unit, string $
         $this->builder->setConsumption($type, $amount, $unit, $target, $time);
     }
 
-    /**
-     * @Given /recalculate autotariff for target (\S+)( +at (\S+))?$/
-     */
-    public function recalculateAutoTariff(string $target, string $time = null): void
-    {
-        $this->builder->clientSetAutoTariff($target, $time);
-    }
-
     /**
      * @Given /perform billing at (\S+)/
      */
@@ -239,14 +231,14 @@ public function billWithTime($type, $sum, $currency, $quantity, $unit, $target,
             'quantity' => "$quantity $unit",
             'time' => $time,
         ]);
-        Assert::assertSame($type, $bill->getType()->getName(), "Bill type mismatch: expected $type, got {$bill->getType()->getName()}");
-        Assert::assertSame($target, $bill->getTarget()->getFullName(), "Bill target mismatch: expected $target, got {$bill->getTarget()->getFullName()}");
-        Assert::assertEquals(bcmul($sum, 100), $bill->getSum()->getAmount(), "Bill sum mismatch: expected $sum, got {$bill->getSum()->getAmount()}");
-        Assert::assertSame($currency, $bill->getSum()->getCurrency()->getCode(), "Bill currency mismatch: expected $currency, got {$bill->getSum()->getCurrency()->getCode()}");
-        Assert::assertEquals((float)$quantity, (float)$bill->getQuantity()->getQuantity(), "Bill quantity mismatch: expected $quantity, got {$bill->getQuantity()->getQuantity()}");
-        Assert::assertEquals(strtolower($unit), strtolower($bill->getQuantity()->getUnit()->getName()), "Bill unit mismatch: expected $unit, got {$bill->getQuantity()->getUnit()->getName()}");
+        Assert::assertSame($type, $bill->getType()->getName());
+        Assert::assertSame($target, $bill->getTarget()->getFullName());
+        Assert::assertEquals(bcmul($sum, 100), $bill->getSum()->getAmount());
+        Assert::assertSame($currency, $bill->getSum()->getCurrency()->getCode());
+        Assert::assertEquals((float)$quantity, (float)$bill->getQuantity()->getQuantity());
+        Assert::assertEquals(strtolower($unit), strtolower($bill->getQuantity()->getUnit()->getName()));
         if ($time) {
-            Assert::assertEquals(new DateTimeImmutable($time), $bill->getTime(), "Bill time mismatch: expected $time, got {$bill->getTime()->format(DATE_ATOM)}");
+            Assert::assertEquals(new DateTimeImmutable($time), $bill->getTime());
         }
     }
 
@@ -345,10 +337,6 @@ protected function prepareTime(string $time = null)
         if (strncmp($time, 'pY', 1) === 0) {
             return date(substr($time, 1), strtotime('-1 year'));
         }
-        if (str_contains($time, 'pm')) {
-            $time = str_replace('pm', 'm', $time);
-            $time = date($time, strtotime('-1 month'));
-        }
         if (strncmp($time, 'Y', 1) === 0) {
             return date($time);
         }