Merge 73634fa into 3231829

bigcommerce · Jul 30, 2018 · 37b4f9c · 37b4f9c
2 parents 3231829 + 73634fa
commit 37b4f9c
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 5 deletions.
diff --git a/src/Bigcommerce/Api/Client.php b/src/Bigcommerce/Api/Client.php
@@ -406,7 +406,7 @@ private static function mapCount($object)
     /**
      * Swaps a temporary access code for a long expiry auth token.
      *
-     * @param \stdClass $object
+     * @param \stdClass|array $object
      * @return \stdClass
      */
     public static function getAuthToken($object)
@@ -417,6 +417,12 @@ public static function getAuthToken($object)
         return $connection->post(self::$login_url . '/oauth2/token', $context);
     }
 
+    /**
+     * @param int $id
+     * @param string $redirectUrl
+     * @param string $requestIp
+     * @return string
+     */
     public static function getCustomerLoginToken($id, $redirectUrl = '', $requestIp = '')
     {
         if (empty(self::$client_secret)) {

diff --git a/src/Bigcommerce/Api/Connection.php b/src/Bigcommerce/Api/Connection.php
@@ -98,8 +98,8 @@ public function __construct()
         curl_setopt($this->curl, CURLOPT_HEADERFUNCTION, array($this, 'parseHeader'));
         curl_setopt($this->curl, CURLOPT_WRITEFUNCTION, array($this, 'parseBody'));
 
-	// Set to a blank string to make cURL include all encodings it can handle (gzip, deflate, identity) in the 'Accept-Encoding' request header and respect the 'Content-Encoding' response header
-	curl_setopt($this->curl, CURLOPT_ENCODING, '');
+        // Set to a blank string to make cURL include all encodings it can handle (gzip, deflate, identity) in the 'Accept-Encoding' request header and respect the 'Content-Encoding' response header
+        curl_setopt($this->curl, CURLOPT_ENCODING, '');
 
         if (!ini_get("open_basedir")) {
             curl_setopt($this->curl, CURLOPT_FOLLOWLOCATION, true);

diff --git a/src/Bigcommerce/Api/Filter.php b/src/Bigcommerce/Api/Filter.php
@@ -12,6 +12,8 @@ class Filter
     /**
      * Factory method, creates an instance of a filter.
      * Used to build URLs to collection endpoints.
+     * @param array $filter
+     * @return $this
      */
     public static function create($filter = array())
     {

diff --git a/src/Bigcommerce/Api/Resource.php b/src/Bigcommerce/Api/Resource.php
@@ -100,11 +100,11 @@ private function isIgnoredField($field, $value)
             return true;
         }
 
-        if (strpos($field, "date") !== false && $value === "") {
+        if ($value === "" && strpos($field, "date") !== false) {
             return true;
         }
 
-        if (in_array($field, $this->ignoreIfZero, true) && $value === 0) {
+        if ($value === 0 && in_array($field, $this->ignoreIfZero, true)) {
             return true;
         }