'Allow specifying the file's content type, fallback to b2/x-auto

cwhite92 · Feb 17, 2016 · 4eb97c3 · 4eb97c3
1 parent ea76d14
commit 4eb97c3
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/Client.php b/src/Client.php
@@ -197,7 +197,9 @@ public function upload(array $options)
             $options['FileLastModified'] = round(microtime(true) * 1000);
         }
 
-        $options['FileContentType'] = 'application/octet-stream';
+        if (!isset($options['FileContentType'])) {
+            $options['FileContentType'] = 'b2/x-auto';
+        }
 
         $response = $this->client->request('POST', $uploadEndpoint, [
             'headers' => [

diff --git a/tests/ClientTest.php b/tests/ClientTest.php
@@ -270,7 +270,7 @@ public function testUploadingString()
         $this->assertInstanceOf(Stream::class, $uploadRequest->getBody());
     }
 
-    public function testUploadingWithCustomMimeAndLastModified()
+    public function testUploadingWithCustomContentTypeAndLastModified()
     {
         $container = [];
         $history = Middleware::history($container);
@@ -284,11 +284,13 @@ public function testUploadingWithCustomMimeAndLastModified()
 
         // My birthday :)
         $lastModified =  701568000000;
+        $contentType = 'text/plain';
 
         $file = $client->upload([
             'BucketId' => 'bucketId',
             'FileName' => 'test.txt',
             'Body' => 'Test file content',
+            'FileContentType' => $contentType,
             'FileLastModified' => $lastModified
         ]);
 
@@ -297,6 +299,7 @@ public function testUploadingWithCustomMimeAndLastModified()
         // We'll also check the Guzzle history to make sure the upload request got created correctly.
         $uploadRequest = $container[2]['request'];
         $this->assertEquals($lastModified, $uploadRequest->getHeader('X-Bz-Info-src_last_modified_millis')[0]);
+        $this->assertEquals($contentType, $uploadRequest->getHeader('Content-Type')[0]);
         $this->assertInstanceOf(Stream::class, $uploadRequest->getBody());
     }