[Headers] Automatically add content-type when there are datas

egeloen · Apr 19, 2015 · 19a0e44 · 19a0e44
1 parent 2b5a91a
commit 19a0e44
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/src/AbstractHttpAdapter.php b/src/AbstractHttpAdapter.php
@@ -76,6 +76,7 @@ protected function prepareHeaders(
         }
 
         if (!$internalRequest->hasHeader('Content-Type')) {
+            $rawDatas = (string) $internalRequest->getBody();
             $datas = $internalRequest->getDatas();
             $files = $internalRequest->getFiles();
 
@@ -89,7 +90,7 @@ protected function prepareHeaders(
                     'Content-Type',
                     ConfigurationInterface::ENCODING_TYPE_FORMDATA.'; boundary='.$this->configuration->getBoundary()
                 );
-            } elseif ($contentType && !empty($datas)) {
+            } elseif ($contentType && (!empty($datas) || !empty($rawDatas))) {
                 $internalRequest = $internalRequest->withHeader(
                     'Content-Type',
                     ConfigurationInterface::ENCODING_TYPE_URLENCODED

diff --git a/tests/AbstractHttpAdapterTest.php b/tests/AbstractHttpAdapterTest.php
@@ -171,10 +171,6 @@ public function testSendRequest($uri, $method, array $headers = array(), array $
             http_build_query($data, null, '&')
         );
 
-        if (!empty($data)) {
-            $this->httpAdapter->getConfiguration()->setEncodingType(ConfigurationInterface::ENCODING_TYPE_URLENCODED);
-        }
-
         $options = array();
         if ($method === Request::METHOD_HEAD) {
             $options['body'] = null;