Merge remote-tracking branch 'origin/master'

Author: frankkessler

LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2017 Progyny, Inc & Frank Kessler
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

src/Bulk.php

@@ -4,7 +4,6 @@
 
 use Frankkessler\Salesforce\Client\BulkClient;
 use Frankkessler\Salesforce\DataObjects\BinaryBatch;
-use Frankkessler\Salesforce\Interfaces\BulkBatchProcessorInterface;
 use Frankkessler\Salesforce\Responses\Bulk\BulkBatchResponse;
 use Frankkessler\Salesforce\Responses\Bulk\BulkBatchResultResponse;
 use Frankkessler\Salesforce\Responses\Bulk\BulkJobResponse;
@@ -46,7 +45,7 @@ public function runBatch($operation, $objectType, $data, $options = [])
             'isBatchedResult'           => false,
             'concurrencyMode'           => 'Parallel',
             'Sforce-Enable-PKChunking'  => false,
-            'batchProcessor'    => null,
+            'batchProcessor'            => null,
         ];
 
         $options = array_replace($defaults, $options);
@@ -93,9 +92,9 @@ public function runBatch($operation, $objectType, $data, $options = [])
                 if (in_array($batch->state, ['Completed', 'Failed', 'Not Processed', 'NotProcessed'])) {
                     if (in_array($batch->state, ['Completed'])) {
                         $batchResult = $this->batchResult($job->id, $batch->id, $options['isBatchedResult'], null, $options['contentType']);
-                        if(class_exists($options['batchProcessor']) && class_implements($options['batchProcessor'], '\Frankkessler\Salesforce\Interfaces\BulkBatchProcessorInterface')){
+                        if (class_exists($options['batchProcessor']) && class_implements($options['batchProcessor'], '\Frankkessler\Salesforce\Interfaces\BulkBatchProcessorInterface')) {
                             call_user_func([$options['batchProcessor'], 'process'], $batchResult);
-                        }else {
+                        } else {
                             $batch->records = $batchResult->records;
                         }
                     }

tests/BulkBatchProcessor.php

@@ -11,4 +11,4 @@ public static function process(BulkBatchResultResponse $batchResult)
     {
         static::$records = array_merge(static::$records, $batchResult->records);
     }
-}
+}

tests/BulkTest.php

@@ -295,7 +295,7 @@ public function testRunPkChunkQueryBatchWithBatchProcessor()
 
         $this->assertEquals(2, count(BulkBatchProcessor::$records));
 
-        foreach(BulkBatchProcessor::$records as $record){
+        foreach (BulkBatchProcessor::$records as $record) {
             $this->assertEquals($firstAccountId, $record['Id']);
             break;
         }