Skip to content

PHP-CS fixed the library #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ZielinskiLukasz wants to merge 1 commit into
base: master
Choose a base branch
from
Open

PHP-CS fixed the library #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions lib/ShippingEasy.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@

// This snippet (and some of the curl code) due to the Facebook SDK.
if (!function_exists('curl_init')) {
throw new Exception('ShippingEasy needs the CURL PHP extension.');
throw new Exception('ShippingEasy needs the CURL PHP extension.');
}
if (!function_exists('json_decode')) {
throw new Exception('ShippingEasy needs the JSON PHP extension.');
throw new Exception('ShippingEasy needs the JSON PHP extension.');
}
if (!function_exists('mb_detect_encoding')) {
throw new Exception('ShippingEasy needs the Multibyte String PHP extension.');
throw new Exception('ShippingEasy needs the Multibyte String PHP extension.');
}

require(dirname(__FILE__) . '/ShippingEasy/ShippingEasy.php');
Expand All @@ -30,4 +30,4 @@
require(dirname(__FILE__) . '/ShippingEasy/PartnerAccount.php');
require(dirname(__FILE__) . '/ShippingEasy/Signature.php');
require(dirname(__FILE__) . '/ShippingEasy/SignedUrl.php');
require(dirname(__FILE__) . '/ShippingEasy/Cancellation.php');
require(dirname(__FILE__) . '/ShippingEasy/Cancellation.php');
281 changes: 144 additions & 137 deletions lib/ShippingEasy/ApiRequestor.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,59 +2,63 @@

