Fix upload chunk size configuration handling

const-cloudinary · const-cloudinary · commit 349436c3f972 · 2021-10-18T15:41:41.000-07:00
diff --git a/src/Api/ApiClient.php b/src/Api/ApiClient.php
@@ -265,10 +265,7 @@ public function postFileAsync($endPoint, $file, $parameters, $options = [])
 
         $size = $fileHandle->getSize();
 
-        $options[ApiConfig::CHUNK_SIZE] = min(
-            $this->api->chunkSize,
-            ArrayUtils::get($options, ApiConfig::CHUNK_SIZE, ApiConfig::DEFAULT_CHUNK_SIZE)
-        );
+        $options[ApiConfig::CHUNK_SIZE] = ArrayUtils::get($options, ApiConfig::CHUNK_SIZE, $this->api->chunkSize);
 
         $options[ApiConfig::TIMEOUT] = ArrayUtils::get($options, ApiConfig::TIMEOUT, $this->api->uploadTimeout);
 
diff --git a/tests/Helpers/MockApiClient.php b/tests/Helpers/MockApiClient.php
@@ -45,7 +45,7 @@ public function __construct($configuration = null)
             ]
         );
 
-        $config = $this->httpClient->getConfig();
+        $config            = $this->httpClient->getConfig();
         $config['handler'] = HandlerStack::create($this->mockHandler);
 
         $this->httpClient = new Client($config);
@@ -65,6 +65,16 @@ protected function callAsync($method, $endPoint, $options)
         return parent::callAsync($method, $endPoint, $options);
     }
 
+    /**
+     * Returns request options.
+     *
+     * @return array
+     */
+    public function getRequestOptions()
+    {
+        return $this->requestOptions;
+    }
+
     /**
      * Returns request multipart options.
      *
@@ -82,6 +92,7 @@ static function ($options, $item) {
                 $options[$item['name']] = $item['contents'] instanceof Stream
                     ? $item['contents']->getContents()
                     : $item['contents'];
+
                 return $options;
             }
         );
diff --git a/tests/Unit/Upload/UploadApiTest.php b/tests/Unit/Upload/UploadApiTest.php
@@ -11,6 +11,8 @@
 namespace Cloudinary\Test\Unit\Upload;
 
 use Cloudinary\Api\Exception\ApiError;
+use Cloudinary\Configuration\ApiConfig;
+use Cloudinary\Configuration\Configuration;
 use Cloudinary\Test\Helpers\MockUploadApi;
 use Cloudinary\Test\Helpers\RequestAssertionsTrait;
 use Cloudinary\Test\Unit\Asset\AssetTestCase;
@@ -20,6 +22,8 @@
  */
 final class UploadApiTest extends AssetTestCase
 {
+    const TEST_CHUNK_SIZE = 7357;
+
     use RequestAssertionsTrait;
 
     /**
@@ -61,4 +65,48 @@ public function testDownloadBackedupAsset()
         self::assertContains('asset_id', $url);
         self::assertContains('version_id', $url);
     }
+
+    /**
+     * Should use default chunk size.
+     *
+     * @throws ApiError
+     */
+    public function testUploadDefaultChunkSize()
+    {
+        $mockUploadApi = new MockUploadApi();
+        $mockUploadApi->upload(self::TEST_BASE64_IMAGE);
+        $lastOptions = $mockUploadApi->getApiClient()->getRequestOptions();
+
+        self::assertArraySubset(['chunk_size' => ApiConfig::DEFAULT_CHUNK_SIZE], $lastOptions);
+    }
+
+    /**
+     * Should support setting custom chunk size.
+     *
+     * @throws ApiError
+     */
+    public function testUploadCustomChunkSizeOptions()
+    {
+        $mockUploadApi = new MockUploadApi();
+        $mockUploadApi->upload(self::TEST_BASE64_IMAGE, ['chunk_size' => self::TEST_CHUNK_SIZE]);
+        $lastOptions = $mockUploadApi->getApiClient()->getRequestOptions();
+
+        self::assertArraySubset(['chunk_size' => self::TEST_CHUNK_SIZE], $lastOptions);
+    }
+
+    /**
+     * Should support setting custom chunk size in config.
+     *
+     * @throws ApiError
+     */
+    public function testUploadCustomChunkSizeConfig()
+    {
+        Configuration::instance()->api->chunkSize = self::TEST_CHUNK_SIZE;
+
+        $mockUploadApi = new MockUploadApi();
+        $mockUploadApi->upload(self::TEST_BASE64_IMAGE);
+        $lastOptions = $mockUploadApi->getApiClient()->getRequestOptions();
+
+        self::assertArraySubset(['chunk_size' => self::TEST_CHUNK_SIZE], $lastOptions);
+    }
 }
