From 4df5b6896cafb257e300ca50afeadd4d9ffde751 Mon Sep 17 00:00:00 2001 From: Markus Birth Date: Sat, 9 Jul 2016 20:40:46 +0200 Subject: [PATCH] Convert to array if JSON isn't one already. --- lib/Frs/FieldDefinition.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/lib/Frs/FieldDefinition.php b/lib/Frs/FieldDefinition.php index d9ebaf8..282c8d2 100644 --- a/lib/Frs/FieldDefinition.php +++ b/lib/Frs/FieldDefinition.php @@ -16,9 +16,12 @@ class FieldDefinition if (!file_exists($definitionFile)) { throw new \Exception('File ' . $definitionFile . ' not found!'); } - $fieldDataJson = file_get_contents($definitionFile); - /** @var array */ - $this->fieldData = json_decode($fieldDataJson, true); + $fieldDataJson = file_get_contents($definitionFile); + $fieldData = json_decode($fieldDataJson, true); + if (!is_array($fieldData)) { + $fieldData = array($fieldData); + } + $this->fieldData = $fieldData; } public function getFieldData()