Merge pull request #8 from Deyjandi:develop

update main branch

Author: pavloskafritsas

phpstan.neon.dist

@@ -11,4 +11,3 @@ parameters:
     checkOctaneCompatibility: true
     checkModelProperties: true
     checkMissingIterableValueType: false
-

src/Enums/VivaWalletEnv.php

@@ -10,13 +10,7 @@ enum VivaWalletEnv: string
     case Demo = 'demo';
     case Live = 'live';
 
-    private const CFG_KEY_USERNAME = 'viva-wallet.merchant_id';
-    private const CFG_KEY_PASSWORD = 'viva-wallet.api_key';
-
-    private const CFG_KEY_CLIENT_ID = 'viva-wallet.client_id';
-    private const CFG_KEY_CLIENT_SECRET = 'viva-wallet.client_secret';
-
-    public function requestWebhookKey(): array
+    public function requestWebhookKey(string $merchantId, string $apiKey): array
     {
         return [
             'method' => 'GET',
@@ -25,12 +19,12 @@ public function requestWebhookKey(): array
                 self::Live => 'https://www.vivapayments.com/api/messages/config/token',
             },
             'options' => [
-                'auth' => ClientAuth::basic(config(self::CFG_KEY_USERNAME), config(self::CFG_KEY_PASSWORD)),
+                'auth' => ClientAuth::basic($merchantId, $apiKey),
             ],
         ];
     }
 
