[BUGFIX] Support associative "items" of check/radio fields

See https://docs.typo3.org/c/typo3/cms-core/main/en-us/Changelog/12.3/Feature-99739-AssociativeArrayKeysForTCAItems.html
pagemachine · May 21, 2024 · f8e6e52 · f8e6e52
1 parent 444ba8f
commit f8e6e52
Show file tree

Hide file tree

Showing 2 changed files with 53 additions and 3 deletions.
diff --git a/Classes/DataCollector/TCA/PlainValueProcessor.php b/Classes/DataCollector/TCA/PlainValueProcessor.php
@@ -39,7 +39,7 @@ public function processCheckboxField($value, $fieldTca)
         $activeItemKeys = BinaryConversionUtility::convertCheckboxValue($value, $itemCount);
 
         foreach ($activeItemKeys as $key) {
-            $label = $fieldTca['items'][$key][0];
+            $label = $fieldTca['items'][$key]['label'] ?? $fieldTca['items'][$key][0];
 
             if (str_starts_with((string) $label, 'LLL:')) {
                 $label = $this->getLanguageService()->sL($label);
@@ -64,8 +64,11 @@ public function processRadioField($value, $fieldTca)
 
         if (is_array($fieldTca['items'])) {
             foreach ($fieldTca['items'] as $set) {
-                if ((string)$set[1] === (string)$value) {
-                    $label = $set[0];
+                $setLabel = $set['label'] ?? $set[0];
+                $setValue = $set['value'] ?? $set[1];
+
+                if ((string)$setValue === (string)$value) {
+                    $label = $setLabel;
                     break;
                 }
             }

diff --git a/Tests/Unit/DataCollector/TCA/PlainValueProcessorTest.php b/Tests/Unit/DataCollector/TCA/PlainValueProcessorTest.php
@@ -52,6 +52,30 @@ public function convertsCheckboxValues()
         $this->assertEquals($expectedOutput, $output);
     }
 
+    /**
+     * @test
+     */
+    public function supportsAssociativeCheckboxItems()
+    {
+        $fieldTca = [
+            'type' => 'check',
+            'items' => [
+                ['label' => 'foo', 'value' => ''],
+                ['label' => 'baz', 'value' => ''],
+                ['label' => 'foobar', 'value' => ''],
+                ['label' => 'foobarbaz', 'value' => ''],
+            ],
+        ];
+
+        $value = 3;
+
+        $expectedOutput = 'foo, baz';
+
+        $output = $this->plainValueProcessor->processCheckboxField($value, $fieldTca);
+
+        $this->assertEquals($expectedOutput, $output);
+    }
+
     /**
      * @test
      */
@@ -75,6 +99,29 @@ public function convertsRadioValues()
         $this->assertEquals($expectedOutput, $output);
     }
 
+    /**
+     * @test
+     */
+    public function supportsAssociativeRadioItems()
+    {
+        $fieldTca = [
+            'type' => 'radio',
+            'items' => [
+                ['label' => 'foo', 'value' => 1],
+                ['label' => 'baz', 'value' => 2],
+                ['label' => 'foobar', 'value' => 3],
+            ],
+        ];
+
+        $value = 2;
+
+        $expectedOutput = "baz";
+
+        $output = $this->plainValueProcessor->processRadioField($value, $fieldTca);
+
+        $this->assertEquals($expectedOutput, $output);
+    }
+
     /**
      * @test
      */