Merge pull request #390 from kevin-appelt/patch-1

[TASK] Use associative array keys for TCA items

Author: achimfritz

Classes/Tca/Registry.php

@@ -29,16 +29,30 @@ class Registry implements SingletonInterface
      */
     public function configureContainer(ContainerConfiguration $containerConfiguration): void
     {
-        ExtensionManagementUtility::addTcaSelectItem(
-            'tt_content',
-            'CType',
-            [
-                $containerConfiguration->getLabel(),
-                $containerConfiguration->getCType(),
-                $containerConfiguration->getCType(),
-                $containerConfiguration->getGroup(),
-            ]
-        );
+        if ((GeneralUtility::makeInstance(Typo3Version::class))->getMajorVersion() >= 12) {
+            ExtensionManagementUtility::addTcaSelectItem(
+                'tt_content',
+                'CType',
+                [
+                    'label' => $containerConfiguration->getLabel(),
+                    'value' => $containerConfiguration->getCType(),
+                    'icon' => $containerConfiguration->getCType(),
+                    'group' => $containerConfiguration->getGroup(),
+                ]
+            );
+        } else {
+            ExtensionManagementUtility::addTcaSelectItem(
+                'tt_content',
+                'CType',
+                [
+                    $containerConfiguration->getLabel(),
+                    $containerConfiguration->getCType(),
+                    $containerConfiguration->getCType(),
+                    $containerConfiguration->getGroup(),
+                ]
+            );
+        }
+
         if (
             (GeneralUtility::makeInstance(Typo3Version::class))->getMajorVersion() === 12 ||
             GeneralUtility::makeInstance(Features::class)->isFeatureEnabled('fluidBasedPageModule')
@@ -51,10 +65,17 @@ public function configureContainer(ContainerConfiguration $containerConfiguratio
                 if (str_contains((string)$column['colPos'], (string)ContainerGridColumn::CONTAINER_COL_POS_DELIMITER_V12)) {
                     trigger_error('delimiter ' . (string)ContainerGridColumn::CONTAINER_COL_POS_DELIMITER_V12 . ' cannot be used as colPos (will throw Exception on next major releas)', E_USER_DEPRECATED);
                 }
-                $GLOBALS['TCA']['tt_content']['columns']['colPos']['config']['items'][] = [
-                    $column['name'],
-                    $column['colPos'],
-                ];
+                if ((GeneralUtility::makeInstance(Typo3Version::class))->getMajorVersion() >= 12) {
+                    $GLOBALS['TCA']['tt_content']['columns']['colPos']['config']['items'][] = [
+                        'label' => $column['name'],
+                        'value' => $column['colPos'],
+                    ];
+                } else {
+                    $GLOBALS['TCA']['tt_content']['columns']['colPos']['config']['items'][] = [
+                        $column['name'],
+                        $column['colPos'],
+                    ];
+                }
             }
         }
 

Classes/View/ContainerLayoutView.php

@@ -117,7 +117,11 @@ protected function initLabels(): void
     {
         $this->CType_labels = [];
         foreach ($GLOBALS['TCA']['tt_content']['columns']['CType']['config']['items'] as $val) {
-            $this->CType_labels[$val[1]] = $this->getLanguageService()->sL($val[0]);
+            if ((GeneralUtility::makeInstance(Typo3Version::class))->getMajorVersion() >= 12) {
+                $this->CType_labels[$val['value'] ?? $val[1]] = $this->getLanguageService()->sL($val['label'] ?? $val[0]);
+            } else {
+                $this->CType_labels[$val[1]] = $this->getLanguageService()->sL($val[0]);
+            }
         }
 
         $this->itemLabels = [];