class ShippingEasy_ApiRequestor
{
public $apiKey;
public $apiSecret;

public static function utf8($value)
{
if (is_string($value) && mb_detect_encoding($value, "UTF-8", TRUE) != "UTF-8")
return utf8_encode($value);
else
return $value;
}

public static function encode($arr, $prefix=null)
{
if (!is_array($arr))
return $arr;

$r = array();
foreach ($arr as $k => $v) {
if (is_null($v))
continue;

if ($prefix && $k && !is_int($k))
$k = $prefix."[".$k."]";
else if ($prefix)
$k = $prefix."[]";

if (is_array($v)) {
$r[] = self::encode($v, $k, true);
} else {
$r[] = urlencode($k)."=".urlencode($v);
}
public $apiKey;
public $apiSecret;

public static function utf8($value)
{
if (is_string($value) && mb_detect_encoding($value, "UTF-8", true) != "UTF-8") {
return utf8_encode($value);
} else {
return $value;
}
}

return implode("&", $r);
}

public function request($meth, $path, $params=null, $payload = null, $apiKey = null, $apiSecret = null)
{
list($rbody, $rcode) = $this->_requestRaw($meth, $path, $params, $payload, $apiKey, $apiSecret);
$resp = $this->_interpretResponse($rbody, $rcode);
return $resp;
}
public static function encode($arr, $prefix=null)
{
if (!is_array($arr)) {
return $arr;
}

$r = array();
foreach ($arr as $k => $v) {
if (is_null($v)) {
continue;
}

if ($prefix && $k && !is_int($k)) {
$k = $prefix."[".$k."]";
} elseif ($prefix) {
$k = $prefix."[]";
}

if (is_array($v)) {
$r[] = self::encode($v, $k, true);
} else {
$r[] = urlencode($k)."=".urlencode($v);
}
}

return implode("&", $r);
}

public function handleApiError($rbody, $rcode, $resp)
{
public function request($meth, $path, $params=null, $payload = null, $apiKey = null, $apiSecret = null)
{
list($rbody, $rcode) = $this->_requestRaw($meth, $path, $params, $payload, $apiKey, $apiSecret);
$resp = $this->_interpretResponse($rbody, $rcode);
return $resp;
}

if (!is_array($resp) || !isset($resp['errors']))
throw new ShippingEasy_ApiError("Invalid response object from API: $rbody (HTTP response code was $rcode)", $rcode, $rbody, $resp);
public function handleApiError($rbody, $rcode, $resp)
{
if (!is_array($resp) || !isset($resp['errors'])) {
throw new ShippingEasy_ApiError("Invalid response object from API: $rbody (HTTP response code was $rcode)", $rcode, $rbody, $resp);
}

$error = $resp['errors'];
$message = isset($error[0]['message']) ? $error[0]['message'] : null;
$error = $resp['errors'];
$message = isset($error[0]['message']) ? $error[0]['message'] : null;

switch ($rcode) {
switch ($rcode) {
case 400:
throw new ShippingEasy_InvalidRequestError(json_encode($error), $rcode, $rbody, $resp);
case 404:
Expand All @@ -64,109 +68,112 @@ public function handleApiError($rbody, $rcode, $resp)
default:
throw new ShippingEasy_ApiError($message, $rcode, $rbody, $resp);
}
}
}

private function _requestRaw($http_method, $path, $params, $payload, $apiKey, $apiSecret)
{
$url = new ShippingEasy_SignedUrl($http_method, $path, $params, $payload, null, $apiKey, $apiSecret);
$absUrl = $url->toString();
private function _requestRaw($http_method, $path, $params, $payload, $apiKey, $apiSecret)
{
$url = new ShippingEasy_SignedUrl($http_method, $path, $params, $payload, null, $apiKey, $apiSecret);
$absUrl = $url->toString();

$langVersion = phpversion();
$uname = php_uname();
$langVersion = phpversion();
$uname = php_uname();

$ua = array('bindings_version' => ShippingEasy::VERSION,
'lang' => 'php',
'lang_version' => $langVersion,
'publisher' => 'ShippingEasy',
'uname' => $uname);
$ua = array('bindings_version' => ShippingEasy::VERSION,
'lang' => 'php',
'lang_version' => $langVersion,
'publisher' => 'ShippingEasy',
'uname' => $uname);

$headers = array('X-ShippingEasy-Client-User-Agent: ' . json_encode($ua),
$headers = array('X-ShippingEasy-Client-User-Agent: ' . json_encode($ua),
'User-Agent: ShippingEasy/v1 PhpBindings/' . ShippingEasy::VERSION,
'Authorization: Bearer ' . $apiKey);

if (ShippingEasy::$apiVersion)
$headers[] = 'ShippingEasy-Version: ' . ShippingEasy::$apiVersion;

list($rbody, $rcode) = $this->_curlRequest($http_method, $absUrl, $headers, $payload);
return array($rbody, $rcode);
}
if (ShippingEasy::$apiVersion) {
$headers[] = 'ShippingEasy-Version: ' . ShippingEasy::$apiVersion;
}

private function _interpretResponse($rbody, $rcode)
{
try {
$resp = json_decode($rbody, true);
} catch (Exception $e) {
throw new ShippingEasy_ApiError("Invalid response body from API: $rbody (HTTP response code was $rcode)", $rcode, $rbody);
list($rbody, $rcode) = $this->_curlRequest($http_method, $absUrl, $headers, $payload);
return array($rbody, $rcode);
}
if ($rcode < 200 || $rcode >= 300) {
$this->handleApiError($rbody, $rcode, $resp);
}
return $resp;
}

private function _curlRequest($meth, $absUrl, $headers, $payload)
{
$curl = curl_init();
$meth = strtolower($meth);
$opts = array();

if ($meth == 'get') {
$opts[CURLOPT_HTTPGET] = 1;
} else if ($meth == 'post') {
$opts[CURLOPT_POST] = 1;
if ($payload)
$payload = json_encode($payload);

$headers[] = 'Content-Type: application/json';
$headers[] = 'Content-Length: ' . strlen($payload);
$opts[CURLOPT_POSTFIELDS] = $payload;
} else if ($meth == 'put') {
$opts[CURLOPT_CUSTOMREQUEST] = 'PUT';
if ($payload)
$payload = json_encode($payload);

$headers[] = 'Content-Type: application/json';
$headers[] = 'Content-Length: ' . strlen($payload);
$opts[CURLOPT_POSTFIELDS] = $payload;
} else if ($meth == 'delete') {
$opts[CURLOPT_CUSTOMREQUEST] = 'DELETE';
if (count($params) > 0) {
$encoded = self::encode($params);
$absUrl = "$absUrl?$encoded";
}
} else {
throw new ShippingEasy_ApiError("Unrecognized method $meth");

private function _interpretResponse($rbody, $rcode)
{
try {
$resp = json_decode($rbody, true);
} catch (Exception $e) {
throw new ShippingEasy_ApiError("Invalid response body from API: $rbody (HTTP response code was $rcode)", $rcode, $rbody);
}
if ($rcode < 200 || $rcode >= 300) {
$this->handleApiError($rbody, $rcode, $resp);
}
return $resp;
}

$opts[CURLOPT_URL] = $absUrl;
$opts[CURLOPT_RETURNTRANSFER] = true;
$opts[CURLOPT_CONNECTTIMEOUT] = 30;
$opts[CURLOPT_TIMEOUT] = 80;
$opts[CURLOPT_FOLLOWLOCATION] = true;
$opts[CURLOPT_MAXREDIRS] = 4;
$opts[CURLOPT_POSTREDIR] = 1 | 2 | 4; // Maintain method across redirect for all 3XX redirect types
private function _curlRequest($meth, $absUrl, $headers, $payload)
{
$curl = curl_init();
$meth = strtolower($meth);
$opts = array();

if ($meth == 'get') {
$opts[CURLOPT_HTTPGET] = 1;
} elseif ($meth == 'post') {
$opts[CURLOPT_POST] = 1;
if ($payload) {
$payload = json_encode($payload);
}

$headers[] = 'Content-Type: application/json';
$headers[] = 'Content-Length: ' . strlen($payload);
$opts[CURLOPT_POSTFIELDS] = $payload;
} elseif ($meth == 'put') {
$opts[CURLOPT_CUSTOMREQUEST] = 'PUT';
if ($payload) {
$payload = json_encode($payload);
}

$headers[] = 'Content-Type: application/json';
$headers[] = 'Content-Length: ' . strlen($payload);
$opts[CURLOPT_POSTFIELDS] = $payload;
} elseif ($meth == 'delete') {
$opts[CURLOPT_CUSTOMREQUEST] = 'DELETE';
if (count($params) > 0) {
$encoded = self::encode($params);
$absUrl = "$absUrl?$encoded";
}
} else {
throw new ShippingEasy_ApiError("Unrecognized method $meth");
}

$opts[CURLOPT_URL] = $absUrl;
$opts[CURLOPT_RETURNTRANSFER] = true;
$opts[CURLOPT_CONNECTTIMEOUT] = 30;
$opts[CURLOPT_TIMEOUT] = 80;
$opts[CURLOPT_FOLLOWLOCATION] = true;
$opts[CURLOPT_MAXREDIRS] = 4;
$opts[CURLOPT_POSTREDIR] = 1 | 2 | 4; // Maintain method across redirect for all 3XX redirect types
$opts[CURLOPT_HTTPHEADER] = $headers;

curl_setopt_array($curl, $opts);
$rbody = curl_exec($curl);
$errno = curl_errno($curl);
curl_setopt_array($curl, $opts);
$rbody = curl_exec($curl);
$errno = curl_errno($curl);

if ($rbody === false) {
$errno = curl_errno($curl);
$message = curl_error($curl);
curl_close($curl);
$this->handleCurlError($errno, $message);
}
if ($rbody === false) {
$errno = curl_errno($curl);
$message = curl_error($curl);
curl_close($curl);
$this->handleCurlError($errno, $message);
}

$rcode = curl_getinfo($curl, CURLINFO_HTTP_CODE);
curl_close($curl);
return array($rbody, $rcode);
}
$rcode = curl_getinfo($curl, CURLINFO_HTTP_CODE);
curl_close($curl);
return array($rbody, $rcode);
}

public function handleCurlError($errno, $message)
{
$apiBase = ShippingEasy::$apiBase;
switch ($errno) {
public function handleCurlError($errno, $message)
{
$apiBase = ShippingEasy::$apiBase;
switch ($errno) {
case CURLE_COULDNT_CONNECT:
case CURLE_COULDNT_RESOLVE_HOST:
case CURLE_OPERATION_TIMEOUTED:
Expand All @@ -180,7 +187,7 @@ public function handleCurlError($errno, $message)
$msg = "Unexpected error communicating with ShippingEasy. If this problem persists, let us know at support@shippingeasy.com.";
}

$msg .= "\n\n(Network error [errno $errno]: $message)";
throw new ShippingEasy_ApiConnectionError($msg);
}
$msg .= "\n\n(Network error [errno $errno]: $message)";
throw new ShippingEasy_ApiConnectionError($msg);
}
}
Loading