Using the Content-Type of the EntityBody if one cannot be determined …

…by the request path
guzzle · Apr 7, 2013 · 6f044c5 · 6f044c5
1 parent 863998b
commit 6f044c5
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 6 deletions.
diff --git a/src/Guzzle/Http/EntityBody.php b/src/Guzzle/Http/EntityBody.php
@@ -142,9 +142,9 @@ public function getContentLength()
      */
     public function getContentType()
     {
-        return (!($this->isLocal() && $this->getWrapper() == 'plainfile' && file_exists($this->getUri())))
+        return ($this->isLocal() && $this->getWrapper() == 'plainfile' && file_exists($this->getUri()))
-            ? null
+            ? Mimetypes::getInstance()->fromFilename($this->getUri())
-            : Mimetypes::getInstance()->fromFilename($this->getUri());
+            : null;
     }
 
     /**

diff --git a/src/Guzzle/Http/Message/EntityEnclosingRequest.php b/src/Guzzle/Http/Message/EntityEnclosingRequest.php
@@ -81,7 +81,7 @@ public function setBody($body, $contentType = null, $tryChunkedTransfer = false)
 
         // Auto detect the Content-Type from the path of the request if possible
         if ($contentType === null && !$this->hasHeader('Content-Type')) {
-            $contentType = Mimetypes::getInstance()->fromFilename($this->getPath());
+            $contentType = Mimetypes::getInstance()->fromFilename($this->getPath()) ?: $this->body->getContentType();
         }
 
         if ($contentType) {

diff --git a/tests/Guzzle/Tests/Http/Message/EntityEnclosingRequestTest.php b/tests/Guzzle/Tests/Http/Message/EntityEnclosingRequestTest.php
@@ -525,10 +525,20 @@ public function testCanDisableRedirects()
     /**
      * @covers Guzzle\Http\Message\EntityEnclosingRequest::setBody
      */
-    public function testSetsContentTypeWhenSettingBodyByGuessing()
+    public function testSetsContentTypeWhenSettingBodyByGuessingFromPath()
     {
         $request = new EntityEnclosingRequest('PUT', 'http://test.com/foo.json');
         $request->setBody('{"a":"b"}');
-        $this->assertEquals('application/json', $request->getHeader('Content-Type'));
+        $this->assertEquals('application/json', (string) $request->getHeader('Content-Type'));
+    }
+
+    /**
+     * @covers Guzzle\Http\Message\EntityEnclosingRequest::setBody
+     */
+    public function testSetsContentTypeWhenSettingBodyByGuessingFromEntityBody()
+    {
+        $request = new EntityEnclosingRequest('PUT', 'http://test.com/foo');
+        $request->setBody(EntityBody::factory(fopen(__FILE__, 'r')));
+        $this->assertEquals('text/x-php', (string) $request->getHeader('Content-Type'));
     }
 }