[BUGFIX] FormEngine: Keep columns from overruleTypesArray for processing

If a showitem configuration is overruled, use that information to select
the columns that need to be kept for processing/display.

Resolves: #70540
Releases: master
Change-Id: I9ce53e0bb815775e6dfead0645ba0533158d440d
Reviewed-on: http://review.typo3.org/43936


Reviewed-by: Markus Klein <markus.klein@typo3.org>
Tested-by: Markus Klein <markus.klein@typo3.org>
Reviewed-by: Wouter Wolters <typo3@wouterwolters.nl>
Reviewed-by: Daniel Goerz <ervaude@gmail.com>
Tested-by: Daniel Goerz <ervaude@gmail.com>
Reviewed-by: Anja Leichsenring <aleichsenring@ab-softlab.de>
Tested-by: Anja Leichsenring <aleichsenring@ab-softlab.de>

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

@@ -40,7 +40,9 @@ class TcaColumnsProcessShowitem implements FormDataProviderInterface
             return $result;
         }
 
-        $showItemFieldString = $result['processedTca']['types'][$recordTypeValue]['showitem'];
+        $showItemFieldString = !empty($result['overruleTypesArray'][$recordTypeValue]['showitem'])
+            ? $result['overruleTypesArray'][$recordTypeValue]['showitem']
+            : $result['processedTca']['types'][$recordTypeValue]['showitem'];
         $showItemFieldArray = GeneralUtility::trimExplode(',', $showItemFieldString, true);
 
         foreach ($showItemFieldArray as $fieldConfigurationString) {

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

@@ -68,6 +68,47 @@ class TcaColumnsProcessShowitemTest extends UnitTestCase
         $this->assertSame($expected, $this->subject->addData($input));
     }
 
+    /**
+     * @test
+     */
+    public function addDataRegistersColumnsFieldReferencedInOverruledShowitems()
+    {
+        $input = [
+            'columnsToProcess' => [],
+            'databaseRow' => [],
+            'recordTypeValue' => 'aType',
+            'overruleTypesArray' => [
+                'aType' => [
+                    'showitem' => 'keepMe'
+                ]
+            ],
+            'processedTca' => [
+                'types' => [
+                    'aType' => [
+                        'showitem' => 'aField'
+                    ],
+                ],
+                'columns' => [
+                    'keepMe' => [
+                        'config' => [
+                            'type' => 'input',
+                        ]
+                    ],
+                    'aField' => [
+                        'config' => [
+                            'type' => 'input',
+                        ]
+                    ]
+                ]
+            ]
+        ];
+
+        $expected = $input;
+        $expected['columnsToProcess'] = ['keepMe'];
+
+        $this->assertSame($expected, $this->subject->addData($input));
+    }
+
     /**
      * @test
      */