Merge pull request #64 from collecthor/fix-matrixdropdown-missing-celltype

fix: parsing matrixdropdown with choices at root level and missing celltype

Author: SamMousa

src/Parsers/MultipleChoiceMatrixParser.php

@@ -23,6 +23,8 @@ public function parse(ElementParserInterface $root, array $questionConfig, Surve
         /** @var list<array<string, mixed>> $columns */
         $columns = $this->extractArray($questionConfig, 'columns');
 
+        $defaultChoices = $this->extractOptionalArray($questionConfig, 'choices');
+
 
         foreach ($rows as $row) {
             $rowName = !is_string($row) ? $row['value'] : $row;
@@ -38,7 +40,8 @@ public function parse(ElementParserInterface $root, array $questionConfig, Surve
                     $columnQuestion['hasNone'] = true;
                 }
                 $columnQuestion['title'] = $title;
-                $columnQuestion['type'] = $column['cellType'];
+                $columnQuestion['type'] = $column['cellType'] ?? 'dropdown';
+                $columnQuestion['choices'] = $columnQuestion['choices'] ?? $defaultChoices;
                 yield from $root->parse($root, $columnQuestion, $surveyConfiguration, $prefix);
             }
         }

tests/Parsers/MultipleChoiceMatrixParserTest.php

@@ -31,6 +31,7 @@
  * @uses \Collecthor\SurveyjsParser\Values\ValueSet
  * @uses \Collecthor\SurveyjsParser\Variables\MultipleChoiceVariable
  * @uses \Collecthor\SurveyjsParser\Variables\SingleChoiceVariable
+ * @uses \Collecthor\SurveyjsParser\Values\IntegerValueOption
  */
 final class MultipleChoiceMatrixParserTest extends TestCase
 {
@@ -398,4 +399,48 @@ public function testValuePath(): void
         self::assertEquals("Pakketten", $answers[0]->getDisplayValue());
         self::assertEquals("Pallets", $answers[1]->getDisplayValue());
     }
+
+
+    public function testNoCellType(): void
+    {
+        $config = json_decode(<<<JSON
+            {
+             "type": "matrixdropdown",
+             "name": "question2",
+             "columns": [
+              {
+               "name": "Column 1"
+              },
+              {
+               "name": "Column 2"
+              },
+              {
+               "name": "Column 3"
+              }
+             ],
+             "choices": [
+              1,
+              2,
+              3,
+              4,
+              5
+             ],
+             "rows": [
+              "Row 1",
+              "Row 2"
+             ]
+            }
+        JSON, true);
+        $parser = new MultipleChoiceMatrixParser();
+        $surveyConfig = new SurveyConfiguration();
+        /**
+         * @var list<MultipleChoiceVariable> $result
+         */
+        $result = toArray($parser->parse($this->getRootParser(), $config, $surveyConfig, []));
+
+        self::assertCount(6, $result);
+        foreach ($result as $variable) {
+            self::assertCount(5, $variable->getValueOptions());
+        }
+    }
 }