Merge remote-tracking branch 'origin/master'

Conflicts:
	src/Bulk.php

Author: frankkessler

src/Bulk.php

@@ -73,7 +73,7 @@ public function runBatch($operation, $objectType, $data, $options = [])
         $time = time();
         $timeout = $time + $options['batchTimeout'];
 
-        if($options['Sforce-Enable-PKChunking']){
+        if ($options['Sforce-Enable-PKChunking']) {
             $batches = $this->allBatchDetails($job->id, $options['contentType']);
         }
 
@@ -89,8 +89,7 @@ public function runBatch($operation, $objectType, $data, $options = [])
 
                 $batch = $this->batchDetails($job->id, $batch->id, $options['contentType']);
                 if (in_array($batch->state, ['Completed', 'Failed', 'Not Processed', 'NotProcessed'])) {
-
-                    if(in_array($batch->state, ['Completed'])) {
+                    if (in_array($batch->state, ['Completed'])) {
                         $batchResult = $this->batchResult($job->id, $batch->id, $options['isBatchedResult'], null, $options['contentType']);
                         $batch->records = $batchResult->records;
                     }
@@ -126,7 +125,7 @@ public function runBatch($operation, $objectType, $data, $options = [])
      *
      * @return BulkJobResponse
      */
-    public function createJob($operation, $objectType, $externalIdFieldName = null, $contentType = 'JSON', $concurrencyMode = 'Parallel', $options=[])
+    public function createJob($operation, $objectType, $externalIdFieldName = null, $contentType = 'JSON', $concurrencyMode = 'Parallel', $options = [])
     {
         $url = '/services/async/'.SalesforceConfig::get('salesforce.api.version').'/job';
 
@@ -138,7 +137,7 @@ public function createJob($operation, $objectType, $externalIdFieldName = null,
 
         $headers = [];
 
-        if(isset($options['Sforce-Enable-PKChunking']) && $options['Sforce-Enable-PKChunking']){
+        if (isset($options['Sforce-Enable-PKChunking']) && $options['Sforce-Enable-PKChunking']) {
             $headers['Sforce-Enable-PKChunking'] = $this->parsePkChunkingHeader($options['Sforce-Enable-PKChunking']);
         }
 
@@ -161,7 +160,7 @@ public function createJob($operation, $objectType, $externalIdFieldName = null,
         return new BulkJobResponse();
     }
 
-    public function jobDetails($jobId, $format='json')
+    public function jobDetails($jobId, $format = 'json')
     {
         $url = '/services/async/'.SalesforceConfig::get('salesforce.api.version').'/job/'.$jobId;
 
@@ -209,7 +208,7 @@ public function closeJob($jobId)
      *
      * @return BulkBatchResponse
      */
-    public function addBatch($jobId, $data, $format='json')
+    public function addBatch($jobId, $data, $format = 'json')
     {
         if (!$jobId) {
             //throw exception
@@ -287,7 +286,7 @@ public function allBatchDetails($jobId, $format = 'json')
         ]);
 
         if ($result && is_array($result) && isset($result['batchInfo']) && !isset($result['batchInfo']['id'])) {
-            foreach($result['batchInfo'] as $batch) {
+            foreach ($result['batchInfo'] as $batch) {
                 $batches[] = new BulkBatchResponse($batch);
             }
         } else {
@@ -335,8 +334,8 @@ public function batchResult($jobId, $batchId, $isBatchedResult = false, $resultI
                 $result['records'] = [];
             }
 
-            if(isset($result['result'])){
-                if(!is_array($result['result'])){
+            if (isset($result['result'])) {
+                if (!is_array($result['result'])) {
                     $result['result'] = [$result['result']];
                 }
                 $result = array_merge($result, $result['result']);
@@ -523,16 +522,17 @@ protected function batchResponseFormatFromContentType($contentType)
 
     protected function parsePkChunkingHeader($pk_chunk_header)
     {
-        if(is_array($pk_chunk_header)){
+        if (is_array($pk_chunk_header)) {
             $header_parts = [];
-            foreach($pk_chunk_header as $key=>$value) {
+            foreach ($pk_chunk_header as $key => $value) {
                 $header_parts[] = $key.'='.$value;
             }
 
-            return implode('; ',$header_parts);
-        }elseif(in_array($pk_chunk_header, [true,'true','TRUE'])){
+            return implode('; ', $header_parts);
+        } elseif (in_array($pk_chunk_header, [true, 'true', 'TRUE'])) {
             return 'TRUE';
         }
+
         return 'FALSE';
     }
 }

tests/BulkTest.php

@@ -209,7 +209,7 @@ public function testRunPkChunkQueryBatch()
             new Response(200, [], $this->batchXml()),
             new Response(200, [], $this->batchListXml()),
             new Response(200, [], $this->batchXml('NotProcessed')),
-            new Response(200, [], $this->batchXml('Completed','8914000000B5YcIAAV','89040000006iLsVAAU')),
+            new Response(200, [], $this->batchXml('Completed', '8914000000B5YcIAAV', '89040000006iLsVAAU')),
             new Response(200, [], $this->dataQueryResultXml()),
             new Response(200, [], $this->dataQueryDataResultCsv()),
             new Response(200, [], json_encode($this->jobArray())),
@@ -232,18 +232,18 @@ public function testRunPkChunkQueryBatch()
         $query = "SELECT Id, Name FROM Account WHERE RecordTypeId='xxxxxxxxxxxxxx'";
 
         $job = $salesforce->bulk()->runBatch($operation, $objectType, $query, [
-            'contentType' => 'CSV',
+            'contentType'              => 'CSV',
             'Sforce-Enable-PKChunking' => [
                 'chunkSize' => 2500,
             ],
         ]);
 
         $this->assertEquals($jobId, $job->id);
 
-        $i=0;
+        $i = 0;
         foreach ($job->batches as $batch) {
             //second batch is the one with data
-            if($i==0){
+            if ($i == 0) {
                 $i++;
                 continue;
             }
@@ -476,7 +476,7 @@ public function requestDotTxtContents()
         ]';
     }
 
-    public function batchXml($state='Queued', $batchId='89040000006iLsVAAU', $jobId='750D00000004SkVIAU')
+    public function batchXml($state = 'Queued', $batchId = '89040000006iLsVAAU', $jobId = '750D00000004SkVIAU')
     {
         return '<?xml version="1.0" encoding="UTF-8"?><batchInfo xmlns="http://www.force.com/2009/06/asyncapi/dataload">
  <id>'.$batchId.'</id>