Merge pull request php-curl-class#235 from petewatts/master

Fix php-curl-class#234 PATCH request method support data body

Author: zachborboa

src/Curl/Curl.php

@@ -441,6 +441,11 @@ public function patch($url, $data = array())
             $data = $url;
             $url = $this->baseUrl;
         }
+
+        if (is_array($data) && empty($data)) {
+            $this->unsetHeader('Content-Length');
+        }
+
         $this->setURL($url);
         $this->setOpt(CURLOPT_CUSTOMREQUEST, 'PATCH');
         $this->setOpt(CURLOPT_POSTFIELDS, $this->buildPostData($data));
@@ -463,10 +468,6 @@ public function post($url, $data = array())
             $url = $this->baseUrl;
         }
 
-        if (is_array($data) && empty($data)) {
-            $this->unsetHeader('Content-Length');
-        }
-
         $this->setURL($url);
         $this->setOpt(CURLOPT_CUSTOMREQUEST, 'POST');
         $this->setOpt(CURLOPT_POST, true);

tests/PHPCurlClass/PHPCurlClassTest.php

@@ -82,7 +82,7 @@ public function testBuildPostDataArgSeparator()
 
     public function testUserAgent()
     {
-        $php_version = 'PHP\/' . PHP_VERSION;
+        $php_version = preg_replace('/([\.\+\?\*\(\)\[\]\^\$\/])/', '\\\\\1', 'PHP/' . PHP_VERSION);
         $curl_version = curl_version();
         $curl_version = 'curl\/' . $curl_version['version'];
 
@@ -409,6 +409,19 @@ public function testPatchRequestMethod()
         $this->assertEquals('PATCH', $test->server('request_method', 'PATCH'));
     }
 
+    public function testPatchData()
+    {
+        $test = new Test();
+        $this->assertEquals('key=value', $test->server('patch', 'PATCH', array(
+            'key' => 'value',
+        )));
+
+        $test = new Test();
+        $this->assertEquals('{"key":"value"}', $test->server('patch', 'PATCH', json_encode(array(
+            'key' => 'value',
+        ))));
+    }
+
     public function testPatchRequestMethodWithMultidimArray()
     {
         $data = array(

tests/PHPCurlClass/server.php

@@ -107,6 +107,9 @@
 } elseif ($test === 'put') {
     echo $http_raw_post_data;
     exit;
+} elseif ($test === 'patch') {
+    echo $http_raw_post_data;
+    exit;
 } elseif ($test === 'post_multidimensional') {
     echo $http_raw_post_data;
     exit;