[TASK] Simplify handling of processedTca for FormEngine 62/43962/9
authorAnja Leichsenring <aleichsenring@ab-softlab.de>
Sat, 10 Oct 2015 08:02:11 +0000 (10:02 +0200)
committerChristian Kuhn <lolli@schwarzbu.ch>
Sun, 11 Oct 2015 16:16:35 +0000 (18:16 +0200)
The result key vanillaTableTca turned out to be not useful, so
it is merged into the processedTca section. All operations use
only this section now.

Change-Id: I29c2b5cd45c3ef18b4f5d54ebc644603214b0f9b
Resolves: #70564
Releases: master
Reviewed-on: http://review.typo3.org/43962
Reviewed-by: Mathias Schreiber <mathias.schreiber@wmdb.de>
Tested-by: Mathias Schreiber <mathias.schreiber@wmdb.de>
Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
Tested-by: Christian Kuhn <lolli@schwarzbu.ch>
26 files changed:
typo3/sysext/backend/Classes/Controller/EditDocumentController.php
typo3/sysext/backend/Classes/Form/Container/InlineControlContainer.php
typo3/sysext/backend/Classes/Form/Element/AbstractFormElement.php
typo3/sysext/backend/Classes/Form/FormDataCompiler.php
typo3/sysext/backend/Classes/Form/FormDataProvider/DatabaseLanguageRows.php
typo3/sysext/backend/Classes/Form/FormDataProvider/DatabaseRecordOverrideValues.php
typo3/sysext/backend/Classes/Form/FormDataProvider/DatabaseRecordTypeValue.php
typo3/sysext/backend/Classes/Form/FormDataProvider/DatabaseRowDateTimeFields.php
typo3/sysext/backend/Classes/Form/FormDataProvider/DatabaseRowDefaultValues.php
typo3/sysext/backend/Classes/Form/FormDataProvider/DatabaseRowInitializeNew.php
typo3/sysext/backend/Classes/Form/FormDataProvider/InitializeProcessedTca.php
typo3/sysext/backend/Classes/Form/FormDataProvider/TableTca.php [deleted file]
typo3/sysext/backend/Classes/Form/FormDataProvider/TcaFlexProcess.php
typo3/sysext/backend/Classes/Form/FormDataProvider/TcaGroup.php
typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/DatabaseLanguageRowsTest.php
typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/DatabaseRecordOverrideValuesTest.php
typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/DatabaseRecordTypeValueTest.php
typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/DatabaseRowDateTimeFieldsTest.php
typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/DatabaseRowDefaultValuesTest.php
typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/DatabaseRowInitializeNewTest.php
typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/InitializeProcessedTcaTest.php
typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/TableTcaTest.php [deleted file]
typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/TcaColumnsProcessShowitemTest.php
typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/TcaGroupTest.php
typo3/sysext/compatibility6/Classes/Form/FormDataProvider/TcaFlexProcess.php
typo3/sysext/core/Configuration/DefaultConfiguration.php

index 522cb1f..062a3f9 100644 (file)
@@ -997,11 +997,11 @@ class EditDocumentController
                                     } elseif (!empty($formData['parentPageRow']['uid'])) {
                                         $this->viewId = $formData['parentPageRow']['uid'];
                                         // Adding "&L=xx" if the record being edited has a languageField with a value larger than zero!
-                                        if (!empty($formData['vanillaTableTca']['ctrl']['languageField'])
-                                            && is_array($formData['databaseRow'][$formData['vanillaTableTca']['ctrl']['languageField']])
-                                            && $formData['databaseRow'][$formData['vanillaTableTca']['ctrl']['languageField']][0] > 0
+                                        if (!empty($formData['processedTca']['ctrl']['languageField'])
+                                            && is_array($formData['databaseRow'][$formData['processedTca']['ctrl']['languageField']])
+                                            && $formData['databaseRow'][$formData['processedTca']['ctrl']['languageField']][0] > 0
                                         ) {
-                                            $this->viewId_addParams = '&L=' . $formData['databaseRow'][$formData['vanillaTableTca']['ctrl']['languageField']][0];
+                                            $this->viewId_addParams = '&L=' . $formData['databaseRow'][$formData['processedTca']['ctrl']['languageField']][0];
                                         }
                                     }
                                 }
index d41d356..9a387db 100644 (file)
@@ -351,12 +351,6 @@ class InlineControlContainer extends AbstractContainer
                 'tableName' => 'dummyTable',
                 'command' => 'edit',
                 'pageTsConfig' => $pageTsConfig,
