[FEATURE] TCA refactoring

Follow up to core patch for extbase submodule

Related: #45767
Releases: 6.1
Change-Id: Ic1c17a322d89043e9ea84ce9ef9b29288254b2fd
Reviewed-on: https://review.typo3.org/18451
Reviewed-by: Christian Kuhn
Tested-by: Christian Kuhn

diff --git a/typo3/sysext/extbase/Classes/Persistence/Generic/Mapper/DataMapFactory.php b/typo3/sysext/extbase/Classes/Persistence/Generic/Mapper/DataMapFactory.php
index 3df8803..d954dad 100644 (file)
--- a/typo3/sysext/extbase/Classes/Persistence/Generic/Mapper/DataMapFactory.php
+++ b/typo3/sysext/extbase/Classes/Persistence/Generic/Mapper/DataMapFactory.php
@@ -230,7 +230,6 @@ class DataMapFactory implements \TYPO3\CMS\Core\SingletonInterface {
         * @return array The TCA columns definition
         */
        protected function getControlSection($tableName) {
-               $this->includeTca($tableName);
                return is_array($GLOBALS['TCA'][$tableName]['ctrl']) ? $GLOBALS['TCA'][$tableName]['ctrl'] : NULL;
        }
 
@@ -241,23 +240,9 @@ class DataMapFactory implements \TYPO3\CMS\Core\SingletonInterface {
         * @return array The TCA columns definition
         */
        protected function getColumnsDefinition($tableName) {
-               $this->includeTca($tableName);
                return is_array($GLOBALS['TCA'][$tableName]['columns']) ? $GLOBALS['TCA'][$tableName]['columns'] : array();
        }
 
-       /**
-        * Includes the TCA for the given table
-        *
-        * @param string $tableName An optional table name to fetch the columns definition from
-        * @return void
-        */
-       protected function includeTca($tableName) {
-               if (TYPO3_MODE === 'FE') {
-                       $GLOBALS['TSFE']->includeTCA();
-               }
-               \TYPO3\CMS\Core\Utility\GeneralUtility::loadTCA($tableName);
-       }
-
        /**
         * @param DataMap $dataMap
         * @param $tableName

diff --git a/typo3/sysext/extbase/ext_tables.php b/typo3/sysext/extbase/ext_tables.php
index 529bae9..667e602 100644 (file)
--- a/typo3/sysext/extbase/ext_tables.php
+++ b/typo3/sysext/extbase/ext_tables.php
@@ -7,7 +7,6 @@ if (TYPO3_MODE == 'BE') {
        $TBE_MODULES['_dispatcher'][] = 'TYPO3\\CMS\\Extbase\\Core\\ModuleRunnerInterface';
 }
 $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['reports']['tx_reports']['status']['providers']['extbase'][] = 'TYPO3\\CMS\\Extbase\\Utility\\ExtbaseRequirementsCheckUtility';
-\TYPO3\CMS\Core\Utility\GeneralUtility::loadTCA('fe_users');
 if (!isset($TCA['fe_users']['ctrl']['type'])) {
        $tempColumns = array(
                'tx_extbase_type' => array(
@@ -30,7 +29,6 @@ if (!isset($TCA['fe_users']['ctrl']['type'])) {
        $TCA['fe_users']['ctrl']['type'] = 'tx_extbase_type';
 }
 $TCA['fe_users']['types']['Tx_Extbase_Domain_Model_FrontendUser'] = $TCA['fe_users']['types']['0'];
-\TYPO3\CMS\Core\Utility\GeneralUtility::loadTCA('fe_groups');
 if (!isset($TCA['fe_groups']['ctrl']['type'])) {
        $tempColumns = array(
                'tx_extbase_type' => array(