Merge pull request #33 from matsuo/fix-compatiblity

Add compatibility with FileMaker Server 17 again and fix getPortalNames()

Author: msyk

FMDataAPI.php

@@ -542,7 +542,8 @@ public function query($condition = null, $sort = null, $offset = -1, $range = -1
                     property_exists($result->response, 'data') &&
                     property_exists($result, 'messages')
                 ) {
-                    $fmrel = new FileMakerRelation($result->response->data, $result->response->dataInfo,
+                    $fmrel = new FileMakerRelation($result->response->data, 
+                        property_exists($result->response, 'dataInfo') ? $result->response->dataInfo : null,
                         "OK", $result->messages[0]->code, null, $this->restAPI);
                 }
                 $this->restAPI->logout();
@@ -581,8 +582,11 @@ public function getRecord($recordId, $portal = null, $script = null)
                 $result = $this->restAPI->responseBody;
                 $fmrel = null;
                 if ($result) {
-                    $dataInfo = clone $result->response->dataInfo;
-                    $dataInfo->returnedCount = 1;
+                    $dataInfo = null;
+                    if (property_exists($result->response, 'dataInfo') && is_object($result->response->dataInfo)) {
+                        $dataInfo = clone $result->response->dataInfo;
+                        $dataInfo->returnedCount = 1;
+                    }
                     $fmrel = new FileMakerRelation($result->response->data, $dataInfo,
                         "OK", $result->messages[0]->code, null, $this->restAPI);
                 }
@@ -1177,11 +1181,13 @@ public function toArray()
     public function getPortalNames()
     {
         $list = [];
-        if (isset($this->data)
-            && isset($this->data->portalData)
-        ) {
-            foreach ($this->data->portalData as $key => $val) {
-                array_push($list, $key);
+        if (isset($this->data)) {
+            foreach ($this->data as $key) {
+                if (property_exists($key, 'portalData')) {
+                    foreach ($key->portalData as $name => $val) {
+                        array_push($list, $name);
+                    }
+                }
             }
         }
         return $list;
@@ -1212,7 +1218,8 @@ public function field($name, $toName = null)
                             isset($this->data[$this->pointer]->portalData->$name)
                         ) {
                             $value = new FileMakerRelation(
-                                $this->data[$this->pointer]->portalData->$name, $this->data->portalDataInfo,
+                                $this->data[$this->pointer]->portalData->$name,
+                                property_exists($this->data[$this->pointer], 'portalDataInfo') ? $this->data[$this->pointer]->portalDataInfo : null,
                                 "PORTAL", 0, null, $this->restAPI);
                         }
                     }
@@ -1229,7 +1236,8 @@ public function field($name, $toName = null)
                         $value = $this->data->fieldData->$name;
                     } else if (isset($this->data->portalData) && isset($this->data->portalData->$name)) {
                         $value = new FileMakerRelation(
-                            $this->data->portalData->$name, $this->data->portalDataInfo,
+                            $this->data->portalData->$name,
+                            property_exists($this->data, 'portalDataInfo') ? $this->data->portalDataInfo : null,
                             "PORTAL", 0, $name, $this->restAPI);
                     }
                     break;
@@ -1349,8 +1357,12 @@ public function current()
         if (isset($this->data) &&
             isset($this->data[$this->pointer])
         ) {
-            $dataInfo = clone $this->getDataInfo();
-            $dataInfo->returnedCount = 1;
+            $tmpInfo = $this->getDataInfo();
+            $dataInfo = null;
+            if ($tmpInfo !== null && is_object($tmpInfo)) {
+                $dataInfo = clone $tmpInfo;
+                $dataInfo->returnedCount = 1;
+            }
             $value = new FileMakerRelation(
                 $this->data[$this->pointer], $dataInfo,
                 ($this->result == "PORTAL") ? "PORTALRECORD" : "RECORD",
@@ -1751,7 +1763,11 @@ public function getProductInfo()
                 $returnValue = $this->responseBody->response->productInfo;
             }
         } catch (\Exception $e) {
-            throw $e;
+            if ($this->httpStatus == 200 && $this->errorCode == 0) {
+                $returnValue = array("version" => 17);
+            } else {
+                throw $e;
+            }
         }
         return $returnValue;
     }