Request body can be send with any method except GET, HEAD and TRACE.

Author: mekras

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Change Log
 
+## Unreleased
+
+### Changed
+
+- Request body can be send with any method except GET, HEAD and TRACE.
+
 ## 1.4.2 - 2016-06-14
 
 ### Added

src/Client.php

@@ -202,8 +202,15 @@ private function createCurlOptions(RequestInterface $request, ResponseBuilder $r
         $options[CURLOPT_HTTP_VERSION] = $this->getProtocolVersion($request->getProtocolVersion());
         $options[CURLOPT_URL] = (string) $request->getUri();
 
-        if (in_array($request->getMethod(), ['OPTIONS', 'POST', 'PUT'], true)) {
-            // cURL allows request body only for these methods.
+        /*
+         * Add body to request. Some HTTP methods can not have payload:
+         *
+         * - GET — cURL will automatically change method to PUT or POST if we set CURLOPT_UPLOAD or
+         *   CURLOPT_POSTFIELDS.
+         * - HEAD — cURL treats HEAD as GET request with a same restrictions.
+         * - TRACE — According to RFC7231: a client MUST NOT send a message body in a TRACE request.
+         */
+        if (!in_array($request->getMethod(), ['GET', 'HEAD', 'TRACE'], true)) {
             $body = $request->getBody();
             $bodySize = $body->getSize();
             if ($bodySize !== 0) {
@@ -225,6 +232,7 @@ private function createCurlOptions(RequestInterface $request, ResponseBuilder $r
         }
 
         if ($request->getMethod() === 'HEAD') {
+            // This will set HTTP method to "HEAD".
             $options[CURLOPT_NOBODY] = true;
         } elseif ($request->getMethod() !== 'GET') {
             // GET is a default method. Other methods should be specified explicitly.

tests/HttpAsyncClientTestCase.php

@@ -17,7 +17,7 @@ public function testAsyncSendRequest($method, $uri, array $headers, $body)
         if (defined('HHVM_VERSION')) {
             static::markTestSkipped('This test can not run under HHVM');
         }
-        if (null !== $body && !in_array($method, ['OPTIONS', 'POST', 'PUT'], true)) {
+        if (null !== $body && in_array($method, ['GET', 'HEAD', 'TRACE'], true)) {
             static::markTestSkipped('cURL can not send body using ' . $method);
         }
         parent::testAsyncSendRequest(

tests/HttpClientTestCase.php

@@ -26,7 +26,7 @@ public function testSendRequest($method, $uri, array $headers, $body)
         if (defined('HHVM_VERSION')) {
             static::markTestSkipped('This test can not run under HHVM');
         }
-        if (null !== $body && !in_array($method, ['OPTIONS', 'POST', 'PUT'], true)) {
+        if (null !== $body && in_array($method, ['GET', 'HEAD', 'TRACE'], true)) {
             static::markTestSkipped('cURL can not send body using ' . $method);
         }
         parent::testSendRequest(