Merge pull request php-curl-class#176 from zachborboa/master

Fix php-curl-class#171: Allow sending body data in delete()

Author: zachborboa

README.md

@@ -158,7 +158,7 @@ Curl::buildPostData($data)
 Curl::call()
 Curl::close()
 Curl::complete($callback)
-Curl::delete($url, $data = array())
+Curl::delete($url, $query_parameters = array(), $data = array())
 Curl::download($url, $mixed_filename)
 Curl::downloadComplete($fh)
 Curl::error($callback)
@@ -196,7 +196,7 @@ Curl::is_array_assoc($array)
 Curl::is_array_multidim($array)
 MultiCurl::__construct($base_url = null)
 MultiCurl::__destruct()
-MultiCurl::addDelete($url, $data = array())
+MultiCurl::addDelete($url, $query_parameters = array(), $data = array())
 MultiCurl::addDownload($url, $mixed_filename)
 MultiCurl::addGet($url, $data = array())
 MultiCurl::addHead($url, $data = array())

composer.json

@@ -12,7 +12,7 @@
             "name": "Zach Borboa"
         }
     ],
-    "version": "3.4.5",
+    "version": "3.5.5",
     "require": {
         "php": ">=5.3",
         "ext-curl": "*"

src/Curl/Curl.php

@@ -4,7 +4,7 @@
 
 class Curl
 {
-    const VERSION = '3.4.5';
+    const VERSION = '3.5.5';
     const DEFAULT_TIMEOUT = 30;
 
     public $curl;
@@ -146,15 +146,17 @@ public function progress($callback)
         $this->setOpt(CURLOPT_NOPROGRESS, false);
     }
 
-    public function delete($url, $data = array())
+    public function delete($url, $query_parameters = array(), $data = array())
     {
         if (is_array($url)) {
-            $data = $url;
+            $data = $query_parameters;
+            $query_parameters = $url;
             $url = $this->base_url;
         }
-        $this->setURL($url, $data);
-        $this->unsetHeader('Content-Length');
+
+        $this->setURL($url, $query_parameters);
         $this->setOpt(CURLOPT_CUSTOMREQUEST, 'DELETE');
+        $this->setOpt(CURLOPT_POSTFIELDS, $this->buildPostData($data));
         return $this->exec();
     }
 

src/Curl/MultiCurl.php

@@ -27,16 +27,17 @@ public function __construct($base_url = null)
         $this->setURL($base_url);
     }
 
-    public function addDelete($url, $data = array())
+    public function addDelete($url, $query_parameters = array(), $data = array())
     {
         if (is_array($url)) {
-            $data = $url;
+            $data = $query_parameters;
+            $query_parameters = $url;
             $url = $this->base_url;
         }
         $curl = new Curl();
-        $curl->setURL($url, $data);
-        $curl->unsetHeader('Content-Length');
+        $curl->setURL($url, $query_parameters);
         $curl->setOpt(CURLOPT_CUSTOMREQUEST, 'DELETE');
+        $curl->setOpt(CURLOPT_POSTFIELDS, $curl->buildPostData($data));
         $this->addHandle($curl);
         return $curl;
     }

tests/PHPCurlClass/Helper.php

@@ -15,11 +15,15 @@ public function __construct()
         $this->curl->setOpt(CURLOPT_SSL_VERIFYHOST, false);
     }
 
-    public function server($test, $request_method, $data = array())
+    public function server($test, $request_method, $query_parameters = array(), $data = array())
     {
         $this->curl->setHeader('X-DEBUG-TEST', $test);
         $request_method = strtolower($request_method);
-        $this->curl->$request_method(self::TEST_URL, $data);
+        if (is_array($data) && empty($data)) {
+            $this->curl->$request_method(self::TEST_URL, $query_parameters);
+        } else {
+            $this->curl->$request_method(self::TEST_URL, $query_parameters, $data);
+        }
         return $this->curl->response;
     }
 }

tests/PHPCurlClass/PHPCurlClassTest.php

@@ -128,7 +128,7 @@ public function testUrl()
         $this->assertEquals(Test::TEST_URL, $test->curl->base_url);
         $this->assertEquals(Test::TEST_URL, $test->curl->url);
 
-        // curl -v --get --request DELETE "http://127.0.0.1:8000/" --data "foo=bar"
+        // curl -v --request DELETE "http://127.0.0.1:8000/?foo=bar"
         $test = new Test();
         $test->server('server', 'DELETE', $data);
         $this->assertEquals(Test::TEST_URL, $test->curl->base_url);
@@ -151,6 +151,12 @@ public function testSetUrlInConstructor()
     {
         $data = array('key' => 'value');
 
+        $curl = new Curl(Test::TEST_URL);
+        $curl->setHeader('X-DEBUG-TEST', 'delete_with_body');
+        $curl->delete($data, array('wibble' => 'wubble'));
+        $this->assertEquals(Test::TEST_URL, $curl->base_url);
+        $this->assertEquals('{"get":{"key":"value"},"post":{"wibble":"wubble"}}', $curl->raw_response);
+
         $curl = new Curl(Test::TEST_URL);
         $curl->setHeader('X-DEBUG-TEST', 'get');
         $curl->delete($data);
@@ -419,6 +425,10 @@ public function testDelete()
             'test' => 'delete',
             'key' => 'test',
         )));
+
+        $test = new Test();
+        $test->server('delete_with_body', 'DELETE', array('foo' => 'bar'), array('wibble' => 'wubble'));
+        $this->assertEquals('{"get":{"foo":"bar"},"post":{"wibble":"wubble"}}', $test->curl->raw_response);
     }
 
     public function testHeadRequestMethod()

tests/PHPCurlClass/PHPMultiCurlClassTest.php

@@ -1731,6 +1731,15 @@ public function testSetUrlInConstructor()
     {
         $data = array('key' => 'value');
 
+        $multi_curl = new MultiCurl(Test::TEST_URL);
+        $multi_curl->setHeader('X-DEBUG-TEST', 'delete_with_body');
+        $multi_curl->addDelete($data, array('wibble' => 'wubble'))->complete(function($instance) {
+            PHPUnit_Framework_Assert::assertEquals(Test::TEST_URL, $instance->base_url);
+            PHPUnit_Framework_Assert::assertEquals('{"get":{"key":"value"},"post":{"wibble":"wubble"}}',
+                $instance->raw_response);
+        });
+        $multi_curl->start();
+
         $multi_curl = new MultiCurl(Test::TEST_URL);
         $multi_curl->setHeader('X-DEBUG-TEST', 'get');
         $multi_curl->addDelete($data)->complete(function($instance) {

tests/PHPCurlClass/server.php

@@ -223,6 +223,13 @@
 
     echo 'OK';
     exit;
+} elseif ($test === 'delete_with_body') {
+    header('Content-Type: application/json');
+    echo json_encode(array(
+        'get' => $_GET,
+        'post' => $_POST,
+    ));
+    exit;
 }
 
 header('Content-Type: text/plain');