Allow sequence of arrays for problem types

See: https://www.kattis.com/problem-package-format/spec/2025-09.html#type

Author: vmcj

webapp/src/Entity/Problem.php

@@ -331,7 +331,10 @@ public function setTypesAsString(array $types): Problem
         return $this;
     }
 
-    public function getTypesAsString(): string
+    /**
+     * @return list<string>
+     */
+    public function getTypesAsStringArray(): array
     {
         $typeConstants = $this->getTypes();
         $typeStrings = [];
@@ -341,7 +344,12 @@ public function getTypesAsString(): string
             }
             $typeStrings[] = $this->typesToString[$type];
         }
-        return implode(', ', $typeStrings);
+        return $typeStrings;
+    }
+
+    public function getTypesAsString(): string
+    {
+        return implode(', ', $this->getTypesAsStringArray());
     }
 
     /**

webapp/src/Service/ImportProblemService.php

@@ -1199,6 +1199,27 @@ public static function parseTestCaseGroupMeta(string $fileContent, string $name,
         return $testcaseGroup;
     }
 
+    /**
+     * Allow to import the types both as arrays and as strings. Due
+     * to the recursion to make parsing of the strings easier this now
+     * also works for arrays inside arrays.
+     *
+     * @param string|array<mixed, mixed> $input
+     * @return string[]
+     */
+    private static function parseTypes(string|array $input): array
+    {
+        $final = [];
+        if (is_array($input)) {
+            foreach ($input as $possibleType) {
+                $final = array_merge($final, self::parseTypes($possibleType));
+            }
+        } else {
+            $final = array_merge($final, preg_split("/[\s,;]+/", $input));
+        }
+        return $final;
+    }
+
     /**
      * Returns true iff the yaml could be parsed correctly.
      *
@@ -1235,7 +1256,7 @@ public static function parseYaml(bool|string $problemYaml, array &$messages, str
 
         $validationMode = 'default';
         if (isset($yamlData['type'])) {
-            $types = explode(' ', $yamlData['type']);
+            $types = self::parseTypes($yamlData['type']);
             // Validation happens later when we set the properties.
             $yamlProblemProperties['typesAsString'] = $types;
             if (in_array('interactive', $types)) {

webapp/tests/Unit/Service/ImportProblemServiceTest.php

@@ -133,6 +133,53 @@ public function testTypesYamlTest(): void
         }
     }
 
+    #[DataProvider('provideAlternativeTypeNotations')]
+    public function testTypesStringWithAlternativeChars(string $separator): void
+    {
+        $expectedTypes = ['pass-fail', 'interactive'];
+        $typesAsString = implode($separator, $expectedTypes);
+        $specVersion = 'draft';
+        $yaml = <<<YAML
+name: test
+problem_format_version: $specVersion
+type: $typesAsString
+YAML;
+
+        $messages = [];
+        $validationMode = 'xxx';
+        $problem = new Problem();
+
+        $ret = ImportProblemService::parseYaml($yaml, $messages, $validationMode, PropertyAccess::createPropertyAccessor(), $problem);
+        $messageString = var_export($messages, true);
+        $this->assertTrue($ret, 'Parsing failed for type: ' . $typesAsString . ', messages: ' . $messageString);
+        $problemTypes = $problem->getTypesAsStringArray();
+        $this->assertEquals(
+            $expectedTypes, $problemTypes,
+            'Found: "' . implode(' ', $problemTypes) . '" vs Expected: "' . implode(' ', $expectedTypes) . '"'
+        );
+    }
+
+    /**
+     * @param string[] $expectedTypes
+     */
+    #[DataProvider('provideAlternativeArrayNotations')]
+    public function testTypesSequenceStrings(string $yaml, array $expectedTypes): void
+    {
+        $messages = [];
+        $validationMode = 'xxx';
+        $problem = new Problem();
+        $typesAsString = implode(', ', $expectedTypes);
+
+        $ret = ImportProblemService::parseYaml($yaml, $messages, $validationMode, PropertyAccess::createPropertyAccessor(), $problem);
+        $messageString = var_export($messages, true);
+        $this->assertTrue($ret, 'Parsing failed for type: ' . $typesAsString . ', messages: ' . $messageString);
+        $problemTypes = $problem->getTypesAsStringArray();
+        $this->assertEquals(
+            $expectedTypes, $problemTypes,
+            'Found: "' . implode(' ', $problemTypes) . '" vs Expected: "' . implode(' ', $expectedTypes) . '"'
+        );
+    }
+
     public function testUnknownProblemType(): void
     {
         $yaml = <<<YAML
@@ -721,4 +768,51 @@ public static function problemSpecVersionProvider(): Generator
         yield ['icpc-legacy'];
         yield ['2025-09'];
     }
+
+
+    public static function provideAlternativeTypeNotations(): Generator
+    {
+        yield ["\t"];
+        yield [", "];
+        yield ["; "];
+    }
+
+    public static function provideAlternativeArrayNotations(): Generator
+    {
+        $specVersion = 'draft';
+        $yamlBasic = <<<YAML
+name: test
+problem_format_version: $specVersion
+YAML;
+        $simpleArray = <<<YAML
+$yamlBasic
+type:
+  - pass-fail
+YAML;
+        $mappedArray = <<<YAML
+$yamlBasic
+type:
+  pass-fail: pass-fail
+YAML;
+        $oneLineArray = <<<YAML
+$yamlBasic
+type: [pass-fail]
+YAML;
+        $malformedArray = <<<YAML
+$yamlBasic
+type: [pass-fail, [multi-pass, interactive]]
+YAML;
+        $combinedStringArray = <<<YAML
+$yamlBasic
+type:
+ - pass-fail
+ - multi-pass, interactive
+YAML;
+
+        foreach ([$simpleArray, $mappedArray, $oneLineArray] as $yamlFile) {
+            yield [$yamlFile, ['pass-fail']];
+        }
+        yield [$malformedArray, ['pass-fail', 'multi-pass', 'interactive']];
+        yield [$combinedStringArray, ['pass-fail', 'multi-pass', 'interactive']];
+    }
 }