Merge pull request #400 from FindTheBest/master

Fixing curl $postData for php bindings
This commit is contained in:
Tony Tam 2015-01-28 22:06:23 -08:00
commit f914f26f3b
2 changed files with 17 additions and 1 deletions

View File

@ -28,6 +28,8 @@ class APIClient {
public static $PUT = "PUT"; public static $PUT = "PUT";
public static $DELETE = "DELETE"; public static $DELETE = "DELETE";
private $curl_timout = 5;
/** /**
* @param string $apiKey your API key * @param string $apiKey your API key
* @param string $apiServer the address of the API server * @param string $apiServer the address of the API server
@ -37,6 +39,16 @@ class APIClient {
$this->apiServer = $apiServer; $this->apiServer = $apiServer;
} }
/**
* @param integer $seconds Number of seconds before timing out [set to 0 for no timeout]
*/
public function setTimeout($seconds) {
if (!is_numeric($seconds)) {
throw new Exception('Timeout variable must be numeric.');
}
$this->curl_timout = $seconds;
}
/** /**
* @param string $resourcePath path to method endpoint * @param string $resourcePath path to method endpoint
@ -72,7 +84,9 @@ class APIClient {
$url = $this->apiServer . $resourcePath; $url = $this->apiServer . $resourcePath;
$curl = curl_init(); $curl = curl_init();
curl_setopt($curl, CURLOPT_TIMEOUT, 5); if ($this->curl_timout) {
curl_setopt($curl, CURLOPT_TIMEOUT, $this->curl_timout);
}
// return the result on success, rather than just TRUE // return the result on success, rather than just TRUE
curl_setopt($curl, CURLOPT_RETURNTRANSFER, true); curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);
curl_setopt($curl, CURLOPT_HTTPHEADER, $headers); curl_setopt($curl, CURLOPT_HTTPHEADER, $headers);

View File

@ -77,6 +77,8 @@ class {{classname}} {
{{/formParams}} {{/formParams}}
if (empty($body)) { if (empty($body)) {
$body = null; $body = null;
} else if (strpos($headerParams['Content-Type'], "application/x-www-form-urlencoded") > -1) {
$body = http_build_query($body);
} }
// Make the API Call // Make the API Call