Merge branch 'hotfix/zendframework/zendframework#6492-support-delete-…

…post-request-body' into develop Close zendframework/zendframework#6492 Forward port zendframework/zendframework#6492
zendframework · Nov 19, 2014 · d87b53f · d87b53f
6 parents 4b05631 + 651043c + 94deaef + ffd4e9b + 2aef442 + 281d6f9
commit d87b53f
Show file tree

Hide file tree

Showing 6 changed files with 75 additions and 18 deletions.
diff --git a/src/Client.php b/src/Client.php
@@ -348,9 +348,19 @@ public function setMethod($method)
     {
         $method = $this->getRequest()->setMethod($method)->getMethod();
 
-        if (($method == Request::METHOD_POST || $method == Request::METHOD_PUT ||
-             $method == Request::METHOD_DELETE || $method == Request::METHOD_PATCH)
-             && empty($this->encType)) {
+        if (empty($this->encType)
+            && in_array(
+                $method,
+                array(
+                    Request::METHOD_POST,
+                    Request::METHOD_PUT,
+                    Request::METHOD_DELETE,
+                    Request::METHOD_PATCH,
+                    Request::METHOD_OPTIONS,
+                ),
+                true
+            )
+        ) {
             $this->setEncType(self::ENC_URLENCODED);
         }
 

diff --git a/src/Client/Adapter/Curl.php b/src/Client/Adapter/Curl.php
@@ -375,7 +375,7 @@ public function write($method, $uri, $httpVersion = 1.1, $headers = array(), $bo
          * Make sure POSTFIELDS is set after $curlMethod is set:
          * @link http://de2.php.net/manual/en/function.curl-setopt.php#81161
          */
-        if ($method == 'POST') {
+        if (in_array($method, array('POST', 'PATCH', 'DELETE', 'OPTIONS'), true)) {
             curl_setopt($this->curl, CURLOPT_POSTFIELDS, $body);
         } elseif ($curlMethod == CURLOPT_UPLOAD) {
             // this covers a PUT by file-handle:
@@ -385,14 +385,6 @@ public function write($method, $uri, $httpVersion = 1.1, $headers = array(), $bo
             curl_setopt($this->curl, CURLOPT_INFILESIZE, $this->config['curloptions'][CURLOPT_INFILESIZE]);
             unset($this->config['curloptions'][CURLOPT_INFILE]);
             unset($this->config['curloptions'][CURLOPT_INFILESIZE]);
-        } elseif ($method == 'PUT') {
-            // This is a PUT by a setRawData string, not by file-handle
-            curl_setopt($this->curl, CURLOPT_POSTFIELDS, $body);
-        } elseif ($method == 'PATCH') {
-            curl_setopt($this->curl, CURLOPT_POSTFIELDS, $body);
-        } elseif ($method == 'DELETE' && $body) {
-            // DELETE requests can also have a body
-            curl_setopt($this->curl, CURLOPT_POSTFIELDS, $body);
         }
 
         // set additional curl options

diff --git a/test/Client/CommonHttpTests.php b/test/Client/CommonHttpTests.php
@@ -211,6 +211,46 @@ public function testPatchData($params)
         $this->assertEquals(serialize($params), $res->getBody(), "PATCH data integrity test failed");
     }
 
+    /**
+     * Test we can properly send DELETE parameters with
+     * application/x-www-form-urlencoded content type
+     *
+     * @dataProvider parameterArrayProvider
+     */
+    public function testDeleteData($params)
+    {
+        $client = $this->client;
+        $client->setUri($this->baseuri . 'testDeleteData.php');
+
+        $client->setRawBody(serialize($params));
+
+        $client->setMethod('DELETE');
+        $this->assertEquals($client::ENC_URLENCODED, $this->client->getEncType());
+        $this->assertTrue($client->getRequest()->isDelete());
+        $res = $this->client->send();
+        $this->assertEquals(serialize($params), $res->getBody(), "DELETE data integrity test failed");
+    }
+
+    /**
+     * Test we can properly send OPTIONS parameters with
+     * application/x-www-form-urlencoded content type
+     *
+     * @dataProvider parameterArrayProvider
+     */
+    public function testOptionsData($params)
+    {
+        $client = $this->client;
+        $client->setUri($this->baseuri . 'testOptionsData.php');
+
+        $client->setRawBody(serialize($params));
+
+        $client->setMethod('OPTIONS');
+        $this->assertEquals($client::ENC_URLENCODED, $this->client->getEncType());
+        $this->assertTrue($client->getRequest()->isOptions());
+        $res = $this->client->send();
+        $this->assertEquals(serialize($params), $res->getBody(), "OPTIONS data integrity test failed");
+    }
+
     /**
      * Test we can properly send POST parameters with
      * multipart/form-data content type

diff --git a/test/Client/_files/testDeleteData.php b/test/Client/_files/testDeleteData.php
@@ -0,0 +1,10 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+readfile("php://input");
diff --git a/test/Client/_files/testOptionsData.php b/test/Client/_files/testOptionsData.php
@@ -0,0 +1,10 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+readfile("php://input");
diff --git a/test/Client/_files/testPatchData.php b/test/Client/_files/testPatchData.php
@@ -7,9 +7,4 @@
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 
-$putdata = fopen("php://input", "r");
-while ($data = fread($putdata, 1024)) {
-    echo $data;
-}
-
-fclose($putdata);
+readfile("php://input");