Merge branch 'container-base64-hotfix'

GoyaPtyLtd · Mar 7, 2019 · 78dfe2d · 78dfe2d
2 parents 4b0c24c + e5cfa38
commit 78dfe2d
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 3 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,6 @@
+### 5.2.2 (Released 2019-03-07) ###
+ - Fix base64 container encoding warnings in PHP 5.6
+
 ### 5.2.1 (Released 2019-02-05) ###
  - Reset reporting level for production systems.
 

diff --git a/lib/RESTfm/BackendFileMaker/FileMakerOpsLayout.php b/lib/RESTfm/BackendFileMaker/FileMakerOpsLayout.php
@@ -162,7 +162,11 @@ public function read () {
  if (preg_match('/^\/fmi\/xml\/cnt\/([^\?]*)\?/', $fieldData, $matches)) {
  $filename = $matches[1] . ';';
  }
- $fieldData = $filename . base64_encode($FM->getContainerData($record->getField($fieldName, $repetition)));
+ $containerData = $FM->getContainerData($record->getField($fieldName, $repetition));
+ if (gettype($containerData) !== 'string') {
+ $containerData = "";
+ }
+ $fieldData = $filename . base64_encode($containerData);
  break;
  case self::CONTAINER_RAW:
  // TODO

diff --git a/lib/RESTfm/BackendFileMaker/FileMakerOpsRecord.php b/lib/RESTfm/BackendFileMaker/FileMakerOpsRecord.php
@@ -538,7 +538,11 @@ protected function _parseRecord (\RESTfm\Message\Message $restfmMessage, \FileMa
  if (preg_match('/^\/fmi\/xml\/cnt\/([^\?]*)\?/', $fieldData, $matches)) {
  $filename = $matches[1] . ';';
  }
- $fieldData = $filename . base64_encode($FM->getContainerData($record->getField($fieldName, $repetition)));
+ $containerData = $FM->getContainerData($record->getField($fieldName, $repetition));
+ if (gettype($containerData) !== 'string') {
+ $containerData = "";
+ }
+ $fieldData = $filename . base64_encode($containerData);
  break;
  case self::CONTAINER_RAW:
  // TODO

diff --git a/lib/RESTfm/Version.php b/lib/RESTfm/Version.php
@@ -23,7 +23,7 @@
  * Version static class to hold release version.
  */
 class Version {
- private static $_release = '5.2.1';
+ private static $_release = '5.2.2';
  private static $_revision = '%%REVISION%%';
  private static $_protocol = '6'; // Bump this when REST API changes.