HQD-21: fixing "Optional parameter $plan declared before required parameter $price is implicitly treated as a required parameter" deprecation warning in SinglePrice

Author: VadymHrechukha

src/charge/modifiers/Installment.php

@@ -39,7 +39,7 @@ public function buildPrice(Money $sum)
         $target = $this->getTarget();
         $prepaid = Quantity::create('items', 0);
 
-        return new SinglePrice(null, $type, $target, null, $prepaid, $sum);
+        return new SinglePrice(null, $type, $target, $prepaid, $sum);
     }
 
     public function getType()

src/price/PriceFactory.php

@@ -89,7 +89,7 @@ public function createRatePrice(PriceCreationDto $dto)
 
     public function createSinglePrice(PriceCreationDto $dto)
     {
-        return new SinglePrice($dto->id, $dto->type, $dto->target, $dto->plan, $dto->prepaid, $dto->price);
+        return new SinglePrice($dto->id, $dto->type, $dto->target, $dto->prepaid, $dto->price, $dto->plan);
     }
 
     public function createProgressivePrice(PriceCreationDto $dto): ProgressivePrice

src/price/SinglePrice.php

@@ -36,9 +36,9 @@ public function __construct(
         $id,
         TypeInterface $type,
         TargetInterface $target,
-        ?PlanInterface $plan = null,
         QuantityInterface $prepaid,
-        Money $price
+        Money $price,
+        ?PlanInterface $plan = null,
     ) {
         parent::__construct($id, $type, $target, $plan);
         $this->prepaid  = $prepaid;

tests/behat/bootstrap/FeatureContext.php

@@ -100,7 +100,7 @@ public function priceIs($target, $type, $sum, $currency, $unit, $quantity = 0)
         $target = new Target(Target::ANY, $target);
         $quantity = Quantity::create($unit, $quantity);
         $sum = $this->moneyParser->parse($sum, new Currency($currency));
-        $this->setPrice(new SinglePrice(null, $type, $target, null, $quantity, $sum));
+        $this->setPrice(new SinglePrice(null, $type, $target, $quantity, $sum));
     }
 
     protected array $progressivePrice = [];

tests/unit/action/ActionTest.php

@@ -87,7 +87,7 @@ protected function setUp(): void
         $this->target   = new Target(2, 'server');
         $this->prepaid  = Quantity::gigabyte(1);
         $this->money    = Money::USD(10000);
-        $this->price    = new SinglePrice(5, $this->type, $this->target, null, $this->prepaid, $this->money);
+        $this->price    = new SinglePrice(5, $this->type, $this->target, $this->prepaid, $this->money);
         $this->customer = new Customer(2, 'client');
         $this->time     = new DateTimeImmutable('now');
         $this->generalizer = new Generalizer();

tests/unit/charge/modifiers/InstallmentTest.php

@@ -30,7 +30,7 @@ protected function setUp(): void
     {
         parent::setUp();
         $this->type = Type::anyId('monthly,installment');
-        $this->price = new SinglePrice(5, $this->type, $this->target, null, $this->prepaid, $this->money);
+        $this->price = new SinglePrice(5, $this->type, $this->target, $this->prepaid, $this->money);
     }
 
     protected function buildInstallment($term)

tests/unit/charge/modifiers/OnceTest.php

@@ -37,7 +37,7 @@ private function createType(string $name): TypeInterface
 
     private function createPrice(TypeInterface $type): PriceInterface
     {
-        return new SinglePrice(5, $type, $this->target, null, $this->prepaid, $this->money);
+        return new SinglePrice(5, $type, $this->target, $this->prepaid, $this->money);
     }
 
     #[\PHPUnit\Framework\Attributes\DataProvider('periodCreationProvider')]

tests/unit/price/SinglePriceTest.php

@@ -40,7 +40,7 @@ protected function setUp(): void
         $this->type     = new Type(null, 'server_traf');
         $this->quantity = Quantity::gigabyte(10);
         $this->money    = Money::USD(15);
-        $this->price    = new SinglePrice(null, $this->type, $this->target, null, $this->quantity, $this->money);
+        $this->price    = new SinglePrice(null, $this->type, $this->target, $this->quantity, $this->money);
     }
 
     protected function tearDown(): void