Moved retry fields validation in RequestConfig.php

world4youcom · Jul 22, 2024 · 514bb0c · 514bb0c
1 parent 300013d
commit 514bb0c
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 15 deletions.
diff --git a/lib/SaferpayJson/Request/Container/RequestHeader.php b/lib/SaferpayJson/Request/Container/RequestHeader.php
@@ -4,14 +4,11 @@
 
 namespace Ticketpark\SaferpayJson\Request\Container;
 
-use InvalidArgumentException;
 use JMS\Serializer\Annotation\SerializedName;
+use Ticketpark\SaferpayJson\Request\RequestConfig;
 
 final class RequestHeader
 {
-    private const MIN_RETRY_INDICATOR = 0;
-    private const MAX_RETRY_INDICATOR = 9;
-
     /**
      * @SerializedName("SpecVersion")
      */
@@ -37,19 +34,12 @@ final class RequestHeader
      */
     private ?ClientInfo $clientInfo = null;
 
-    public function __construct(string $customerId, string $requestId = null, int $retryIndicator = self::MIN_RETRY_INDICATOR)
+    public function __construct(
+        string $customerId,
+        string $requestId = null,
+        int    $retryIndicator = RequestConfig::MIN_RETRY_INDICATOR)
     {
         $this->customerId = $customerId;
-
-        if ($retryIndicator < self::MIN_RETRY_INDICATOR || $retryIndicator > self::MAX_RETRY_INDICATOR) {
-            throw new InvalidArgumentException('Retry indicator range: inclusive between '
-                . self::MIN_RETRY_INDICATOR . '  and ' . self::MAX_RETRY_INDICATOR);
-        }
-
-        if ($retryIndicator > self::MIN_RETRY_INDICATOR && $requestId === null) {
-            throw new InvalidArgumentException('Request id must be set if retry indicator is greater than 0');
-        }
-
         $this->requestId = $requestId;
         $this->retryIndicator = $retryIndicator;
 

diff --git a/lib/SaferpayJson/Request/RequestConfig.php b/lib/SaferpayJson/Request/RequestConfig.php
@@ -5,9 +5,13 @@
 namespace Ticketpark\SaferpayJson\Request;
 
 use GuzzleHttp\Client;
+use InvalidArgumentException;
 
 final class RequestConfig
 {
+    public const MIN_RETRY_INDICATOR = 0;
+    public const MAX_RETRY_INDICATOR = 9;
+
     private string $apiKey;
     private string $apiSecret;
     private string $customerId;
@@ -28,6 +32,16 @@ public function __construct(
         $this->apiSecret = $apiSecret;
         $this->customerId = $customerId;
         $this->test = $test;
+
+        if ($retryIndicator < self::MIN_RETRY_INDICATOR || $retryIndicator > self::MAX_RETRY_INDICATOR) {
+            throw new InvalidArgumentException('Retry indicator range: inclusive between '
+                . self::MIN_RETRY_INDICATOR . '  and ' . self::MAX_RETRY_INDICATOR);
+        }
+
+        if ($retryIndicator > self::MIN_RETRY_INDICATOR && $requestId === null) {
+            throw new InvalidArgumentException('Request id must be set if retry indicator is greater than 0');
+        }
+
         $this->requestId = $requestId;
         $this->retryIndicator = $retryIndicator;
     }