Merge pull request #147 from paynl/feature/PLUG-691

PLUG-691 - Version overrule
paynl · Oct 12, 2021 · 88e392d · 88e392d
2 parents 756f43f + f8d1461
commit 88e392d
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/src/Api/Api.php b/src/Api/Api.php
@@ -48,7 +48,7 @@ public function doRequest($endpoint, $version = null)
         if ($version === null) {
             $version = $this->version;
         }
-
+      
         $auth = $this->getAuth();
         $data = $this->getData();
         $uri = Config::getApiUrl($endpoint, (int) $version);

diff --git a/src/Config.php b/src/Config.php
@@ -42,6 +42,11 @@ class Config
      */
     private static $apiVersion = 5;
 
+    /**
+     * @var bool Boolean to force using the API version set by this config.
+     */
+    private static $forceApiVersion = false;
+
     private static $curl;
 
     /**
@@ -169,14 +174,16 @@ public static function setServiceId($serviceId)
     public static function getApiVersion()
     {
         return self::$apiVersion;
-    }
+    }   
 
     /**
      * @param string $apiVersion The API version to use for requests.
+     * @param bool $forceUse Set to true if you want to force using this version.
      */
-    public static function setApiVersion($apiVersion)
+    public static function setApiVersion($apiVersion, $forceUse = false)
     {
         self::$apiVersion = (int) $apiVersion;
+        self::$forceApiVersion = $forceUse;
     }
 
     /**
@@ -187,9 +194,9 @@ public static function setApiVersion($apiVersion)
      */
     public static function getApiUrl($endpoint, $version = null)
     {
-        if ($version === null) {
+        if ($version === null || self::$forceApiVersion) {
             $version = self::$apiVersion;
-        }
+        }        
         return self::$apiBase . '/v' . $version . '/' . $endpoint . '/json';
     }