-    public function requestToken(): array
+    public function requestToken(string $clientId, string $clientSecret): array
     {
         return [
             'method' => 'POST',
@@ -39,7 +33,7 @@ public function requestToken(): array
                 self::Live => 'https://accounts.vivapayments.com/connect/token',
             },
             'options' => [
-                'auth' => ClientAuth::basic(config(self::CFG_KEY_CLIENT_ID), config(self::CFG_KEY_CLIENT_SECRET)),
+                'auth' => ClientAuth::basic($clientId, $clientSecret),
                 'headers' => ['Content-Type' => 'application/x-www-form-urlencoded'],
                 'form_params' => ['grant_type' => 'client_credentials'],
             ],

src/VivaWallet.php

@@ -4,6 +4,8 @@
 
 class VivaWallet
 {
+    private array $config;
+
     public function __construct()
     {
         $this->config = config('viva-wallet');

src/VivaWalletCustomer.php

@@ -78,7 +78,7 @@ public function toJson(): string
     public function setEmail(?string $email): static
     {
         if ($email && strlen($email) > 50) {
-            throw new InvalidArgumentException('Customer\'s email value must be less than 50 characters.', static::EX_CODE);
+            throw new InvalidArgumentException('Customer\'s email value must be less than 50 characters.', self::EX_CODE);
         }
 
         $this->email = $email;
@@ -89,7 +89,7 @@ public function setEmail(?string $email): static
     public function setFullName(?string $fullName): static
     {
         if ($fullName && strlen($fullName) > 50) {
-            throw new InvalidArgumentException('Customer\'s email value must be less than 50 characters.', static::EX_CODE);
+            throw new InvalidArgumentException('Customer\'s email value must be less than 50 characters.', self::EX_CODE);
         }
 
         $this->fullName = $fullName;
@@ -100,7 +100,7 @@ public function setFullName(?string $fullName): static
     public function setPhone(?string $phone): static
     {
         if ($phone && strlen($phone) > 30) {
-            throw new InvalidArgumentException('Customer\'s phone value must be less than 30 characters.', static::EX_CODE);
+            throw new InvalidArgumentException('Customer\'s phone value must be less than 30 characters.', self::EX_CODE);
         }
 
         $this->phone = $phone;
@@ -111,7 +111,7 @@ public function setPhone(?string $phone): static
     public function setCountryCode(?string $countryCode): static
     {
         if ($countryCode && strlen($countryCode) !== 2) {
-            throw new InvalidArgumentException('Customer\'s country code value is invalid.', static::EX_CODE);
+            throw new InvalidArgumentException('Customer\'s country code value is invalid.', self::EX_CODE);
         }
 
         $this->countryCode = $countryCode;

src/VivaWalletPayment.php

@@ -204,12 +204,12 @@ public function setAllowRecurring(bool $allowRecurring): static
 
     public function setMaxInstallments(int $maxInstallments): static
     {
-        $this->maxInstallments = $maxInstallments;
-
         if ($maxInstallments < 0 || $maxInstallments > 36) {
             throw new InvalidArgumentException('maxInstallments value must be between 0 and 36');
         }
 
+        $this->maxInstallments = $maxInstallments;
+
         return $this;
     }
 
@@ -278,10 +278,11 @@ public function setMerchantTrns(?string $merchantTrns): static
     public function setTags(?array $tags): static
     {
         if ($tags) {
-            collect($tags)->each(
-                fn (mixed $tag) =>
-                is_string($tag) or throw new InvalidArgumentException('tags must be an array of strings.')
-            );
+            collect($tags)->each(function (mixed $tag) {
+                if (! is_string($tag)) {
+                    throw new InvalidArgumentException('tags must be an array of strings.');
+                }
+            });
         }
 
         $this->tags = $tags;
@@ -322,12 +323,10 @@ public function __construct(int $amount, ?VivaWalletCustomer $customer = null, ?
 
     public function setConfig(array $config): static
     {
-        $this->config = $config;
-
-        $configPayment = $this->config['payment'];
+        $configPayment = $config['payment'];
 
         $this
-            ->setEnv($this->config['env'])
+            ->setEnv($config['env'])
             ->setPreauth($configPayment['preauth'])
             ->setPaymentTimeOut($configPayment['timeout'])
             ->setDisableCash($configPayment['disable_cash'])

src/VivaWalletToken.php

@@ -6,6 +6,7 @@
 use Deyjandi\VivaWallet\Contracts\AuthToken;
 use Deyjandi\VivaWallet\Traits\HasClient;
 use Deyjandi\VivaWallet\Traits\HasEnv;
+use Illuminate\Support\Facades\Cache;
 
 class VivaWalletToken implements AuthToken
 {
@@ -14,8 +15,6 @@ class VivaWalletToken implements AuthToken
 
     private const CACHE_KEY = 'viva_wallet_token';
 
-    private string $method;
-
     private string $clientId;
 
     private string $clientSecret;
@@ -90,22 +89,27 @@ public function isExpired(): bool
 
     private function requestToken(): static
     {
-        $response = $this->request(...$this->env->requestToken());
+        $response = $this->request(
+            ...$this->env->requestToken(
+                $this->clientId,
+                $this->clientSecret
+            )
+        );
 
         $this->accessToken = $response['access_token'];
         $this->expiresIn = $response['expires_in'];
         $this->tokenType = $response['token_type'];
         $this->scope = $response['scope'];
         $this->issuedAt = CarbonImmutable::now();
 
-        cache([static::CACHE_KEY => $this], $this->issuedAt->addSeconds($this->expiresIn - 30));
+        Cache::put(self::CACHE_KEY, $this, $this->issuedAt->addSeconds($this->expiresIn - 30));
 
         return $this;
     }
 
     public static function getInstance(): static
     {
-        return cache(static::CACHE_KEY) ?? (new static())->requestToken();
+        return Cache::get(self::CACHE_KEY) ?? (new self())->requestToken();
     }
 
     public function refresh(): static

src/VivaWalletTransaction.php

@@ -14,8 +14,6 @@ class VivaWalletTransaction
 
     public function __construct(array $config)
     {
-        $this->config = $config;
-
         $this->setEnv($config['env']);
     }
 
@@ -24,12 +22,12 @@ public function __construct(array $config)
      *
      * @see https://developer.vivawallet.com/apis-for-payments/payment-api/#tag/Transactions/paths/~1checkout~1v2~1transactions~1{transactionId}/get
      */
-    public function retrieve(string $transaction_id): array
+    public function retrieve(string $transactionId): array
     {
-        if (! Uuid::isValid($transaction_id)) {
+        if (! Uuid::isValid($transactionId)) {
             throw new InvalidArgumentException('Transaction id is invalid.');
         }
 
-        return $this->request(...$this->env->retrieveTransaction($transaction_id));
+        return $this->request(...$this->env->retrieveTransaction($transactionId));
     }
 }

src/VivaWalletWebhook.php

@@ -10,25 +10,50 @@ class VivaWalletWebhook
     use HasClient;
     use HasEnv;
 
-    private string $api_key;
+    private string $merchantId;
+
+    private string $apiKey;
+
+    private ?string $webhookKey;
 
     public function __construct(array $config)
     {
         $this
             ->setEnv($config['env'])
+            ->setMerchantId($config['merchant_id'])
+            ->setApiKey($config['api_key'])
             ->setWebhookKey($config['webhook_key']);
     }
 
-    public function setWebhookKey(?string $webhook_key): static
+    public function setMerchantId(?string $merchantId): static
+    {
+        $this->merchantId = $merchantId;
+
+        return $this;
+    }
+
+    public function setApiKey(string $apiKey): static
+    {
+        $this->apiKey = $apiKey;
+
+        return $this;
+    }
+
+    public function setWebhookKey(?string $webhookKey): static
     {
-        $this->webhook_key = $webhook_key;
+        $this->webhookKey = $webhookKey;
 
         return $this;
     }
 
     public function requestKey(): string
     {
-        return $this->request(...$this->env->requestWebhookKey())['Key'];
+        return $this->request(
+            ...$this->env->requestWebhookKey(
+                $this->merchantId,
+                $this->apiKey
+            )
+        )['Key'];
     }
 
     public function verifyEndpointResponse(): array
@@ -38,6 +63,6 @@ public function verifyEndpointResponse(): array
             throw new \Exception('Webhook verification key not set.');
         }
 
-        return ['Key' => $this->webhook_key];
+        return ['Key' => $this->webhookKey];
     }
 }