Better handling of response and error

Author: tareqtms

lib/CurlRequest.php

@@ -20,6 +20,14 @@
 */
 class CurlRequest
 {
+    /**
+     * HTTP Code of the last executed request
+     *
+     * @var integer
+     */
+    public static $lastHttpCode;
+
+
     /**
      * Initialize the curl resource
      *
@@ -28,7 +36,7 @@ class CurlRequest
      *
      * @return resource
      */
-    public static function init($url, $httpHeaders = array())
+    protected static function init($url, $httpHeaders = array())
     {
         // Create Curl resource
         $ch = curl_init();
@@ -130,7 +138,7 @@ public static function delete($url, $httpHeaders = array())
      *
      * @return string
      */
-    public static function processRequest($ch)
+    protected static function processRequest($ch)
     {
         // $output contains the output string
         $output = curl_exec($ch);
@@ -139,13 +147,7 @@ public static function processRequest($ch)
             throw new Exception\CurlException(curl_errno($ch) . ' : ' . curl_error($ch));
         }
 
-        $httpCode = curl_getinfo($ch, CURLINFO_HTTP_CODE);
-        $httpOK = 200;
-        $httpCreated = 201;
-
-        if ($httpCode != $httpOK && $httpCode != $httpCreated) {
-            throw new Exception\CurlException("Request failed with HTTP Code $httpCode.");
-        }
+        self::$lastHttpCode = curl_getinfo($ch, CURLINFO_HTTP_CODE);
 
         // close curl resource to free up system resources
         curl_close($ch);

lib/ShopifyAPI.php

@@ -453,9 +453,13 @@ protected function castString($array)
         if (is_string($array)) return $array;
 
         $string = '';
-
+        $i = 0;
         foreach ($array as $key => $val) {
-            $string .= "$key - " . $this->castString($val) . ', ';
+            //Add values separated by comma
+            //prepend the key string, if it's an associative key
+            //Check if the value itself is another array to be converted to string
+            $string .= ($i === $key ? '' : "$key - ") . $this->castString($val) . ', ';
+            $i++;
         }
 
         //Remove trailing comma and space
@@ -478,6 +482,17 @@ public function processResponse($response, $dataKey = false)
     {
         $responseArray = json_decode($response, true);
 
+        if($responseArray === null) {
+            //Something went wrong, Checking HTTP Codes
+            $httpOK = 200; //Request Successful, OK.
+            $httpCreated = 201; //Create Successful.
+            $httpCode = CurlRequest::$lastHttpCode;
+
+            if ($httpCode != $httpOK && $httpCode != $httpCreated) {
+                throw new Exception\CurlException("Request failed with HTTP Code $httpCode.");
+            }
+        }
+
         if (isset ($responseArray['errors'])) {
             $message = $this->castString($responseArray['errors']);