bitmotor/unirest-php
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

improving curl post body flattening for multidimensional arrays

Browse Source
This commit is contained in:
Ahmad Nassri
2014-12-18 01:16:40 -05:00
parent d004129842
commit eccbc76469
2 changed files with 35 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/Unirest/Request.php
View File

@@ -121,12 +121,12 @@ class Request
* Prepares a file for upload. To be used inside the parameters declaration for a request. * Prepares a file for upload. To be used inside the parameters declaration for a request.
* @param string $path The file path * @param string $path The file path
*/ */
public static function file($path) public static function file($filename, $mimetype = '', $postname = '')
{ {
if (function_exists('curl_file_create')) { if (function_exists('curl_file_create')) {
return curl_file_create($path); return curl_file_create($filename, $mimetype = '', $postname = '');
} else { } else {
return '@' . $path; return sprintf('@%s;filename=%s;type=%s', $filename, $postname ?: basename($filename), $mimetype);
} }
} }
@@ -134,20 +134,29 @@ class Request
* This function is useful for serializing multidimensional arrays, and avoid getting * This function is useful for serializing multidimensional arrays, and avoid getting
* the 'Array to string conversion' notice * the 'Array to string conversion' notice
*/ */
public static function buildHTTPCurlQuery($arrays, &$new = array(), $prefix = null) public static function buildHTTPCurlQuery($data, $parent = false)
{ {
if (is_object($arrays)) { $result = array();
$arrays = get_object_vars($arrays);
if (is_object($data)) {
$data = get_object_vars($data);
} }
foreach ($arrays as $key => $value) { foreach ($data as $key => $value) {
$k = isset($prefix) ? $prefix . '[' . $key . ']' : $key; if ($parent) {
if (!$value instanceof \CURLFile and (is_array($value) or is_object($value))) { $new_key = sprintf('%s[%s]', $parent, $key);
self::buildHTTPCurlQuery($value, $new, $k);
} else { } else {
$new[$k] = $value; $new_key = $key;
}
if (!$value instanceof \CURLFile and (is_array($value) or is_object($value))) {
$result = array_merge($result, self::buildHTTPCurlQuery($value, $new_key));
} else {
$result[$new_key] = $value;
} }
} }
return $result;
} }
/** /**
@@ -189,8 +198,7 @@ class Request
curl_setopt($ch, CURLOPT_CUSTOMREQUEST, $method); curl_setopt($ch, CURLOPT_CUSTOMREQUEST, $method);
if (is_array($body) || $body instanceof \Traversable) { if (is_array($body) || $body instanceof \Traversable) {
self::buildHTTPCurlQuery($body, $postBody); curl_setopt($ch, CURLOPT_POSTFIELDS, self::buildHTTPCurlQuery($body));
curl_setopt($ch, CURLOPT_POSTFIELDS, $postBody);
} else { } else {
curl_setopt($ch, CURLOPT_POSTFIELDS, $body); curl_setopt($ch, CURLOPT_POSTFIELDS, $body);
} }
@@ -201,8 +209,7 @@ class Request
$url .= '?'; $url .= '?';
} }
self::buildHTTPCurlQuery($body, $postBody); $url .= urldecode(http_build_query(self::buildHTTPCurlQuery($body)));
$url .= urldecode(http_build_query($postBody));
} }
curl_setopt($ch, CURLOPT_URL, self::encodeUrl($url)); curl_setopt($ch, CURLOPT_URL, self::encodeUrl($url));

26
tests/Unirest/RequestTest.php
View File

@@ -195,6 +195,19 @@ class UnirestTest extends \PHPUnit_Framework_TestCase
$this->assertEquals('Sam Sullivan', $json->author); $this->assertEquals('Sam Sullivan', $json->author);
} }
public function testHttpBuildQueryWhenCurlFile()
{
$file = Request::file(UPLOAD_FIXTURE);
$body = array(
'to' => 'mail@mailinator.com',
'from' => 'mail@mailinator.com',
'file' => $file
);
$result = Request::buildHTTPCurlQuery($body);
$this->assertEquals($result['file'], $file);
}
public function testUpload() public function testUpload()
{ {
$response = Request::post('http://httpbin.org/post', array( $response = Request::post('http://httpbin.org/post', array(
@@ -369,17 +382,4 @@ class UnirestTest extends \PHPUnit_Framework_TestCase
$headers = $response->body->headers; $headers = $response->body->headers;
$this->assertEquals('ciao', $headers->{'User-Agent'}); $this->assertEquals('ciao', $headers->{'User-Agent'});
} }
public function testHttpBuildQueryWhenCurlFile()
{
$file = Request::file(UPLOAD_FIXTURE);
$body = array(
'to' => 'mail@mailinator.com',
'from' => 'mail@mailinator.com',
'file' => $file
);
Request::buildHTTPCurlQuery($body, $postBody);
$this->assertEquals($postBody['file'], $file);
}
} }