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

Merge branch 'master' of github.com:Mashape/unirest-php

Browse Source
This commit is contained in:
thefosk
2014-01-14 10:29:19 -08:00
parent 8b184d9911 9e48aa428d
commit d0117b5125
2 changed files with 20 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/Unirest/Unirest.php
View File

@@ -172,8 +172,12 @@
$ch = curl_init(); $ch = curl_init();
if ($httpMethod != HttpMethod::GET) { if ($httpMethod != HttpMethod::GET) {
curl_setopt ($ch, CURLOPT_CUSTOMREQUEST, $httpMethod); curl_setopt ($ch, CURLOPT_CUSTOMREQUEST, $httpMethod);
if( is_array($body) || $body instanceof Traversable ) {
Unirest::http_build_query_for_curl($body, $postBody); Unirest::http_build_query_for_curl($body, $postBody);
curl_setopt ($ch, CURLOPT_POSTFIELDS, $postBody); curl_setopt ($ch, CURLOPT_POSTFIELDS, $postBody);
} else {
curl_setopt ($ch, CURLOPT_POSTFIELDS, $body);
}
} else if (is_array($body)) { } else if (is_array($body)) {
if (strpos($url,'?') !== false) { if (strpos($url,'?') !== false) {
$url .= "&"; $url .= "&";

13
test/Unirest/UnirestTest.php
View File

@@ -90,6 +90,19 @@ class UnirestTest extends UnitTestCase
$this->assertEqual("thefosk", $form->nick); $this->assertEqual("thefosk", $form->nick);
} }
public function testRawPost()
{
$response = Unirest::post("http://httpbin.org/post", array( "Accept" => "application/json" ),
json_encode(array(
"author" => "Sam Sullivan"
)));
$this->assertEqual(200, $response->code);
$json = $response->body->json;
$this->assertEqual("Sam Sullivan", $json->author);
}
public function testUpload() { public function testUpload() {
$response = Unirest::post("http://httpbin.org/post", array( "Accept" => "application/json" ), $response = Unirest::post("http://httpbin.org/post", array( "Accept" => "application/json" ),
array( array(