Merge pull request #149 from bpedro/feature/attach-with-mime-type

Nate Good · Nate Good · commit 72a808b39adf · 2014-12-19T11:33:02.000-05:00
Discover and include mime type when attaching files.
diff --git a/src/Httpful/Request.php b/src/Httpful/Request.php
@@ -392,11 +392,13 @@ public function expectsType($mime)
 
     public function attach($files)
     {
+        $finfo = finfo_open(FILEINFO_MIME_TYPE);
         foreach ($files as $key => $file) {
+            $mimeType = finfo_file($finfo, $file);
             if (function_exists('curl_file_create')) {
-                $this->payload[$key] = curl_file_create($file);
+                $this->payload[$key] = curl_file_create($file, $mimeType);
             } else {
-                $this->payload[$key] = "@{$file}";
+                $this->payload[$key] = '@' . $file . ';type=' . $mimeType;
             }
         }
         $this->sendsType(Mime::UPLOAD);
diff --git a/tests/Httpful/HttpfulTest.php b/tests/Httpful/HttpfulTest.php
@@ -322,13 +322,14 @@ function testParsingContentTypeUpload()
 
     function testAttach() {
         $req = Request::init();
-
-        $req->attach(array('index' => '/dir/filename'));
+        $testsPath = realpath(dirname(__FILE__) . DIRECTORY_SEPARATOR . '..');
+        $filename = $testsPath . DIRECTORY_SEPARATOR . 'test_image.jpg';
+        $req->attach(array('index' => $filename));
         $payload = $req->payload['index'];
         // PHP 5.5  + will take advantage of CURLFile while previous
         // versions just use the string syntax
         if (is_string($payload)) {
-            $this->assertEquals($payload, '@/dir/filename');
+            $this->assertEquals($payload, '@' . $filename . ';type=image/jpeg');
         } else {
             $this->assertInstanceOf('CURLFile', $payload);
         }
diff --git a/tests/test_image.jpg b/tests/test_image.jpg

Original file line number	Diff line number	Diff line change
`@@ -392,11 +392,13 @@ public function expectsType($mime)`
`392`	`392`
`393`	`393`	`public function attach($files)`
`394`	`394`	`{`
	`395`	`+ $finfo = finfo_open(FILEINFO_MIME_TYPE);`
`395`	`396`	`foreach ($files as $key => $file) {`
	`397`	`+ $mimeType = finfo_file($finfo, $file);`
`396`	`398`	`if (function_exists('curl_file_create')) {`
`397`		`- $this->payload[$key] = curl_file_create($file);`
	`399`	`+ $this->payload[$key] = curl_file_create($file, $mimeType);`
`398`	`400`	`} else {`
`399`		`- $this->payload[$key] = "@{$file}";`
	`401`	`+ $this->payload[$key] = '@' . $file . ';type=' . $mimeType;`
`400`	`402`	`}`
`401`	`403`	`}`
`402`	`404`	`$this->sendsType(Mime::UPLOAD);`