-                'vanillaTableTca' => [
-                    'ctrl' => [],
-                    'columns' => [
-                        'dummyField' => $PA['fieldConf'],
-                    ],
-                ],
                 'processedTca' => [
                     'ctrl' => [],
                     'columns' => [
index 2419275..4f6d193 100644 (file)
@@ -387,15 +387,6 @@ abstract class AbstractFormElement extends AbstractNode
                         'tableName' => 'dummySelectWizard',
                         'command' => 'edit',
                         'pageTsConfig' => $pageTsConfig,
-                        'vanillaTableTca' => [
-                            'ctrl' => [],
-                            'columns' => [
-                                $wizardIdentifier => [
-                                    'type' => 'select',
-                                    'config' => $wizardConfiguration,
-                                ],
-                            ],
-                        ],
                         'processedTca' => [
                             'ctrl' => [],
                             'columns' => [
index 21de064..a04237c 100644 (file)
@@ -164,8 +164,6 @@ class FormDataCompiler
             // of handled record was determined, record type specific settings [TCEFORM.][tableName.][field.][types.][type.]
             // are merged into [TCEFORM.][tableName.][field.]. Array keys still contain the concatenation dots.
             'pageTsConfig' => [],
-            // Not changed TCA of handled table
-            'vanillaTableTca' => [],
             // Not changed TCA of parent page row if record is edited or added below a page and not root node
             'vanillaParentPageTca' => null,
             // List of available system languages. Array key is the system language uid, value array
@@ -241,4 +239,4 @@ class FormDataCompiler
 
         ];
     }
-}
+}
\ No newline at end of file
index e7d1cfe..1965cbd 100644 (file)
@@ -36,19 +36,19 @@ class DatabaseLanguageRows implements FormDataProviderInterface
      */
     public function addData(array $result)
     {
-        if (!empty($result['vanillaTableTca']['ctrl']['languageField'])
-            && !empty($result['vanillaTableTca']['ctrl']['transOrigPointerField'])
+        if (!empty($result['processedTca']['ctrl']['languageField'])
+            && !empty($result['processedTca']['ctrl']['transOrigPointerField'])
         ) {
-            $languageField = $result['vanillaTableTca']['ctrl']['languageField'];
-            $fieldWithUidOfDefaultRecord = $result['vanillaTableTca']['ctrl']['transOrigPointerField'];
+            $languageField = $result['processedTca']['ctrl']['languageField'];
+            $fieldWithUidOfDefaultRecord = $result['processedTca']['ctrl']['transOrigPointerField'];
 
             if (isset($result['databaseRow'][$languageField]) && $result['databaseRow'][$languageField] > 0
                 && isset($result['databaseRow'][$fieldWithUidOfDefaultRecord]) && $result['databaseRow'][$fieldWithUidOfDefaultRecord] > 0
             ) {
                 // Table pages has its overlays in pages_language_overlay, this is accounted here
                 $tableNameWithDefaultRecords = $result['tableName'];
-                if (!empty($result['vanillaTableTca']['ctrl']['transOrigPointerTable'])) {
-                    $tableNameWithDefaultRecords = $result['vanillaTableTca']['ctrl']['transOrigPointerTable'];
+                if (!empty($result['processedTca']['ctrl']['transOrigPointerTable'])) {
+                    $tableNameWithDefaultRecords = $result['processedTca']['ctrl']['transOrigPointerTable'];
                 }
 
                 // Default language record of localized record
@@ -66,10 +66,10 @@ class DatabaseLanguageRows implements FormDataProviderInterface
                 $result['defaultLanguageRow'] = $defaultLanguageRow;
 
                 // Unserialize the "original diff source" if given
-                if (!empty($result['vanillaTableTca']['ctrl']['transOrigDiffSourceField'])
-                    && !empty($result['databaseRow'][$result['vanillaTableTca']['ctrl']['transOrigDiffSourceField']])
+                if (!empty($result['processedTca']['ctrl']['transOrigDiffSourceField'])
+                    && !empty($result['databaseRow'][$result['processedTca']['ctrl']['transOrigDiffSourceField']])
                 ) {
-                    $result['defaultLanguageDiffRow'] = unserialize($result['databaseRow'][$result['vanillaTableTca']['ctrl']['transOrigDiffSourceField']]);
+                    $result['defaultLanguageDiffRow'] = unserialize($result['databaseRow'][$result['processedTca']['ctrl']['transOrigDiffSourceField']]);
                 }
 
                 // Add language overlays from further localizations if requested
index 074edd5..aff7a1d 100644 (file)
@@ -31,9 +31,9 @@ class DatabaseRecordOverrideValues implements FormDataProviderInterface
     public function addData(array $result)
     {
         foreach ($result['overrideValues'] as $fieldName => $fieldValue) {
-            if (isset($result['vanillaTableTca']['columns'][$fieldName])) {
+            if (isset($result['processedTca']['columns'][$fieldName])) {
                 $result['databaseRow'][$fieldName] = $fieldValue;
-                $result['vanillaTableTca']['columns'][$fieldName]['config'] = array(
+                $result['processedTca']['columns'][$fieldName]['config'] = array(
                     'type' => 'hidden',
                     'renderType' => 'hidden',
                 );
index f3bf0ec..70db428 100644 (file)
@@ -36,9 +36,9 @@ class DatabaseRecordTypeValue implements FormDataProviderInterface
      */
     public function addData(array $result)
     {
-        if (!isset($result['vanillaTableTca']['types'])
-            || !is_array($result['vanillaTableTca']['types'])
-            || empty($result['vanillaTableTca']['types'])
+        if (!isset($result['processedTca']['types'])
+            || !is_array($result['processedTca']['types'])
+            || empty($result['processedTca']['types'])
         ) {
             throw new \UnexpectedValueException(
                 'At least one "types" array must be defined for table ' . $result['tableName'] . ', preferred "0"',
@@ -47,8 +47,8 @@ class DatabaseRecordTypeValue implements FormDataProviderInterface
         }
 
         $recordTypeValue = '0';
-        if (!empty($result['vanillaTableTca']['ctrl']['type'])) {
-            $tcaTypeField = $result['vanillaTableTca']['ctrl']['type'];
+        if (!empty($result['processedTca']['ctrl']['type'])) {
+            $tcaTypeField = $result['processedTca']['ctrl']['type'];
 
             if (strpos($tcaTypeField, ':') === false) {
                 // $tcaTypeField is the name of a field in database row
@@ -67,12 +67,12 @@ class DatabaseRecordTypeValue implements FormDataProviderInterface
                 // used as type field. This was introduced for some FAL scenarios.
                 list($pointerField, $foreignTableTypeField) = explode(':', $tcaTypeField);
 
-                $relationType = $result['vanillaTableTca']['columns'][$pointerField]['config']['type'];
+                $relationType = $result['processedTca']['columns'][$pointerField]['config']['type'];
                 if ($relationType !== 'select' && $relationType !== 'group') {
                     throw new \UnexpectedValueException(
                         'TCA foreign field pointer fields are only allowed to be used with group or select field types.'
                         . ' Handling field ' . $pointerField . ' with type configured as ' . $tcaTypeField,
-                        1325862240
+                        1325862241
                     );
                 }
 
@@ -81,9 +81,9 @@ class DatabaseRecordTypeValue implements FormDataProviderInterface
                 if (!empty($foreignUid)) {
                     // Determine table name to fetch record from
                     if ($relationType === 'select') {
-                        $foreignTable = $result['vanillaTableTca']['columns'][$pointerField]['config']['foreign_table'];
+                        $foreignTable = $result['processedTca']['columns'][$pointerField]['config']['foreign_table'];
                     } else {
-                        $allowedTables = explode(',', $result['vanillaTableTca']['columns'][$pointerField]['config']['allowed']);
+                        $allowedTables = explode(',', $result['processedTca']['columns'][$pointerField]['config']['allowed']);
                         // Always take the first configured table.
                         $foreignTable = $allowedTables[0];
                     }
@@ -113,9 +113,9 @@ class DatabaseRecordTypeValue implements FormDataProviderInterface
         }
 
         // Throw another exception if determined value and '0' and '1' do not exist
-        if (empty($result['vanillaTableTca']['types'][$recordTypeValue])
-            && empty($result['vanillaTableTca']['types']['0'])
-            && empty($result['vanillaTableTca']['types']['1'])
+        if (empty($result['processedTca']['types'][$recordTypeValue])
+            && empty($result['processedTca']['types']['0'])
+            && empty($result['processedTca']['types']['1'])
         ) {
             throw new \UnexpectedValueException(
                 'Type value ' . $recordTypeValue . ' from database record not defined in TCA of table '
@@ -125,8 +125,8 @@ class DatabaseRecordTypeValue implements FormDataProviderInterface
         }
 
         // Check the determined value actually exists as types key, otherwise fall back to 0 or 1, 1 for "historical reasons"
-        if (empty($result['vanillaTableTca']['types'][$recordTypeValue])) {
-            $recordTypeValue = !empty($result['vanillaTableTca']['types']['0']) ? '0' : '1';
+        if (empty($result['processedTca']['types'][$recordTypeValue])) {
+            $recordTypeValue = !empty($result['processedTca']['types']['0']) ? '0' : '1';
         }
 
         $result['recordTypeValue'] = (string)$recordTypeValue;
@@ -147,16 +147,16 @@ class DatabaseRecordTypeValue implements FormDataProviderInterface
         $value = $result['databaseRow'][$field];
         if (
             // is a localized record
-            !empty($result['vanillaTableTca']['ctrl']['languageField'])
-            && $result['databaseRow'][$result['vanillaTableTca']['ctrl']['languageField']] > 0
+            !empty($result['processedTca']['ctrl']['languageField'])
+            && $result['databaseRow'][$result['processedTca']['ctrl']['languageField']] > 0
             // l10n_mode for field is configured
-            && !empty($result['vanillaTableTca']['columns'][$field]['l10n_mode'])
+            && !empty($result['processedTca']['columns'][$field]['l10n_mode'])
             && (
                 // is exclude -> fall back to value of default record
-                $result['vanillaTableTca']['columns'][$field]['l10n_mode'] === 'exclude'
+                $result['processedTca']['columns'][$field]['l10n_mode'] === 'exclude'
                 // is mergeIfNotBlank and own value is empty -> fall back to value of default record
                 || (
-                    $result['vanillaTableTca']['columns'][$field]['l10n_mode'] === 'mergeIfNotBlank'
+                    $result['processedTca']['columns'][$field]['l10n_mode'] === 'mergeIfNotBlank'
                     // 0 means "not empty"
                     && $result['databaseRow'][$field] === ''
                 )
index 7e3a70d..16ceb48 100644 (file)
@@ -32,7 +32,7 @@ class DatabaseRowDateTimeFields implements FormDataProviderInterface
     public function addData(array $result)
     {
         $dateTimeFormats = $this->getDatabase()->getDateTimeFormats($result['tableName']);
-        foreach ($result['vanillaTableTca']['columns'] as $column => $columnConfig) {
+        foreach ($result['processedTca']['columns'] as $column => $columnConfig) {
             if (isset($columnConfig['config']['dbType'])
                 && GeneralUtility::inList('date,datetime', $columnConfig['config']['dbType'])
             ) {
index dbdd0c8..4946c53 100644 (file)
@@ -36,7 +36,7 @@ class DatabaseRowDefaultValues implements FormDataProviderInterface
         $databaseRow = $result['databaseRow'];
 
         $newRow = $databaseRow;
-        foreach ($result['vanillaTableTca']['columns'] as $fieldName => $fieldConfig) {
+        foreach ($result['processedTca']['columns'] as $fieldName => $fieldConfig) {
             // Keep current value if it can be resolved to "the is something" directly
             if (isset($databaseRow[$fieldName])) {
                 $newRow[$fieldName] = $databaseRow[$fieldName];
index 54e51c2..348629f 100644 (file)
@@ -70,7 +70,7 @@ class DatabaseRowInitializeNew implements FormDataProviderInterface
             && is_array($result['userTsConfig']['TCAdefaults.'][$tableNameWithDot])
         ) {
             foreach ($result['userTsConfig']['TCAdefaults.'][$tableNameWithDot] as $fieldName => $fieldValue) {
-                if (isset($result['vanillaTableTca']['columns'][$fieldName])) {
+                if (isset($result['processedTca']['columns'][$fieldName])) {
                     $result['databaseRow'][$fieldName] = $fieldValue;
                 }
             }
@@ -91,7 +91,7 @@ class DatabaseRowInitializeNew implements FormDataProviderInterface
             && is_array($result['pageTsConfig']['TCAdefaults.'][$tableNameWithDot])
         ) {
             foreach ($result['pageTsConfig']['TCAdefaults.'][$tableNameWithDot] as $fieldName => $fieldValue) {
-                if (isset($result['vanillaTableTca']['columns'][$fieldName])) {
+                if (isset($result['processedTca']['columns'][$fieldName])) {
                     $result['databaseRow'][$fieldName] = $fieldValue;
                 }
             }
@@ -109,11 +109,11 @@ class DatabaseRowInitializeNew implements FormDataProviderInterface
     protected function setDefaultsFromNeighborRow(array $result)
     {
         if (is_array($result['neighborRow'])
-            && !empty($result['vanillaTableTca']['ctrl']['useColumnsForDefaultValues'])
+            && !empty($result['processedTca']['ctrl']['useColumnsForDefaultValues'])
         ) {
-            $defaultColumns = GeneralUtility::trimExplode(',', $result['vanillaTableTca']['ctrl']['useColumnsForDefaultValues'], true);
+            $defaultColumns = GeneralUtility::trimExplode(',', $result['processedTca']['ctrl']['useColumnsForDefaultValues'], true);
             foreach ($defaultColumns as $fieldName) {
-                if (isset($result['vanillaTableTca']['columns'][$fieldName])
+                if (isset($result['processedTca']['columns'][$fieldName])
                     && isset($result['neighborRow'][$fieldName])
                 ) {
                     $result['databaseRow'][$fieldName] = $result['neighborRow'][$fieldName];
@@ -141,7 +141,7 @@ class DatabaseRowInitializeNew implements FormDataProviderInterface
             && is_array($defaultValuesFromGetPost[$tableName])
         ) {
             foreach ($defaultValuesFromGetPost[$tableName] as $fieldName => $fieldValue) {
-                if (isset($result['vanillaTableTca']['columns'][$fieldName])) {
+                if (isset($result['processedTca']['columns'][$fieldName])) {
                     $result['databaseRow'][$fieldName] = $fieldValue;
                 }
             }
@@ -177,9 +177,9 @@ class DatabaseRowInitializeNew implements FormDataProviderInterface
             );
         }
         $selectorFieldName = $result['inlineParentConfig']['foreign_selector'];
-        if (!isset($result['vanillaTableTca']['columns'][$selectorFieldName]['config']['type'])
-            || ($result['vanillaTableTca']['columns'][$selectorFieldName]['config']['type'] !== 'select'
-                && $result['vanillaTableTca']['columns'][$selectorFieldName]['config']['type'] !== 'group'
+        if (!isset($result['processedTca']['columns'][$selectorFieldName]['config']['type'])
+            || ($result['processedTca']['columns'][$selectorFieldName]['config']['type'] !== 'select'
+                && $result['processedTca']['columns'][$selectorFieldName]['config']['type'] !== 'group'
             )
         ) {
             throw new \UnexpectedValueException(
index 76a4ec6..0ab77b4 100644 (file)
@@ -30,16 +30,18 @@ class InitializeProcessedTca implements FormDataProviderInterface
      */
     public function addData(array $result)
     {
-        if (!isset($result['vanillaTableTca'])
-            || !is_array($result['vanillaTableTca'])
+        if (
+            !isset($GLOBALS['TCA'][$result['tableName']])
+            || !is_array($GLOBALS['TCA'][$result['tableName']])
         ) {
             throw new \UnexpectedValueException(
-                'vanillaTableTca must be initialized before',
-                1438505113
+                'TCA for table ' . $result['tableName'] . ' not found',
+                1437914223
             );
         }
+        $result['processedTca'] = $GLOBALS['TCA'][$result['tableName']];
 
-        if (!is_array($result['vanillaTableTca']['columns'])) {
+        if (!is_array($result['processedTca']['columns'])) {
             throw new \UnexpectedValueException(
                 'No columns definition in TCA table ' . $result['tableName'],
                 1438594406
@@ -48,7 +50,7 @@ class InitializeProcessedTca implements FormDataProviderInterface
 
         /**
          * @todo: This does not work for "default" fields like "hidden", those don't have a type set - fix in bootstrap??
-        foreach ($result['vanillaTableTca']['columns'] as $fieldName => $fieldConfig) {
+        foreach ($result['processedTca']['columns'] as $fieldName => $fieldConfig) {
             if (!isset($fieldConfig['type'])) {
                 throw new \UnexpectedValueException(
                     'Field ' . $fieldName . ' of TCA table ' . $result['tableName'] . ' has no type set',
@@ -58,7 +60,6 @@ class InitializeProcessedTca implements FormDataProviderInterface
         }
          */
 
-        $result['processedTca'] = $result['vanillaTableTca'];
         return $result;
     }
 }
diff --git a/typo3/sysext/backend/Classes/Form/FormDataProvider/TableTca.php b/typo3/sysext/backend/Classes/Form/FormDataProvider/TableTca.php
deleted file mode 100644 (file)
index 97fd72e..0000000
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-namespace TYPO3\CMS\Backend\Form\FormDataProvider;
-
-/*
- * This file is part of the TYPO3 CMS project.
- *
- * It is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License, either version 2
- * of the License, or any later version.
- *
- * For the full copyright and license information, please read the
- * LICENSE.txt file that was distributed with this source code.
- *
- * The TYPO3 project - inspiring people to share!
- */
-
-use TYPO3\CMS\Backend\Form\FormDataProviderInterface;
-
-/**
- * Add vanilla table TCA
- *
- * @todo: This one could vanish again - if all dependencies are
- * @todo: correct it would be sufficient to work with processedTca only
- */
-class TableTca implements FormDataProviderInterface
-{
-    /**
-     * Add TCA of table
-     *
-     * @param array $result
-     * @return array
-     * @throws \UnexpectedValueException
-     */
-    public function addData(array $result)
-    {
-        if (
-            !isset($GLOBALS['TCA'][$result['tableName']])
-            || !is_array($GLOBALS['TCA'][$result['tableName']])
-        ) {
-            throw new \UnexpectedValueException(
-                'TCA for table ' . $result['tableName'] . ' not found',
-                1437914223
-            );
-        }
-        $result['vanillaTableTca'] = $GLOBALS['TCA'][$result['tableName']];
-        return $result;
-    }
-}
index 598be3f..62f403e 100644 (file)
@@ -307,12 +307,6 @@ class TcaFlexProcess extends AbstractItemProvider implements FormDataProviderInt
                                             // It is currently not possible to have pageTsConfig for section container
                                             'pageTsConfig' => [],
                                             'databaseRow' => $valueArray,
-                                            'vanillaTableTca' => [
-                                                'ctrl' => [],
-                                                'columns' => [
-                                                    $singleFieldName => $singleFieldConfiguration,
-                                                ],
-                                            ],
                                             'processedTca' => [
                                                 'ctrl' => [],
                                                 'columns' => [
@@ -358,12 +352,6 @@ class TcaFlexProcess extends AbstractItemProvider implements FormDataProviderInt
                                         'databaseRow' => [
                                             'uid' => $result['databaseRow']['uid'],
                                         ],
-                                        'vanillaTableTca' => [
-                                            'ctrl' => [],
-                                            'columns' => [
-                                                $singleFieldName => $singleFieldConfiguration,
-                                            ],
-                                        ],
                                         'processedTca' => [
                                             'ctrl' => [],
                                             'columns' => [
@@ -413,12 +401,6 @@ class TcaFlexProcess extends AbstractItemProvider implements FormDataProviderInt
                         'command' => $command,
                         'pageTsConfig' => $pageTsConfig,
                         'databaseRow' => $valueArray,
-                        'vanillaTableTca' => [
-                            'ctrl' => [],
-                            'columns' => [
-                                $dataStructureSheetElementName => $dataStructureSheetElementDefinition,
-                            ],
-                        ],
                         'processedTca' => [
                             'ctrl' => [],
                             'columns' => [
index bc613c4..199843f 100644 (file)
@@ -35,7 +35,7 @@ class TcaGroup implements FormDataProviderInterface
      */
     public function addData(array $result)
     {
-        foreach ($result['vanillaTableTca']['columns'] as $fieldName => $fieldConfig) {
+        foreach ($result['processedTca']['columns'] as $fieldName => $fieldConfig) {
             if (empty($fieldConfig['config']['type'])
                 || $fieldConfig['config']['type'] !== 'group'
                 || empty($fieldConfig['config']['internal_type'])
index c1ab9d2..c473500 100644 (file)
@@ -56,7 +56,7 @@ class DatabaseLanguageRowsTest extends UnitTestCase
                 'uid' => 42,
                 'text' => 'bar',
             ],
-            'vanillaTableTca' => [
+            'processedTca' => [
                 'ctrl' => array(),
                 'columns' => array(),
             ],
@@ -77,7 +77,7 @@ class DatabaseLanguageRowsTest extends UnitTestCase
                 'sys_language_uid' => 2,
                 'l10n_parent' => 23,
             ],
-            'vanillaTableTca' => [
+            'processedTca' => [
                 'ctrl' => array(
                     'languageField' => 'sys_language_uid',
                     'transOrigPointerField' => 'l10n_parent',
@@ -107,7 +107,7 @@ class DatabaseLanguageRowsTest extends UnitTestCase
                 'sys_language_uid' => 2,
                 'l10n_parent' => 23,
             ],
-            'vanillaTableTca' => [
+            'processedTca' => [
                 'ctrl' => array(
                     'languageField' => 'sys_language_uid',
                     'transOrigPointerField' => 'l10n_parent',
@@ -149,7 +149,7 @@ class DatabaseLanguageRowsTest extends UnitTestCase
                 'l10n_parent' => 23,
                 'l10n_diffsource' => serialize($diffSource),
             ],
-            'vanillaTableTca' => [
+            'processedTca' => [
                 'ctrl' => [
                     'languageField' => 'sys_language_uid',
                     'transOrigPointerField' => 'l10n_parent',
@@ -188,7 +188,7 @@ class DatabaseLanguageRowsTest extends UnitTestCase
                 'sys_language_uid' => 2,
                 'l10n_parent' => 23,
             ],
-            'vanillaTableTca' => [
+            'processedTca' => [
                 'ctrl' => [
                     'languageField' => 'sys_language_uid',
                     'transOrigPointerField' => 'l10n_parent',
@@ -271,7 +271,7 @@ class DatabaseLanguageRowsTest extends UnitTestCase
                 'sys_language_uid' => 2,
                 'l10n_parent' => 23,
             ],
-            'vanillaTableTca' => [
+            'processedTca' => [
                 'ctrl' => [
                     'languageField' => 'sys_language_uid',
                     'transOrigPointerField' => 'l10n_parent',
index 853d118..a8bb158 100644 (file)
@@ -39,7 +39,7 @@ class DatabaseRecordOverrideValuesTest extends UnitTestCase
     {
         $input = [
             'tableName' => 'aTable',
-            'vanillaTableTca' => [
+            'processedTca' => [
                 'columns' => [
                     'aField' => [
                         'config' => [
@@ -66,7 +66,7 @@ class DatabaseRecordOverrideValuesTest extends UnitTestCase
     {
         $input = [
             'tableName' => 'aTable',
-            'vanillaTableTca' => [
+            'processedTca' => [
                 'columns' => [
                     'aField' => [
                         'config' => [
@@ -92,11 +92,11 @@ class DatabaseRecordOverrideValuesTest extends UnitTestCase
         $expected = $input;
         $expected['databaseRow']['aField'] = 256;
         $expected['databaseRow']['anotherField'] = 13;
-        $expected['vanillaTableTca']['columns']['aField']['config'] = [
+        $expected['processedTca']['columns']['aField']['config'] = [
             'type' => 'hidden',
             'renderType' => 'hidden',
         ];
-        $expected['vanillaTableTca']['columns']['anotherField']['config'] = [
+        $expected['processedTca']['columns']['anotherField']['config'] = [
             'type' => 'hidden',
             'renderType' => 'hidden',
         ];
index 7f54bc5..137f9b3 100644 (file)
@@ -48,7 +48,7 @@ class DatabaseRecordTypeValueTest extends UnitTestCase
     public function addDataThrowsExceptionIfTcaTypesAreEmpty()
     {
         $input = [
-            'vanillaTableTca' => [
+            'processedTca' => [
                 'types' => [],
             ],
         ];
@@ -64,7 +64,7 @@ class DatabaseRecordTypeValueTest extends UnitTestCase
     public function addDataSetsRecordTypeValueToHistoricalOneIfTypeZeroIsNotDefined()
     {
         $input = [
-            'vanillaTableTca' => [
+            'processedTca' => [
                 'types' => [
                     '1' => 'foo',
                 ],
@@ -81,7 +81,7 @@ class DatabaseRecordTypeValueTest extends UnitTestCase
     public function addDataSetsRecordTypeValueToZero()
     {
         $input = [
-            'vanillaTableTca' => [
+            'processedTca' => [
                 'types' => [
                     '0' => 'foo',
                 ],
@@ -100,7 +100,7 @@ class DatabaseRecordTypeValueTest extends UnitTestCase
     public function addDataThrowsExceptionIfTypePointsToANotExistingField()
     {
         $input = [
-            'vanillaTableTca' => [
+            'processedTca' => [
                 'ctrl' => [
                     'type' => 'notExists',
                 ],
@@ -124,7 +124,7 @@ class DatabaseRecordTypeValueTest extends UnitTestCase
     public function addDataSetsRecordTypeValueToValueOfDatabaseField()
     {
         $input = [
-            'vanillaTableTca' => [
+            'processedTca' => [
                 'ctrl' => [
                     'type' => 'aField',
                 ],
@@ -149,7 +149,7 @@ class DatabaseRecordTypeValueTest extends UnitTestCase
     public function addDataSetsRecordTypeValueToZeroIfValueOfDatabaseFieldIsNotDefinedInTca()
     {
         $input = [
-            'vanillaTableTca' => [
+            'processedTca' => [
                 'ctrl' => [
                     'type' => 'aField',
                 ],
@@ -174,7 +174,7 @@ class DatabaseRecordTypeValueTest extends UnitTestCase
     public function addDataSetsRecordTypeValueToZeroIfValueOfDatabaseFieldIsEmptyString()
     {
         $input = [
-            'vanillaTableTca' => [
+            'processedTca' => [
                 'ctrl' => [
                     'type' => 'aField',
                 ],
@@ -199,7 +199,7 @@ class DatabaseRecordTypeValueTest extends UnitTestCase
     public function addDataThrowsExceptionIfValueTypesNotExistsAndNoFallbackExists()
     {
         $input = [
-            'vanillaTableTca' => [
+            'processedTca' => [
                 'ctrl' => [
                     'type' => 'aField',
                 ],
@@ -223,7 +223,7 @@ class DatabaseRecordTypeValueTest extends UnitTestCase
     public function addDataSetsRecordTypeValueToValueOfDefaultLanguageRecordIfConfiguredAsExclude()
     {
         $input = [
-            'vanillaTableTca' => [
+            'processedTca' => [
                 'ctrl' => [
                     'languageField' => 'sys_language_uid',
                     'type' => 'aField',
@@ -258,7 +258,7 @@ class DatabaseRecordTypeValueTest extends UnitTestCase
     public function addDataSetsRecordTypeValueToValueOfDefaultLanguageRecordIfConfiguredAsMergeIfNotBlank()
     {
         $input = [
-            'vanillaTableTca' => [
+            'processedTca' => [
                 'ctrl' => [
                     'languageField' => 'sys_language_uid',
                     'type' => 'aField',
@@ -293,7 +293,7 @@ class DatabaseRecordTypeValueTest extends UnitTestCase
     public function addDataSetsRecordTypeValueToValueOfLocalizedRecordIfConfiguredAsMergeIfNotBlankButNotBlank()
     {
         $input = [
-            'vanillaTableTca' => [
+            'processedTca' => [
                 'ctrl' => [
                     'languageField' => 'sys_language_uid',
                     'type' => 'aField',
@@ -328,7 +328,7 @@ class DatabaseRecordTypeValueTest extends UnitTestCase
     public function addDataThrowsExceptionForForeignTypeConfigurationNotAsSelectOrGroup()
     {
         $input = [
-            'vanillaTableTca' => [
+            'processedTca' => [
                 'ctrl' => [
                     'type' => 'localField:foreignField',
                 ],
@@ -345,7 +345,7 @@ class DatabaseRecordTypeValueTest extends UnitTestCase
             ],
         ];
 
-        $this->setExpectedException(\UnexpectedValueException::class, $this->anything(), 1325862240);
+        $this->setExpectedException(\UnexpectedValueException::class, $this->anything(), 1325862241);
 
         $this->subject->addData($input);
     }
@@ -356,7 +356,7 @@ class DatabaseRecordTypeValueTest extends UnitTestCase
     public function addDataThrowsExceptionForForeignTypeIfPointerConfigurationHasNoTable()
     {
         $input = [
-            'vanillaTableTca' => [
+            'processedTca' => [
                 'ctrl' => [
                     'type' => 'localField:foreignField',
                 ],
@@ -387,7 +387,7 @@ class DatabaseRecordTypeValueTest extends UnitTestCase
     public function addDataSetsTypeValueFromForeignTableRecord()
     {
         $input = [
-            'vanillaTableTca' => [
+            'processedTca' => [
                 'ctrl' => [
                     'type' => 'localField:foreignField',
                 ],
@@ -430,7 +430,7 @@ class DatabaseRecordTypeValueTest extends UnitTestCase
     public function addDataSetsTypeValueFromNestedTcaGroupField()
     {
         $input = [
-            'vanillaTableTca' => [
+            'processedTca' => [
                 'ctrl' => [
                     'type' => 'uid_local:type',
                 ],
index bbc8939..241bf4a 100644 (file)
@@ -64,7 +64,7 @@ class DatabaseRowDateTimeFieldsTest extends UnitTestCase
         $tableName = 'aTable';
         $input = [
             'tableName' => $tableName,
-            'vanillaTableTca' => [
+            'processedTca' => [
                 'columns' => [],
             ],
         ];
@@ -79,7 +79,7 @@ class DatabaseRowDateTimeFieldsTest extends UnitTestCase
     {
         $input = [
             'tableName' => 'aTable',
-            'vanillaTableTca' => [
+            'processedTca' => [
                 'columns' => [
                     'aField' => [
                         'config' => [
@@ -102,7 +102,7 @@ class DatabaseRowDateTimeFieldsTest extends UnitTestCase
     {
         $input = [
             'tableName' => 'aTable',
-            'vanillaTableTca' => [
+            'processedTca' => [
                 'columns' => [
                     'aField' => [
                         'config' => [
@@ -127,7 +127,7 @@ class DatabaseRowDateTimeFieldsTest extends UnitTestCase
         date_default_timezone_set('UTC');
         $input = [
             'tableName' => 'aTable',
-            'vanillaTableTca' => [
+            'processedTca' => [
                 'columns' => [
                     'aField' => [
                         'config' => [
@@ -156,7 +156,7 @@ class DatabaseRowDateTimeFieldsTest extends UnitTestCase
         date_default_timezone_set('UTC');
         $input = [
             'tableName' => 'aTable',
-            'vanillaTableTca' => [
+            'processedTca' => [
                 'columns' => [
                     'aField' => [
                         'config' => [
index e2dc8a0..51af4b8 100644 (file)
@@ -41,7 +41,7 @@ class DatabaseRowDefaultValuesTest extends UnitTestCase
             'databaseRow' => [
                 'aDefinedField' => 'aValue',
             ],
-            'vanillaTableTca' => [
+            'processedTca' => [
                 'columns' => [
                     'aDefinedField' => [],
                 ],
@@ -60,7 +60,7 @@ class DatabaseRowDefaultValuesTest extends UnitTestCase
             'databaseRow' => [
                 'aField' => null,
             ],
-            'vanillaTableTca' => [
+            'processedTca' => [
                 'columns' => [
                     'aField' => [
                         'config' => [
@@ -81,7 +81,7 @@ class DatabaseRowDefaultValuesTest extends UnitTestCase
     {
         $input = [
             'databaseRow' => [],
-            'vanillaTableTca' => [
+            'processedTca' => [
                 'columns' => [
                     'aField' => [
                         'config' => [
@@ -104,7 +104,7 @@ class DatabaseRowDefaultValuesTest extends UnitTestCase
     {
         $input = [
             'databaseRow' => [],
-            'vanillaTableTca' => [
+            'processedTca' => [
                 'columns' => [
                     'aField' => [
                         'config' => [
@@ -127,7 +127,7 @@ class DatabaseRowDefaultValuesTest extends UnitTestCase
     {
         $input = [
             'databaseRow' => [],
-            'vanillaTableTca' => [
+            'processedTca' => [
                 'columns' => [
                     'aField' => [
                         'config' => [
index f49fa3a..1cd3677 100644 (file)
@@ -103,7 +103,7 @@ class DatabaseRowInitializeNewTest extends UnitTestCase
                     ],
                 ],
             ],
-            'vanillaTableTca' => [
+            'processedTca' => [
                 'columns' => [
                     'aField' => [],
                 ],
@@ -134,7 +134,7 @@ class DatabaseRowInitializeNewTest extends UnitTestCase
                     ],
                 ],
             ],
-            'vanillaTableTca' => [
+            'processedTca' => [
                 'columns' => [],
             ]
         ];
@@ -162,7 +162,7 @@ class DatabaseRowInitializeNewTest extends UnitTestCase
                     ],
                 ],
             ],
-            'vanillaTableTca' => [
+            'processedTca' => [
                 'columns' => [
                     'aField' => [],
                 ],
@@ -193,7 +193,7 @@ class DatabaseRowInitializeNewTest extends UnitTestCase
                     ],
                 ],
             ],
-            'vanillaTableTca' => [
+            'processedTca' => [
                 'columns' => [],
             ]
         ];
@@ -228,7 +228,7 @@ class DatabaseRowInitializeNewTest extends UnitTestCase
                     ],
                 ],
             ],
-            'vanillaTableTca' => [
+            'processedTca' => [
                 'columns' => [
                     'aField' => [],
                 ],
@@ -255,7 +255,7 @@ class DatabaseRowInitializeNewTest extends UnitTestCase
             'neighborRow' => [
                 'aField' => 'valueFromNeighbor',
             ],
-            'vanillaTableTca' => [
+            'processedTca' => [
                 'ctrl' => [
                     'useColumnsForDefaultValues' => 'aField',
                 ],
@@ -299,7 +299,7 @@ class DatabaseRowInitializeNewTest extends UnitTestCase
                     ],
                 ],
             ],
-            'vanillaTableTca' => [
+            'processedTca' => [
                 'ctrl' => [
                     'useColumnsForDefaultValues' => 'aField',
                 ],
@@ -326,7 +326,7 @@ class DatabaseRowInitializeNewTest extends UnitTestCase
             'tableName' => 'aTable',
             'vanillaUid' => 23,
             'databaseRow' => [],
-            'vanillaTableTca' => [
+            'processedTca' => [
                 'columns' => [
                     'aField' => [],
                 ],
@@ -357,7 +357,7 @@ class DatabaseRowInitializeNewTest extends UnitTestCase
             'tableName' => 'aTable',
             'vanillaUid' => 23,
             'databaseRow' => [],
-            'vanillaTableTca' => [
+            'processedTca' => [
                 'columns' => [
                     'aField' => [],
                 ],
@@ -388,7 +388,7 @@ class DatabaseRowInitializeNewTest extends UnitTestCase
             'tableName' => 'aTable',
             'vanillaUid' => 23,
             'databaseRow' => [],
-            'vanillaTableTca' => [
+            'processedTca' => [
                 'columns' => [
                     'aField' => [],
                 ],
@@ -433,7 +433,7 @@ class DatabaseRowInitializeNewTest extends UnitTestCase
                     ],
                 ],
             ],
-            'vanillaTableTca' => [
+            'processedTca' => [
                 'columns' => [],
             ]
         ];
@@ -485,7 +485,7 @@ class DatabaseRowInitializeNewTest extends UnitTestCase
                     ],
                 ],
             ],
-            'vanillaTableTca' => [
+            'processedTca' => [
                 'ctrl' => [
                     'useColumnsForDefaultValues' => 'aField',
                 ],
@@ -550,7 +550,7 @@ class DatabaseRowInitializeNewTest extends UnitTestCase
             'inlineParentConfig' => [
                 'foreign_selector' => 'theForeignSelectorField',
             ],
-            'vanillaTableTca' => [
+            'processedTca' => [
                 'columns' => [
                     'theForeignSelectorField' => [
                         'config' => [
@@ -579,7 +579,7 @@ class DatabaseRowInitializeNewTest extends UnitTestCase
             'inlineParentConfig' => [
                 'foreign_selector' => 'theForeignSelectorField',
             ],
-            'vanillaTableTca' => [
+            'processedTca' => [
                 'columns' => [
                     'theForeignSelectorField' => [
                         'config' => [
index f5db524..714deab 100644 (file)
@@ -35,63 +35,63 @@ class InitializeProcessedTcaTest extends UnitTestCase
     /**
      * @test
      */
-    public function addDataThrowsExceptionIfVanillaTableTcaIsNotSet()
+    public function addDataThrowsExceptionIfTcaColumnsHasNoTypeSet()
     {
-        $this->setExpectedException(\UnexpectedValueException::class, $this->anything(), 1438505113);
-        $this->subject->addData([]);
+        $this->markTestIncomplete('skipped for now, this is not save');
+        $input = [
+            'processedTca' => [
+                'columns' => [
+                    'aField' => [],
+                ],
+            ],
+        ];
+        $this->setExpectedException(\UnexpectedValueException::class, $this->anything(), 1438594044);
+        $this->subject->addData($input);
     }
 
     /**
      * @test
      */
-    public function addDataSetsProcessedTcaToVanillaTableTca()
+    public function addDataSetsTableTcaFromGlobalsInResult()
     {
         $input = [
-            'recordTypeValue' => 'aType',
-            'vanillaTableTca' => [
-                'columns' => [
-                    'aField' => [
-                        'type' => 'aType',
-                    ],
-                ],
-                'types' => [
-                    'aType' => [
-                        'showitem' => '',
-                    ],
-                ],
-            ],
+            'tableName' => 'aTable',
+        ];
+        $expected = [
+            'columns' => []
         ];
-        $expected = $input;
-        $expected['processedTca'] = $input['vanillaTableTca'];
-        $this->assertSame($expected, $this->subject->addData($input));
+        $GLOBALS['TCA'][$input['tableName']] = $expected;
+        $result = $this->subject->addData($input);
+        $this->assertEquals($expected, $result['processedTca']);
     }
 
     /**
      * @test
      */
-    public function addDataThrowsExceptionIfColumnsIsMissing()
+    public function addDataThrowsExceptionIfGlobalTableTcaIsNotSet()
     {
         $input = [
-            'vanillaTableTca' => [],
+            'tableName' => 'aTable',
         ];
-        $this->setExpectedException(\UnexpectedValueException::class, $this->anything(), 1438594406);
+
+        $this->setExpectedException(\UnexpectedValueException::class, $this->anything(),
+            1437914223);
+
         $this->subject->addData($input);
     }
 
     /**
      * @test
      */
-    public function addDataThrowsExceptionIfTcaColumnsHasNoTypeSet()
+    public function addDataThrowsExceptionIfGlobalTableTcaIsNotAnArray()
     {
-        $this->markTestIncomplete('skipped for now, this is not save');
         $input = [
-            'vanillaTableTca' => [
-                'columns' => [
-                    'aField' => [],
-                ],
-            ],
+            'tableName' => 'aTable',
         ];
-        $this->setExpectedException(\UnexpectedValueException::class, $this->anything(), 1438594044);
+        $GLOBALS['TCA'][$input['tableName']] = 'foo';
+        $this->setExpectedException(\UnexpectedValueException::class, $this->anything(),
+            1437914223);
+
         $this->subject->addData($input);
     }
 }
diff --git a/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/TableTcaTest.php b/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/TableTcaTest.php
deleted file mode 100644 (file)
index 95bb3b9..0000000
+++ /dev/null
@@ -1,76 +0,0 @@
-<?php
-namespace TYPO3\CMS\Backend\Tests\Unit\Form\FormDataProvider;
-
-/*
- * This file is part of the TYPO3 CMS project.
- *
- * It is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License, either version 2
- * of the License, or any later version.
- *
- * For the full copyright and license information, please read the
- * LICENSE.txt file that was distributed with this source code.
- *
- * The TYPO3 project - inspiring people to share!
- */
-
-use TYPO3\CMS\Core\Tests\UnitTestCase;
-use TYPO3\CMS\Backend\Form\FormDataProvider\TableTca;
-
-/**
- * Test case
- */
-class TableTcaTest extends UnitTestCase
-{
-    /**
-     * @var TableTca
-     */
-    protected $subject;
-
-    protected function setUp()
-    {
-        $this->subject = new TableTca();
-    }
-
-    /**
-     * @test
-     */
-    public function addDataSetsTableTcaFromGlobalsInResult()
-    {
-        $input = [
-            'tableName' => 'aTable',
-        ];
-        $expected = array('foo');
-        $GLOBALS['TCA'][$input['tableName']] = $expected;
-        $result = $this->subject->addData($input);
-        $this->assertEquals($expected, $result['vanillaTableTca']);
-    }
-
-    /**
-     * @test
-     */
-    public function addDataThrowsExceptionIfGlobalTableTcaIsNotSet()
-    {
-        $input = [
-            'tableName' => 'aTable',
-        ];
-
-        $this->setExpectedException(\UnexpectedValueException::class, $this->anything(), 1437914223);
-
-        $this->subject->addData($input);
-    }
-
-    /**
-     * @test
-     */
-    public function addDataThrowsExceptionIfGlobalTableTcaIsNotAnArray()
-    {
-        $input = [
-            'tableName' => 'aTable',
-        ];
-        $GLOBALS['TCA'][$input['tableName']] = 'foo';
-        $this->setExpectedException(\UnexpectedValueException::class, $this->anything(), 1437914223);
-
-        $this->subject->addData($input);
-    }
-}
index b10ff3f..f7f6708 100644 (file)
@@ -39,7 +39,7 @@ class TcaColumnsProcessShowitemTest extends UnitTestCase
     {
         $input = [
             'recordTypeValue' => 'aType',
-            'vanillaTableTca' => [
+            'processedTca' => [
                 'columns' => [
                     'aField' => [
                         'type' => 'aType',
index 43e65e9..5b84be1 100644 (file)
@@ -45,7 +45,7 @@ class TcaGroupTest extends UnitTestCase
             'databaseRow' => [
                 'aField' => 'aValue',
             ],
-            'vanillaTableTca' => [
+            'processedTca' => [
                 'columns' => [
                     'aField' => [
                         'config' => [
@@ -65,7 +65,7 @@ class TcaGroupTest extends UnitTestCase
     public function addDataThrowsExceptionWithTypeGroupAndNoValiInternalType()
     {
         $input = [
-            'vanillaTableTca' => [
+            'processedTca' => [
                 'columns' => [
                     'aField' => [
                         'config' => [
@@ -89,7 +89,7 @@ class TcaGroupTest extends UnitTestCase
             'databaseRow' => [
                 'aField' => '/aDir/aFile.txt,/anotherDir/anotherFile.css',
             ],
-            'vanillaTableTca' => [
+            'processedTca' => [
                 'columns' => [
                     'aField' => [
                         'config' => [
@@ -122,7 +122,7 @@ class TcaGroupTest extends UnitTestCase
                 'uid' => 42,
                 'aField' => '1,2',
             ],
-            'vanillaTableTca' => [
+            'processedTca' => [
                 'columns' => [
                     'aField' => [
                         'config' => $aFieldConfig,
index dbc30b8..521b90c 100644 (file)
@@ -439,12 +439,6 @@ class TcaFlexProcess extends AbstractItemProvider implements FormDataProviderInt
                                                     // It is currently not possible to have pageTsConfig for section container
                                                     'pageTsConfig' => [],
                                                     'databaseRow' => $valueArray,
-                                                    'vanillaTableTca' => [
-                                                        'ctrl' => [],
-                                                        'columns' => [
-                                                            $singleFieldName => $singleFieldConfiguration,
-                                                        ],
-                                                    ],
                                                     'processedTca' => [
                                                         'ctrl' => [],
                                                         'columns' => [
@@ -493,12 +487,6 @@ class TcaFlexProcess extends AbstractItemProvider implements FormDataProviderInt
                                                 'databaseRow' => [
                                                     'uid' => $result['databaseRow']['uid'],
                                                 ],
-                                                'vanillaTableTca' => [
-                                                    'ctrl' => [],
-                                                    'columns' => [
-                                                        $singleFieldName => $singleFieldConfiguration,
-                                                    ],
-                                                ],
                                                 'processedTca' => [
                                                     'ctrl' => [],
                                                     'columns' => [
@@ -551,12 +539,6 @@ class TcaFlexProcess extends AbstractItemProvider implements FormDataProviderInt
                                 'command' => $command,
                                 'pageTsConfig' => $pageTsConfig,
                                 'databaseRow' => $valueArray,
-                                'vanillaTableTca' => [
-                                    'ctrl' => [],
-                                    'columns' => [
-                                        $dataStructureSheetElementName => $dataStructureSheetElementDefinition,
-                                    ],
-                                ],
                                 'processedTca' => [
                                     'ctrl' => [],
                                     'columns' => [
index a4f4cbe..2df8855 100644 (file)
@@ -319,14 +319,14 @@ return array(
                             \TYPO3\CMS\Backend\Form\FormDataProvider\UserTsConfig::class
                         ),
                     ),
-                    \TYPO3\CMS\Backend\Form\FormDataProvider\TableTca::class => array(
+                    \TYPO3\CMS\Backend\Form\FormDataProvider\InitializeProcessedTca::class => array(
                         'depends' => array(
                             \TYPO3\CMS\Backend\Form\FormDataProvider\PageTsConfig::class,
                         ),
                     ),
                     \TYPO3\CMS\Backend\Form\FormDataProvider\ParentPageTca::class => array(
                         'depends' => array(
-                            \TYPO3\CMS\Backend\Form\FormDataProvider\TableTca::class,
+                            \TYPO3\CMS\Backend\Form\FormDataProvider\InitializeProcessedTca::class
                         ),
                     ),
                     \TYPO3\CMS\Backend\Form\FormDataProvider\DatabaseRowInitializeNew::class => array(
@@ -334,7 +334,7 @@ return array(
                             \TYPO3\CMS\Backend\Form\FormDataProvider\DatabaseUserPermissionCheck::class,
                             \TYPO3\CMS\Backend\Form\FormDataProvider\UserTsConfig::class,
                             \TYPO3\CMS\Backend\Form\FormDataProvider\PageTsConfig::class,
-                            \TYPO3\CMS\Backend\Form\FormDataProvider\TableTca::class,
+                            \TYPO3\CMS\Backend\Form\FormDataProvider\InitializeProcessedTca::class,
                             \TYPO3\CMS\Backend\Form\FormDataProvider\ParentPageTca::class,
                         ),
                     ),
@@ -350,7 +350,7 @@ return array(
                     ),
                     \TYPO3\CMS\Backend\Form\FormDataProvider\DatabaseRowDefaultValues::class => array(
                         'depends' => array(
-                            \TYPO3\CMS\Backend\Form\FormDataProvider\TableTca::class,
+                            \TYPO3\CMS\Backend\Form\FormDataProvider\InitializeProcessedTca::class,
                             \TYPO3\CMS\Backend\Form\FormDataProvider\DatabaseRowInitializeNew::class,
                             \TYPO3\CMS\Backend\Form\FormDataProvider\DatabaseRowDateTimeFields::class
                         ),
@@ -396,17 +396,9 @@ return array(
                             \TYPO3\CMS\Backend\Form\FormDataProvider\DatabaseRecordTypeValue::class,
                         ),
                     ),
-                    \TYPO3\CMS\Backend\Form\FormDataProvider\InitializeProcessedTca::class => array(
-                        'depends' => array(
-                            \TYPO3\CMS\Backend\Form\FormDataProvider\TableTca::class,
-                            \TYPO3\CMS\Backend\Form\FormDataProvider\DatabaseRecordTypeValue::class,
-                            \TYPO3\CMS\Backend\Form\FormDataProvider\PageTsConfigMerged::class
-                        ),
-                    ),
                     \TYPO3\CMS\Backend\Form\FormDataProvider\TcaColumnsOverrides::class => array(
                         'depends' => array(
                             \TYPO3\CMS\Backend\Form\FormDataProvider\DatabaseRecordTypeValue::class,
-                            \TYPO3\CMS\Backend\Form\FormDataProvider\InitializeProcessedTca::class,
                         ),
                     ),
                     \TYPO3\CMS\Backend\Form\FormDataProvider\TcaColumnsProcessCommon::class => array(
@@ -564,35 +556,31 @@ return array(
                 ),
                 'tcaInputPlaceholderRecord' => array(
                     \TYPO3\CMS\Backend\Form\FormDataProvider\DatabaseEditRow::class => array(),
-                    \TYPO3\CMS\Backend\Form\FormDataProvider\TableTca::class => array(
+                    \TYPO3\CMS\Backend\Form\FormDataProvider\InitializeProcessedTca::class => array(
                         'depends' => array(
                             \TYPO3\CMS\Backend\Form\FormDataProvider\DatabaseEditRow::class,
                         ),
                     ),
                     \TYPO3\CMS\Backend\Form\FormDataProvider\DatabaseRowDefaultValues::class => array(
                         'depends' => array(
-                            \TYPO3\CMS\Backend\Form\FormDataProvider\TableTca::class,
+                            \TYPO3\CMS\Backend\Form\FormDataProvider\InitializeProcessedTca::class,
                         ),
                     ),
                     \TYPO3\CMS\Backend\Form\FormDataProvider\TcaGroup::class => array(
                         'depends' => array(
-                            \TYPO3\CMS\Backend\Form\FormDataProvider\TableTca::class,
+                            \TYPO3\CMS\Backend\Form\FormDataProvider\DatabaseRowDefaultValues::class,
                         ),
                     ),
                     \TYPO3\CMS\Backend\Form\FormDataProvider\DatabaseRecordTypeValue::class => array(
                         'depends' => array(
-                            \TYPO3\CMS\Backend\Form\FormDataProvider\TableTca::class,
-                        ),
-                    ),
-                    \TYPO3\CMS\Backend\Form\FormDataProvider\InitializeProcessedTca::class => array(
-                        'depends' => array(
-                            \TYPO3\CMS\Backend\Form\FormDataProvider\TableTca::class,
-                            \TYPO3\CMS\Backend\Form\FormDataProvider\DatabaseRecordTypeValue::class,
+                            \TYPO3\CMS\Backend\Form\FormDataProvider\InitializeProcessedTca::class,
+                            \TYPO3\CMS\Backend\Form\FormDataProvider\TcaGroup::class,
                         ),
                     ),
                     \TYPO3\CMS\Backend\Form\FormDataProvider\TcaColumnsRemoveUnused::class => array(
                         'depends' => array(
                             \TYPO3\CMS\Backend\Form\FormDataProvider\InitializeProcessedTca::class,
+                            \TYPO3\CMS\Backend\Form\FormDataProvider\DatabaseRecordTypeValue::class,
                         ),
                     ),
                     \TYPO3\CMS\Backend\Form\FormDataProvider\TcaRadioItems::class => array(
@@ -629,12 +617,7 @@ return array(
                     ),
                 ),
                 'inlineParentRecord' => array(
-                    \TYPO3\CMS\Backend\Form\FormDataProvider\TableTca::class => array(),
-                    \TYPO3\CMS\Backend\Form\FormDataProvider\InitializeProcessedTca::class => array(
-                        'depends' => array(
-                            \TYPO3\CMS\Backend\Form\FormDataProvider\TableTca::class,
-                        ),
-                    ),
+                    \TYPO3\CMS\Backend\Form\FormDataProvider\InitializeProcessedTca::class => array(),
                     \TYPO3\CMS\Backend\Form\FormDataProvider\TcaColumnsRemoveUnused::class => array(
                         'depends' => array(
                             \TYPO3\CMS\Backend\Form\FormDataProvider\InitializeProcessedTca::class,