Merge pull request #58 from tkuijer/master

Fix #57: Portal limit and offset result in error when using a condition

Author: msyk

src/Supporting/FileMakerLayout.php

@@ -64,20 +64,21 @@ public function endCommunication()
      * @return array
      * @ignore
      */
-    private function buildPortalParameters($param, $shortKey = false)
+    private function buildPortalParameters($param, $shortKey = false, $method = "GET")
     {
         $key = $shortKey ? "portal" : "portalData";
+        $prefix = $method === "GET" ? "" : "_";
         $request = [];
         if (array_values($param) === $param) {
             $request[$key] = $param;
         } else {
             $request[$key] = array_keys($param);
             foreach ($param as $portalName => $options) {
                 if (!is_null($options) && $options['limit']) {
-                    $request["_limit.{$portalName}"] = $options['limit'];
+                    $request["{$prefix}limit.{$portalName}"] = $options['limit'];
                 }
                 if (!is_null($options) && $options['offset']) {
-                    $request["_offset.{$portalName}"] = $options['offset'];
+                    $request["{$prefix}offset.{$portalName}"] = $options['offset'];
                 }
             }
         }
@@ -165,6 +166,7 @@ public function query($condition = null, $sort = null, $offset = 0, $range = 0,
             if ($this->restAPI->login()) {
                 $headers = ["Content-Type" => "application/json"];
                 $request = [];
+                $method = is_null($condition) ? "GET" : "POST";
                 if (!is_null($sort)) {
                     $request["sort"] = $sort;
                 }
@@ -175,19 +177,18 @@ public function query($condition = null, $sort = null, $offset = 0, $range = 0,
                     $request["limit"] = (string)$range;
                 }
                 if (!is_null($portal)) {
-                    $request = array_merge($request, $this->buildPortalParameters($portal, true));
+                    $request = array_merge($request, $this->buildPortalParameters($portal, true, $method));
                 }
                 if (!is_null($script)) {
                     $request = array_merge($request, $this->buildScriptParameters($script));
                 }
                 if (!is_null($condition)) {
                     $request["query"] = $condition;
                     $params = ["layouts" => $this->layout, "_find" => null];
-                    $this->restAPI->callRestAPI($params, true, "POST", $request, $headers);
                 } else {
                     $params = ["layouts" => $this->layout, "records" => null];
-                    $this->restAPI->callRestAPI($params, true, "GET", $request, $headers);
                 }
+                $this->restAPI->callRestAPI($params, true, $method, $request, $headers);
                 $this->restAPI->storeToProperties();
                 $result = $this->restAPI->responseBody;
                 $fmrel = null;