Merge pull request #5 from khandurdyiev/remove-iso-object-from-entitites

remove iso object from entitites

Author: Islam

src/Entities/ClientInfo/Account.php

@@ -4,7 +4,6 @@
 
 namespace Khandurdyiev\MonoClient\Entities\ClientInfo;
 
-use Alcohol\ISO4217 as AlcoholISO4217;
 use Khandurdyiev\MonoClient\ISO4217;
 use Khandurdyiev\MonoClient\Utils\Utils;
 
@@ -21,7 +20,6 @@ class Account implements \JsonSerializable
      * @var array<int, string>
      */
     private array $maskedPan;
-    private ISO4217 $iso4217;
 
     /**
      * @param array<string, mixed> $account
@@ -36,7 +34,6 @@ public function __construct(array $account)
         $this->type = (string)$account['type'];
         $this->iban = (string)$account['iban'];
         $this->maskedPan = (array)$account['maskedPan'];
-        $this->iso4217 = new ISO4217(new AlcoholISO4217());
     }
 
     /**
@@ -71,7 +68,7 @@ public function getCurrencyCode(): int
 
     public function getCurrency(): string
     {
-        return $this->iso4217->getByNumeric($this->currencyCode);
+        return ISO4217::create()->getByNumeric($this->currencyCode);
     }
 
     public function getCashbackType(): string

src/Entities/Currency/Currency.php

@@ -4,7 +4,6 @@
 
 namespace Khandurdyiev\MonoClient\Entities\Currency;
 
-use Alcohol\ISO4217 as AlcoholISO4217;
 use Khandurdyiev\MonoClient\ISO4217;
 use Carbon\Carbon;
 
@@ -16,7 +15,6 @@ class Currency implements \JsonSerializable
     private ?float $rateSell;
     private ?float $rateBuy;
     private ?float $rateCross;
-    private ISO4217 $iso4217;
 
     /**
      * @param array<string, mixed> $currency
@@ -29,7 +27,6 @@ public function __construct(array $currency)
         $this->rateSell = isset($currency['rateSell']) ? (float) $currency['rateSell'] : null;
         $this->rateBuy = isset($currency['rateBuy']) ? (float) $currency['rateBuy'] : null;
         $this->rateCross = isset($currency['rateCross']) ? (float) $currency['rateCross'] : null;
-        $this->iso4217 = new ISO4217(new AlcoholISO4217());
     }
 
     /**
@@ -54,12 +51,12 @@ public function getCurrencyCodeB(): int
 
     public function getCurrencyA(): string
     {
-        return $this->iso4217->getByNumeric($this->currencyCodeA);
+        return ISO4217::create()->getByNumeric($this->currencyCodeA);
     }
 
     public function getCurrencyB(): string
     {
-        return $this->iso4217->getByNumeric($this->currencyCodeB);
+        return ISO4217::create()->getByNumeric($this->currencyCodeB);
     }
 
     public function getTimestamp(): int

src/Entities/Statement/Statement.php

@@ -4,7 +4,6 @@
 
 namespace Khandurdyiev\MonoClient\Entities\Statement;
 
-use Alcohol\ISO4217 as AlcoholISO4217;
 use Khandurdyiev\MonoClient\ISO4217;
 use Khandurdyiev\MonoClient\Utils\Utils;
 
@@ -25,7 +24,6 @@ class Statement implements \JsonSerializable
     private string $receiptId;
     private string $counterEdrpou;
     private string $counterIban;
-    private ISO4217 $iso4217;
 
     /**
      * @param array<string, mixed> $statement
@@ -47,7 +45,6 @@ public function __construct(array $statement)
         $this->receiptId = $statement['receiptId'] ?? '';
         $this->counterEdrpou = $statement['counterEdrpou'] ?? '';
         $this->counterIban = $statement['counterIban'] ?? '';
-        $this->iso4217 = new ISO4217(new AlcoholISO4217());
     }
 
     /**
@@ -102,7 +99,7 @@ public function getCurrencyCode(): int
 
     public function getCurrency(): string
     {
-        return $this->iso4217->getByNumeric($this->currencyCode);
+        return ISO4217::create()->getByNumeric($this->currencyCode);
     }
 
     public function getCommissionRate(): int

src/ISO4217.php

@@ -8,11 +8,9 @@
 
 class ISO4217
 {
-    private AlcoholISO4217 $iso4217;
-
-    public function __construct(AlcoholISO4217 $iso4217)
+    public static function create(): ISO4217
     {
-        $this->iso4217 = $iso4217;
+        return new self();
     }
 
     /**
@@ -26,7 +24,7 @@ public function getByNumeric(int $code): string
 
         try {
             /** @var string $code */
-            $code = $this->iso4217->getByNumeric($numeric)['alpha3'];
+            $code = (new AlcoholISO4217())->getByNumeric($numeric)['alpha3'];
 
             return $code;
         } catch (\OutOfBoundsException $exception) {