Merge pull request #41 from MichaelJ2324/master

SUPP-1025 - Issue #37 - Allow for v11 minor versions in API
sugarcrm · Feb 6, 2019 · aecc3e8 · aecc3e8
2 parents 84a934e + 484c126
commit aecc3e8
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/src/Client/Abstracts/AbstractSugarClient.php b/src/Client/Abstracts/AbstractSugarClient.php
@@ -87,7 +87,7 @@ protected function setAPIUrl()
      */
     public function setVersion($version)
     {
-        $this->apiVersion = intval($version);
+        $this->apiVersion = $version;
         $this->setAPIUrl();
         return $this;
     }

diff --git a/src/Helpers/Helpers.php b/src/Helpers/Helpers.php
@@ -8,7 +8,7 @@
 class Helpers
 {
     const API_VERSION = 10;
-    const API_URL = '/rest/v%d/';
+    const API_URL = '/rest/v%s/';
 
     /**
      * Given a sugarcrm server/instance generate the Rest/v10 API Url
@@ -19,8 +19,8 @@ class Helpers
     public static function configureAPIURL($instance, $version = null)
     {
         $url = 0;
-        $version = ($version === null ? self::API_VERSION : intval($version));
-        $instance = preg_replace('/\/rest\/v\d+/', '', $instance);
+        $version = ($version === null ? self::API_VERSION : $version);
+        $instance = preg_replace('/\/rest\/v.+/', '', $instance);
         $url = rtrim($instance,"/").sprintf(self::API_URL, $version);
         if (preg_match('/^(http|https):\/\//i', $url) === 0) {
             $url = "http://".$url;

diff --git a/tests/Clients/AbstractSugarClientTest.php b/tests/Clients/AbstractSugarClientTest.php
@@ -152,6 +152,9 @@ public function testSetVersion($Stub){
         $Stub->setVersion(11);
         $this->assertEquals("http://localhost/rest/v11/",$Stub->getAPIUrl());
         $this->assertEquals(11,$Stub->getVersion());
+        $Stub->setVersion('11_4');
+        $this->assertEquals("http://localhost/rest/v11_4/",$Stub->getAPIUrl());
+        $this->assertEquals('11_4',$Stub->getVersion());
         return $Stub;
     }
 

diff --git a/tests/Helpers/HelpersTest.php b/tests/Helpers/HelpersTest.php
@@ -79,6 +79,7 @@ public function testConfigureAPIUrl()
         $this->assertEquals('http://localhost/Sugar/Test/rest/v10/',Helpers::configureAPIURL('http://localhost/Sugar/Test/rest/v10/rest/v10/rest/v10','10'));
         $this->assertEquals('http://localhost/SugarTest/rest/v10/',Helpers::configureAPIURL('http://localhost/SugarTest/rest/v10/rest/v10/rest/v10',10));
         $this->assertEquals('http://localhost/SugarTest/rest/v11/',Helpers::configureAPIURL('http://localhost/SugarTest/rest/v10/rest/v10/rest/v10',11));
+        $this->assertEquals('http://localhost/SugarTest/rest/v11_1/',Helpers::configureAPIURL('http://localhost/SugarTest/rest/v10/rest/v10/rest/v10','11_1'));
 
     }