Merge pull request #48 from MichaelJ2324/2.0

SUPP-1841  - Fix Bulk Request Handling oh PHP 7.3

Author: anthonyxwatson

src/Endpoint/Data/BulkRequest.php

@@ -42,7 +42,20 @@ public function asArray($compile = TRUE){
                         $request = $value;
                     }
                     if ($request instanceof AbstractRequest) {
-                        $compiled[self::BULK_REQUEST_DATA_NAME][] = $this->extractRequest($request);
+                        $request = $this->extractRequest($request);
+                        if ($request){
+                            $compiled[self::BULK_REQUEST_DATA_NAME][] = $request;
+                        }
+                    } else {
+                        if (isset($request->url)
+                            && isset($request->method)){
+                            $compiled = array(
+                                'url' => $request->url,
+                                'method' => $request->method,
+                                'headers' => isset($request->headers)?$request->headers:array(),
+                                'data' => isset($request->data)?$request->data:""
+                            );
+                        }
                     }
                 }
             }
@@ -57,13 +70,16 @@ public function asArray($compile = TRUE){
      */
     protected function extractRequest(AbstractRequest $Request){
         $curlOptions = $Request->getCurlOptions();
-        $url = $curlOptions[CURLOPT_URL];
+        $url = isset($curlOptions[CURLOPT_URL])?$curlOptions[CURLOPT_URL]:"";
+        if (empty($url)){
+            return false;
+        }
         $urlArray = explode("/rest/",$url);
         return array(
             'url' => "/".$urlArray[1],
             'method' => $Request->getMethod(),
-            'headers' => $curlOptions[CURLOPT_HTTPHEADER],
-            'data' => $curlOptions[CURLOPT_POSTFIELDS]
+            'headers' => isset($curlOptions[CURLOPT_HTTPHEADER])?$curlOptions[CURLOPT_HTTPHEADER]:array(),
+            'data' => isset($curlOptions[CURLOPT_POSTFIELDS])?$curlOptions[CURLOPT_POSTFIELDS]:null
         );
     }
 }

tests/Endpoint/Data/BulkRequestTest.php

@@ -115,5 +115,21 @@ public function testExtractRequest(){
         $this->assertArrayHasKey('headers',$result);
         $this->assertArrayHasKey('data',$result);
         $this->assertEquals(json_encode(array('foo'=>'bar')),$result['data']);
+
+        $Data = new BulkRequest();
+        $ReflectedData = new \ReflectionClass('Sugarcrm\\REST\\Endpoint\\Data\\BulkRequest');
+        $extractRequest = $ReflectedData->getMethod('extractRequest');
+        $extractRequest->setAccessible(TRUE);
+        $Request = new JSON();
+        $Request->setURL('http://localhost/rest/v10/Accounts');
+        $Request->setMethod(JSON::HTTP_GET);
+        $result = $extractRequest->invoke($Data,$Request);
+        $this->assertArrayHasKey('url',$result);
+        $this->assertEquals('/v10/Accounts',$result['url']);
+        $this->assertArrayHasKey('method',$result);
+        $this->assertEquals(JSON::HTTP_GET,$result['method']);
+        $this->assertArrayHasKey('headers',$result);
+        $this->assertArrayHasKey('data',$result);
+        $this->assertEquals(null,$result['data']);
     }
 }