[BUGFIX] Allow zero and blank string as valid type values

Adjusts the `array_filter` logic added in #94408 to allow
zero (`0`, `'0'`) and a blank string (`''`) as valid type value.

Related: #94408
Resolves: #106697
Releases: main, 13.4
Change-Id: I35d4722ed7d04eaefed0b03124404d637e6de160
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/89411
Reviewed-by: Markus Sommer <markus@letsbenow.de>
Tested-by: Georg Ringer <georg.ringer@gmail.com>
Tested-by: core-ci <typo3@b13.com>
Reviewed-by: Sebastian Iffland <sebastian.iffland@fullhaus.de>
Tested-by: Friedemann Altrock <hallo@faltrock.de>
Reviewed-by: Oliver Klee <typo3-coding@oliverklee.de>
Tested-by: Markus Sommer <markus@letsbenow.de>
Tested-by: Oliver Klee <typo3-coding@oliverklee.de>
Reviewed-by: Georg Ringer <georg.ringer@gmail.com>
Tested-by: Sebastian Iffland <sebastian.iffland@fullhaus.de>
Tested-by: Oliver Hader <oliver.hader@typo3.org>
Reviewed-by: Oliver Hader <oliver.hader@typo3.org>
Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
Reviewed-by: Friedemann Altrock <hallo@faltrock.de>

Author: georgringer

typo3/sysext/backend/Classes/Form/FormDataProvider/DatabaseRecordTypeValue.php

@@ -68,7 +68,9 @@ public function addData(array $result)
                 $validItems = $this->removeItemsByUserAuthMode($result, $tcaTypeField, $result['processedTca']['columns'][$tcaTypeField]['config']['items'] ?? []);
                 $validItems = $this->removeItemsByRemoveItemsPageTsConfig($result, $tcaTypeField, $validItems);
                 $typeList = $this->getValidTypeValues($validItems);
-                if (empty($recordTypeValue) || ($typeList !== [] && !in_array($recordTypeValue, $typeList, false))) {
+                // allowing type-casts for `in_array` since the database value
+                // might be an integer value, but `items` be a string value
+                if ($typeList !== [] && !in_array($recordTypeValue, $typeList)) {
                     $recordTypeValue = array_shift($typeList);
                 }
             } else {
@@ -153,11 +155,19 @@ protected function getDatabaseRow(string $tableName, int $uid, string $fieldName
         return $row ?: [];
     }
 
+    /**
+     * @param list<array{label?: string, value?: string, icon?: string, group?: string}> $items
+     * @return list<string>
+     */
     protected function getValidTypeValues(array $items): array
     {
-        return array_filter(array_map(static function (array $item) {
-            $type = $item['value'] ?? '';
-            return $type !== '--div--' ? $type : '';
-        }, $items));
+        return array_values(
+            array_filter(
+                // resolve `value` key
+                array_map(static fn(array $item): ?string => $item['value'] ?? null, $items),
+                // filter undefined `value` keys and `--div--` items
+                static fn(?string $value): bool => $value !== null && $value !== '--div--'
+            )
+        );
     }
 }

typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/DatabaseRecordTypeValueTest.php

@@ -17,6 +17,7 @@
 
 namespace TYPO3\CMS\Backend\Tests\Unit\Form\FormDataProvider;
 
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\MockObject\MockObject;
 use TYPO3\CMS\Backend\Form\FormDataProvider\DatabaseRecordTypeValue;
@@ -144,7 +145,7 @@ public function addDataSetsRecordTypeValueToValueOfDatabaseField(): void
     {
         $input = [
             'tableName' => 'aTable',
-            'recordTypeValue' => '3',
+            'recordTypeValue' => '',
             'processedTca' => [
                 'ctrl' => [
                     'type' => 'aField',
@@ -214,6 +215,54 @@ public function addDataSetsRecordTypeValueToZeroIfValueOfDatabaseFieldIsEmptyStr
         self::assertSame($expected, $this->subject->addData($input));
     }
 
+    public static function addDataSetsRecordTypeValueToDatabaseValueIfEmptyDataProvider(): \Generator
+    {
+        yield 'empty string' => [''];
+        yield 'zero string' => ['0'];
+        yield 'one string' => ['1'];
+    }
+
+    #[Test]
+    #[DataProvider('addDataSetsRecordTypeValueToDatabaseValueIfEmptyDataProvider')]
+    public function addDataSetsRecordTypeValueToDatabaseValueIfEmpty(string $databaseValue): void
+    {
+        $input = [
+            'tableName' => 'aTable',
+            'recordTypeValue' => '',
+            'processedTca' => [
+                'ctrl' => [
+                    'type' => 'aField',
+                ],
+                'types' => [
+                    '' => 'blank',
+                    '0' => 'zero',
+                    '1' => 'one',
+                    '2' => 'two',
+                ],
+                'columns' => [
+                    'aField' => [
+                        'config' => [
+                            'items' => [
+                                ['label' => 'blank', 'value' => ''],
+                                ['label' => 'zero', 'value' => '0'],
+                                ['label' => 'one', 'value' => '1'],
+                                ['label' => 'two', 'value' => '2'],
+                            ],
+                        ],
+                    ],
+                ],
+            ],
+            'databaseRow' => [
+                'aField' => is_numeric($databaseValue) ? (int)$databaseValue : $databaseValue,
+            ],
+        ];
+
+        $expected = $input;
+        $expected['recordTypeValue'] = $databaseValue;
+
+        self::assertSame($expected, $this->subject->addData($input));
+    }
+
     #[Test]
     public function addDataThrowsExceptionIfValueTypesNotExistsAndNoFallbackExists(): void
     {