Merge branch '6.1' into 6.2

Author: github-actions[bot]

src/Forms/ListboxField.php

@@ -256,28 +256,31 @@ public function getValueArray()
         if (empty($validValues)) {
             return [];
         }
-
-        $canary = reset($validValues);
-        $targetType = gettype($canary);
+        if (!is_array($value) && ($value === 0 || $value === '0')) {
+            $value = [$value];
+        }
         if (is_array($value) && count($value) > 0) {
-            $first = reset($value);
-            // sanity check the values - make sure strings get strings, ints get ints etc
-            if ($targetType !== gettype($first)) {
-                $replaced = [];
-                foreach ($value as $item) {
-                    if (!is_array($item)) {
-                        $item = json_decode($item ?? '', true);
-                    }
-
-                    if ($targetType === gettype($item)) {
-                        $replaced[] = $item;
-                    } elseif (isset($item['Value'])) {
-                        $replaced[] = $item['Value'];
+            $replaced = [];
+            foreach ($value as $item) {
+                if (!is_array($item) && is_string($item)) {
+                    $trimmed = trim($item);
+                    if ($trimmed !== '') {
+                        $firstChar = substr($trimmed, 0, 1);
+                        if ($firstChar === '{' || $firstChar === '[') {
+                            $decoded = json_decode($item, true);
+                            if (is_array($decoded)) {
+                                $item = $decoded;
+                            }
+                        }
                     }
                 }
-
-                $value = $replaced;
+                if (is_array($item) && array_key_exists('Value', $item)) {
+                    $replaced[] = $item['Value'];
+                } else {
+                    $replaced[] = $item;
+                }
             }
+            $value = $replaced;
         }
 
         return $this->getListValues($value);

tests/php/Forms/ListboxFieldTest.php

@@ -2,6 +2,7 @@
 
 namespace SilverStripe\Forms\Tests;
 
+use PHPUnit\Framework\Attributes\DataProvider;
 use SilverStripe\Forms\Tests\ListboxFieldTest\Article;
 use SilverStripe\Forms\Tests\ListboxFieldTest\Tag;
 use SilverStripe\Forms\Tests\ListboxFieldTest\TestObject;
@@ -11,7 +12,6 @@
 use SilverStripe\Forms\ListboxField;
 use SilverStripe\Forms\Validation\RequiredFieldsValidator;
 use SilverStripe\Model\ArrayData;
-use PHPUnit\Framework\Attributes\DataProvider;
 
 class ListboxFieldTest extends SapphireTest
 {
@@ -119,6 +119,58 @@ public function testSaveIntoMultiple()
         $this->assertEquals('["a","c"]', $obj2->Choices);
     }
 
+    public static function provideSaveIntoValueScenarios(): array
+    {
+        return [
+            'mixed-values' => [
+                'input' => [null, 0, false, '123', -123, '', '0', 'ABC123'],
+                'expected' => [null, 0, false, '123', -123, '', '0', 'ABC123'],
+            ],
+            'string-values' => [
+                'input' => ['123', '0', '-123', '', 'ABC123'],
+                'expected' => ['123', '0', '-123', '', 'ABC123'],
+            ],
+            'integer-values' => [
+                'input' => [0, 123, -123],
+                'expected' => [0, 123, -123],
+            ],
+            'boolean-values' => [
+                'input' => [false, true],
+                'expected' => [false, true],
+            ],
+            'null-only' => [
+                'input' => [null],
+                'expected' => [null],
+            ],
+            'scalar-zero' => [
+                'input' => 0,
+                'expected' => [0],
+            ],
+            'scalar-string-zero' => [
+                'input' => '0',
+                'expected' => ['0'],
+            ],
+        ];
+    }
+
+    #[DataProvider('provideSaveIntoValueScenarios')]
+    public function testSaveIntoPreservesValueTypes(mixed $input, array $expected): void
+    {
+        $choices = [
+            '' => 'Empty string',
+            0 => 'Zero',
+            '123' => 'String integer',
+            -123 => 'Negative integer',
+            'ABC123' => 'Alpha-numeric string',
+            'false' => 'False string',
+        ];
+        $field = new ListboxField('Choices', 'Choices', $choices);
+        $obj = new TestObject();
+        $field->setValue($input);
+        $field->saveInto($obj);
+        $this->assertSame($expected, json_decode($obj->Choices, true));
+    }
+
     public function testSaveIntoManyManyRelation()
     {
         $article = $this->objFromFixture(Article::class, 'articlewithouttags');