FIX / Default value migrated from Formcreator wrongly checks first option when unmatched

.phpstan-baseline.php

@@ -8455,12 +8455,6 @@
 	'count' => 1,
 	'path' => __DIR__ . '/src/Glpi/Form/QuestionType/AbstractQuestionTypeActors.php',
 ];
-$ignoreErrors[] = [
-	'message' => '#^Binary operation "\\+" between int\\|string\\|false and 1 results in an error\\.$#',
-	'identifier' => 'binaryOp.invalid',
-	'count' => 1,
-	'path' => __DIR__ . '/src/Glpi/Form/QuestionType/AbstractQuestionTypeSelectable.php',
-];
 $ignoreErrors[] = [
 	'message' => '#^Cannot access property \\$fields on Group\\|false\\.$#',
 	'identifier' => 'property.nonObject',

src/Glpi/Form/QuestionType/AbstractQuestionTypeSelectable.php

@@ -238,8 +238,8 @@ public function convertDefaultValue(array $rawData): array
             return [];
         }
 
-        $options = json_decode($rawData['values']);
-        if (empty($options)) {
+        $options = $this->convertExtraData($rawData)[QuestionTypeSelectableExtraDataConfig::OPTIONS] ?? [];
+        if (!is_array($options) || $options === []) {
             return [];
         }
 
@@ -257,8 +257,17 @@ public function convertDefaultValue(array $rawData): array
             $default_values = [$rawData['default_values']];
         }
 
-        // Return the indexes of the default values
-        return array_map(fn($value) => array_search($value, $options) + 1, $default_values);
+        // Skip unmatched values: `array_search` returning false would
+        // otherwise wrongly resolve to the first option's index (false + 1).
+        $indexes = [];
+        foreach ($default_values as $value) {
+            $index = array_search($value, $options);
+            if ($index !== false) {
+                $indexes[] = (int) $index;
+            }
+        }
+
+        return $indexes;
     }
 
     #[Override]

src/Glpi/Form/QuestionType/QuestionTypeDropdown.php

@@ -77,7 +77,7 @@ public function convertExtraData(array $rawData): array
 
         $config = new QuestionTypeDropdownExtraDataConfig(
             options: $options,
-            is_multiple_dropdown: $rawData['fieldtype'] === 'multiselect'
+            is_multiple_dropdown: ($rawData['fieldtype'] ?? null) === 'multiselect'
         );
         return $config->jsonSerialize();
     }

tests/src/Form/QuestionType/AbstractQuestionTypeSelectableTest.php

@@ -77,4 +77,46 @@ public function testFormatPredefinedValue(string $value, ?string $expected): voi
     {
         $this->assertSame($expected, $this->getQuestionType()->formatPredefinedValue($value));
     }
+
+    public static function convertDefaultValueProvider(): iterable
+    {
+        $values = json_encode(['Option 1', 'Option 2', 'Option 3']);
+
+        yield 'matching default value' => [
+            'raw_data' => ['default_values' => 'Option 2', 'values' => $values],
+            'expected' => [2],
+        ];
+
+        yield 'matching json array of default values' => [
+            'raw_data' => ['default_values' => json_encode(['Option 1', 'Option 3']), 'values' => $values],
+            'expected' => [1, 3],
+        ];
+
+        yield 'empty default value' => [
+            'raw_data' => ['default_values' => '', 'values' => $values],
+            'expected' => [],
+        ];
+
+        yield 'no default value key' => [
+            'raw_data' => ['values' => $values],
+            'expected' => [],
+        ];
+
+        // Must not fall back to the first option (false + 1 == 1).
+        yield 'default value with no matching option' => [
+            'raw_data' => ['default_values' => 'Not an option', 'values' => $values],
+            'expected' => [],
+        ];
+
+        yield 'mix of matching and non matching default values' => [
+            'raw_data' => ['default_values' => json_encode(['Option 3', 'Not an option']), 'values' => $values],
+            'expected' => [3],
+        ];
+    }
+
+    #[DataProvider('convertDefaultValueProvider')]
+    public function testConvertDefaultValue(array $raw_data, array $expected): void
+    {
+        $this->assertSame($expected, $this->getQuestionType()->convertDefaultValue($raw_data));
+    }
 }