Merge pull request #38 from azgalot/master

MoySklad: editing building of query parameters
gwinn · Jan 25, 2018 · 2b2ee62 · 2b2ee62
2 parents 8753fd6 + 2fff52d
commit 2b2ee62
Showing 1 changed file with 9 additions and 8 deletions.
diff --git a/src/SaaS/Service/Moysklad/Request.php b/src/SaaS/Service/Moysklad/Request.php
@@ -50,7 +50,7 @@ class Request
     /**
      * Filters
      */
-    const FILTER_OPERANDS = array('=', '>', '<', '>=', '<=', '!=');
+    const FILTER_OPERANDS = array('=', '>', '<', '>=', '<=', '!=', '~', '~=', '=~');
 
     /**
      * Restrictions
@@ -298,9 +298,9 @@ private function httpBuildQuery($parameters)
                 }
 
                 if (is_array($value)) {
-                    $filters[$name] = implode(',', $value);
+                    $filters[$name] = implode(sprintf("&%s=", $name), $value);
                 } else {
-                    $filters[$name] = $value;
+                    $filters[$name] = urlencode($value);
                 }
             }
 
@@ -309,16 +309,16 @@ private function httpBuildQuery($parameters)
         }
 
         return trim(('?' . (
-                !empty($params) ?
-                (http_build_query($params) . '&') :
+            !empty($params) ?
+                urldecode(http_build_query($params) . '&') :
                 ''
             ) . $filter), '&');
     }
 
     /**
      * build filter.
      *
-     * @param array $filter
+     * @param array $filters
      * @return string
      * @access private
      */
@@ -330,7 +330,8 @@ private function buildFilter($filters)
             if (!in_array($filter['operand'], self::FILTER_OPERANDS)) {
                 continue;
             }
-            $params .= $filter['name'] . $filter['operand'] . urlencode($filter['value']) . ';';
+
+            $params .= $filter['name'] . urlencode($filter['operand']) . urlencode($filter['value']) . ';';
         }
 
         unset($filter);
@@ -342,7 +343,7 @@ private function buildFilter($filters)
     /**
      * Get error.
      *
-     * @param array
+     * @param array $result
      * @return string
      * @access private
      */