fix phpstan

Author: rez1dent3

src/Internal/Dto/OptionDto.php

@@ -10,7 +10,7 @@
 final class OptionDto implements OptionDtoInterface
 {
     public function __construct(
-        private ?array $meta = null
+        private ?array $meta
     ) {
     }
 

src/Objects/Extra.php

@@ -14,8 +14,8 @@ final class Extra implements ExtraDtoInterface
 
     public function __construct(array|OptionDtoInterface|null $deposit, array|OptionDtoInterface|null $withdraw)
     {
-        $this->deposit = new Option($deposit);
-        $this->withdraw = new Option($withdraw);
+        $this->deposit = $deposit instanceof OptionDtoInterface ? $deposit : new Option($deposit);
+        $this->withdraw = $withdraw instanceof OptionDtoInterface ? $withdraw : new Option($withdraw);
     }
 
     public function getDepositExtra(): OptionDtoInterface

src/Objects/Option.php

@@ -9,7 +9,7 @@
 final class Option implements OptionDtoInterface
 {
     public function __construct(
-        private ?array $meta = null
+        private ?array $meta
     ) {
     }
 

src/Services/CommonServiceLegacy.php

@@ -92,10 +92,7 @@ public function applyTransfers(array $objects): array
                 $deposit = $transactions[$object->getDepositDto()->getUuid()] ?? null;
                 assert($deposit !== null);
 
-                $links[$deposit->getKey()] = $deposit;
-                $links[$withdraw->getKey()] = $withdraw;
-
-                $transfers[] = $this->transferDtoAssembler->create(
+                $transfer = $this->transferDtoAssembler->create(
                     $deposit->getKey(),
                     $withdraw->getKey(),
                     $object->getStatus(),
@@ -104,14 +101,17 @@ public function applyTransfers(array $objects): array
                     $object->getDiscount(),
                     $object->getFee()
                 );
+
+                $transfers[] = $transfer;
+                $links[$transfer->getUuid()] = [
+                    'deposit' => $deposit,
+                    'withdraw' => $withdraw,
+                ];
             }
 
             $models = $this->atmService->makeTransfers($transfers);
             foreach ($models as $model) {
-                if (isset($links[$model->deposit_id], $links[$model->withdraw_id])) {
-                    $model->setRelation('withdraw', $links[$model->withdraw_id]);
-                    $model->setRelation('deposit', $links[$model->deposit_id]);
-                }
+                $model->setRelations($links[$model->uuid] ?? []);
             }
 
             return $models;
@@ -128,7 +128,7 @@ public function makeTransaction(
         Wallet $wallet,
         string $type,
         $amount,
-        array|null|ExtraDtoInterface $meta,
+        ?array $meta,
         bool $confirmed = true
     ): Transaction {
         assert(in_array($type, [Transaction::TYPE_DEPOSIT, Transaction::TYPE_WITHDRAW], true));
@@ -141,7 +141,7 @@ public function makeTransaction(
 
         $transactions = $this->applyTransactions([
             $dto->getWalletId() => $wallet,
-        ], [$dto],);
+        ], [$dto]);
 
         return current($transactions);
     }

src/Traits/HasWallet.php

@@ -4,6 +4,7 @@
 
 namespace Bavix\Wallet\Traits;
 
+use function app;
 use Bavix\Wallet\Exceptions\AmountInvalid;
 use Bavix\Wallet\Exceptions\BalanceIsEmpty;
 use Bavix\Wallet\Exceptions\InsufficientFunds;
@@ -21,12 +22,11 @@
 use Bavix\Wallet\Services\CommonServiceLegacy;
 use Bavix\Wallet\Services\ConsistencyServiceInterface;
 use Bavix\Wallet\Services\RegulatorServiceInterface;
+use function config;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\Relations\MorphMany;
 use Illuminate\Database\RecordsNotFoundException;
 use Illuminate\Support\Collection;
-use function app;
-use function config;
 
 /**
  * Trait HasWallet.