Merge pull request #13 from MichaelJ2324/master

Fixed Issue #12 + PHP 5.5+ Testing
sugarcrm · Mar 25, 2017 · e9fa22b · e9fa22b
2 parents 4db1fc5 + c7a5b7f
commit e9fa22b
Show file tree

Hide file tree

Showing 8 changed files with 47 additions and 16 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,5 @@
 *.iml
 .idea/
 vendor/
+
+composer.lock
diff --git a/.travis.yml b/.travis.yml
@@ -3,6 +3,10 @@ language: php
 php:
   - '5.3'
   - '5.4'
+  - '5.5'
+  - '5.6'
+  - '7.0'
+  - '7.1'
 
 install:
   - composer require satooshi/php-coveralls:~1.0@stable
@@ -13,7 +17,7 @@ before_script:
   - composer install --prefer-source --no-interaction --dev
 
 script:
-  - phpunit --coverage-clover build/logs/clover.xml
+  - vendor/bin/phpunit --coverage-clover build/logs/clover.xml
 
 after_success:
   - sh -c 'if [ "$TRAVIS_PHP_VERSION" != "hhvm" ]; then php vendor/bin/coveralls -v; fi;'
diff --git a/src/Endpoint/POST/ModuleRecordFileField.php b/src/Endpoint/POST/ModuleRecordFileField.php
@@ -64,7 +64,10 @@ protected function configureData($data)
     protected function setFileFieldValue($value)
     {
         if (version_compare(PHP_VERSION, '5.5.0') >= 0){
-            $value = new \CURLFile($value);
+            if (!($value instanceof \CURLFile)){
+                $value = str_replace("@",'',$value);
+                $value = new \CURLFile($value);
+            }
         } else {
             if (strpos($value, '@') === false) {
                 $value = '@'.$value;

diff --git a/src/Helpers/Helpers.php b/src/Helpers/Helpers.php
@@ -19,13 +19,12 @@ class Helpers
     public static function configureAPIURL($instance, $version = null)
     {
         $url = 0;
-        $instance = strtolower(rtrim($instance, "/"));
         $version = ($version === null ? self::API_VERSION : intval($version));
-        if (preg_match('/^(http|https):\/\//i', $instance) === 0) {
-            $instance = "http://".$instance;
-        }
         $instance = preg_replace('/\/rest\/v\d+/', '', $instance);
-        $url = $instance.sprintf(self::API_URL, $version);
+        $url = rtrim($instance,"/").sprintf(self::API_URL, $version);
+        if (preg_match('/^(http|https):\/\//i', $url) === 0) {
+            $url = "http://".$url;
+        }
         return $url;
     }
 

diff --git a/tests/Clients/AbstractSugarClientTest.php b/tests/Clients/AbstractSugarClientTest.php
@@ -122,10 +122,14 @@ public function testSetServer($Stub){
         $Stub->setServer('https://tester.test.com');
         $this->assertEquals('https://tester.test.com',$Stub->getServer());
         $this->assertEquals("https://tester.test.com/rest/v10/",$Stub->getAPIUrl());
+        $Stub->setServer('https://tester.test.com/SugarTest');
+        $this->assertEquals('https://tester.test.com/SugarTest',$Stub->getServer());
+        $this->assertEquals("https://tester.test.com/SugarTest/rest/v10/",$Stub->getAPIUrl());
         $Stub->setServer($this->server);
         $this->assertEquals($this->server,$Stub->getServer());
         $this->assertEquals("http://".$this->server."/rest/v10/",$Stub->getAPIUrl());
 
+
         return $Stub;
     }
 

diff --git a/tests/Endpoint/POST/ModuleRecordFileFieldTest.php b/tests/Endpoint/POST/ModuleRecordFileFieldTest.php
@@ -29,11 +29,11 @@ public static function tearDownAfterClass()
         '1234abc',
         'filename'
     );
-    protected $data;
+    protected $data = '';
 
     public function setUp()
     {
-        $this->data = __FILE__;
+        $this->data = realpath(__FILE__);
         parent::setUp();
     }
 
@@ -51,11 +51,20 @@ public function testConfigureData(){
         $EP = new ModuleRecordFileField($this->url,$this->options);
         $EP->execute($this->data);
 
-        $configuredData = array(
-            'filename' => '@'.__FILE__,
-            'format' => 'sugar-html-json',
-            'delete_if_fails' => false
-        );
+        if (version_compare(PHP_VERSION, '5.5.0') >= 0){
+            $configuredData = array(
+                'filename' => new \CURLFile(__FILE__),
+                'format' => 'sugar-html-json',
+                'delete_if_fails' => false
+            );
+        } else {
+            $configuredData = array(
+                'filename' => '@'.__FILE__,
+                'format' => 'sugar-html-json',
+                'delete_if_fails' => false
+            );
+        }
+
         $this->assertEquals($configuredData,$EP->getData());
         unset($EP);
 
@@ -74,6 +83,7 @@ public function testConfigureData(){
         unset($EP);
 
         $EP = new ModuleRecordFileField($this->url,$this->options);
+
         $data = array(
             'filename' => '@'.$this->data,
             'delete_if_fails' => true

diff --git a/tests/Helpers/HelpersTest.php b/tests/Helpers/HelpersTest.php
@@ -75,6 +75,11 @@ public function testConfigureAPIUrl()
         $this->assertEquals('http://localhost/rest/v10/',Helpers::configureAPIURL('http://localhost/rest/v10/rest/v10/rest/v10','10'));
         $this->assertEquals('http://localhost/rest/v10/',Helpers::configureAPIURL('http://localhost/rest/v10/rest/v10/rest/v10',10));
         $this->assertEquals('http://localhost/rest/v11/',Helpers::configureAPIURL('http://localhost/rest/v10/rest/v10/rest/v10',11));
+        $this->assertEquals('https://localhost/SugarTest/rest/v11/',Helpers::configureAPIURL('https://localhost/SugarTest/rest/v10/',11));
+        $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));
+
     }
 
     /**

diff --git a/tests/Request/AbstractRequestTest.php b/tests/Request/AbstractRequestTest.php
@@ -203,7 +203,9 @@ public function testCurl(){
         $this->assertEquals(RequestStub::STATUS_INIT,$Stub->getCurlStatus());
         $Stub->close();
         $this->assertEquals(RequestStub::STATUS_CLOSED,$Stub->getCurlStatus());
-        $this->assertNotEquals('resource',gettype($CurlObject));
+        if (strpos(PHP_VERSION,'7.0') === FALSE) {
+            $this->assertNotEquals('curl', get_resource_type($CurlObject));
+        }
         $Stub->start();
         $this->assertEquals(RequestStub::STATUS_INIT,$Stub->getCurlStatus());
         $this->assertNotEquals($CurlObject,$Stub->getCurlObject());
@@ -237,6 +239,8 @@ public function testDestructor(){
         $Stub = new RequestStub($this->url);
         $CurlObject = $Stub->getCurlObject();
         unset($Stub);
-        $this->assertNotEquals('resource',gettype($CurlObject));
+        if (strpos(PHP_VERSION,'7.0') === FALSE){
+            $this->assertEquals(FALSE,is_resource($CurlObject));
+        }
     }
 }