PHP library now supports multipart/form-data content-type and binary fields

This commit is contained in:
Evan Seguin
2012-08-28 14:58:21 -07:00
parent eff530a5fa
commit b6939ad164
15 changed files with 168 additions and 103 deletions

View File

@@ -26,62 +26,85 @@
require_once(dirname(__FILE__) . "/../exceptions/MashapeClientException.php");
require_once(dirname(__FILE__) . "/HttpMethod.php");
require_once(dirname(__FILE__) . "/ContentType.php");
require_once(dirname(__FILE__) . "/UrlUtils.php");
require_once(dirname(__FILE__) . "/MashapeResponse.php");
require_once(dirname(__FILE__) . "/../auth/HeaderAuth.php");
require_once(dirname(__FILE__) . "/../auth/BasicAuth.php");
require_once(dirname(__FILE__) . "/../auth/CustomHeaderAuth.php");
require_once(dirname(__FILE__) . "/../auth/MashapeAuth.php");
require_once(dirname(__FILE__) . "/../auth/QueryAuth.php");
require_once(dirname(__FILE__) . "/../authentication/HeaderAuthentication.php");
require_once(dirname(__FILE__) . "/../authentication/BasicAuthentication.php");
require_once(dirname(__FILE__) . "/../authentication/CustomHeaderAuthentication.php");
require_once(dirname(__FILE__) . "/../authentication/MashapeAuthentication.php");
require_once(dirname(__FILE__) . "/../authentication/QueryAuthentication.php");
class HttpClient {
public static function doRequest($httpMethod, $url, $parameters, $authHandlers, $encodeJson = true) {
public static function doRequest($httpMethod, $url, $parameters, $authHandlers, $contentType = ContentType::FORM, $encodeJson = true) {
if (!($httpMethod == HttpMethod::DELETE || $httpMethod == HttpMethod::GET ||
$httpMethod == HttpMethod::POST || $httpMethod == HttpMethod::PUT)) {
throw new MashapeClientException(EXCEPTION_NOTSUPPORTED_HTTPMETHOD, EXCEPTION_NOTSUPPORTED_HTTPMETHOD_CODE);
}
$response = self::execRequest($httpMethod, $url, $parameters, $authHandlers);
$response = self::execRequest($httpMethod, $url, $parameters, $authHandlers, $contentType);
if ($encodeJson) {
$response->parseBodyAsJson();
}
return $response;
}
private static function execRequest($httpMethod, $url, $parameters, $authHandlers) {
private static function execRequest($httpMethod, $url, $parameters, $authHandlers, $contentType) {
$data = null;
if ($parameters == null) {
$parameters = array();
}
if ($authHandlers == null) {
$authHandlers = array();
}
$headers = array();
$headers[] = UrlUtils::generateClientHeaders();
// Authentication
foreach($authHandlers as $handler) {
if ($handler instanceof QueryAuth) {
if ($handler instanceof QueryAuthentication) {
$parameters = array_merge($parameters, $handler->handleParams());
} else if ($handler instanceof HeaderAuth) {
} else if ($handler instanceof HeaderAuthentication) {
$headers[] = $handler->handleHeader();
}
}
UrlUtils::prepareRequest($url, $parameters, ($httpMethod != HttpMethod::GET) ? true : false);
if ($httpMethod != HttpMethod::GET) {
$data = http_build_query($parameters);
switch ($contentType) {
case ContentType::FORM:
$data = http_build_query($parameters);
break;
case ContentType::MULTIPART:
$data = $parameters;
break;
case ContentType::JSON:
// TODO support json
default:
throw new MashapeClientException(
EXCEPTION_NOTSUPPORTED_CONTENTTYPE,
EXCEPTION_NOTSUPPORTED_CONTENTTYPE_CODE);
}
} else if ($contentType != ContentType::FORM) {
// if we have a GET request that is anything other than urlencoded
// form data, we shouldn't allow it.
throw new MashapeClientException(
EXCEPTION_GET_INVALID_CONTENTTYPE,
EXCEPTION_GET_INVALID_CONTENTTYPE_CODE);
}
$ch = curl_init ();
// prepare the request
curl_setopt ($ch, CURLOPT_URL , $url);
curl_setopt ($ch, CURLOPT_URL , $url);
if ($httpMethod != HttpMethod::GET) {
curl_setopt ($ch, CURLOPT_CUSTOMREQUEST, $httpMethod);
//curl_setopt ($ch, CURLOPT_POST, 1);
curl_setopt ($ch, CURLOPT_POSTFIELDS, $data);
curl_setopt ($ch, CURLOPT_POSTFIELDS, $parameters);
}
curl_setopt ($ch, CURLOPT_RETURNTRANSFER, true);
curl_setopt ($ch, CURLOPT_HTTPHEADER, $headers);
@@ -90,7 +113,7 @@ class HttpClient {
$httpCode = curl_getinfo($ch, CURLINFO_HTTP_CODE);
$responseHeaders = curl_getinfo($ch, CURLINFO_HEADER_OUT);
curl_close($ch);
return new MashapeResponse($response, $httpCode, $responseHeaders);
}
}