Fix jublo#63 Return rate-limiting info only if contained in response

mynetx · mynetx · commit e1a9ff4e049e · 2014-06-08T20:27:43.000+02:00
diff --git a/CHANGELOG b/CHANGELOG
@@ -15,6 +15,7 @@ codebird-php - changelog
 + Reset bearer token when requesting a new token
 + #61 Return rate limit details with each API call
 + #60 Support uploading multiple media
+- #63 Return rate-limiting info only if contained in response
 
 2.4.1 (2013-06-23)
 + #26 Stringify null and boolean parameters
diff --git a/src/codebird.php b/src/codebird.php
@@ -1098,17 +1098,24 @@ protected function _callApi($httpmethod, $method, $method_template, $params = ar
         $httpstatus = curl_getinfo($ch, CURLINFO_HTTP_CODE);
         $reply      = $this->_parseApiReply($method_template, $result);
         $headers    = $this->_parseApiReply($method_template, $result, true);
-        $rate       = array(
-            'limit'     => $headers['x-rate-limit-limit'],
-            'remaining' => $headers['x-rate-limit-remaining'],
-            'reset'     => $headers['x-rate-limit-reset']
-        );
+        $rate       = null;
+        if (isset($headers['x-rate-limit-limit'])) {
+            $rate   = array(
+                'limit'     => $headers['x-rate-limit-limit'],
+                'remaining' => $headers['x-rate-limit-remaining'],
+                'reset'     => $headers['x-rate-limit-reset']
+            );
+        }
         if ($this->_return_format === CODEBIRD_RETURNFORMAT_OBJECT) {
             $reply->httpstatus = $httpstatus;
-            $reply->rate       = $rate;
+            if ($rate !== null) {
+                $reply->rate       = $rate;
+            }
         } elseif ($this->_return_format === CODEBIRD_RETURNFORMAT_ARRAY) {
             $reply['httpstatus'] = $httpstatus;
-            $reply['rate']       = $rate;
+            if ($rate !== null) {
+                $reply['rate']       = $rate;
+            }
         }
         return $reply;
     }
