fix(question): make import resilient against missing parameters

Signed-off-by: Thierry Bugier <tbugier@teclib.com>
pluginsGLPI · Apr 12, 2021 · 1594e6f · 1594e6f
1 parent 9ea1460
commit 1594e6f
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/inc/abstractfield.class.php b/inc/abstractfield.class.php
@@ -185,6 +185,11 @@ public function getEmptyParameters() : array {
       return [];
    }
 
+   /**
+    * Undocumented function
+    *
+    * @return PluginFormcreatorAbstractQuestionParameter[]
+    */
    public final function getParameters() : array {
       $parameters = $this->getEmptyParameters();
       foreach ($parameters as $fieldname => $parameter) {

diff --git a/inc/question.class.php b/inc/question.class.php
@@ -946,7 +946,17 @@ public static function import(PluginFormcreatorLinker $linker, array $input = []
       if (isset($input['_parameters'])) {
          $parameters = $field->getParameters();
          foreach ($parameters as $fieldName => $parameter) {
-            $parameter::import($linker, $input['_parameters'][$input['fieldtype']][$fieldName], $itemId);
+            if (is_array($input['_parameters'][$input['fieldtype']][$fieldName])) {
+               /** @var PluginFormcreatorExportableInterface $parameter */
+               $parameter::import($linker, $input['_parameters'][$input['fieldtype']][$fieldName], $itemId);
+            } else {
+               // Import data incomplete, parameter not defined
+               // Adding an empty parameter (assuming the question is actually added or updated in DB)
+               $parameterInput = $parameter->fields;
+               $parameterInput['plugin_formcreator_questions_id'] = $itemId;
+               unset($parameterInput['id']);
+               $parameter->add($parameterInput);
+            }
          }
       }