[BUGFIX] Fix unintentional overwrite of FlexForm DS

itx-informationssysteme · May 2, 2022 · 31a4c16 · 31a4c16
1 parent 79a03f8
commit 31a4c16
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 19 deletions.
diff --git a/Classes/Integration/HookSubscribers/DynamicFlexForm.php b/Classes/Integration/HookSubscribers/DynamicFlexForm.php
@@ -26,8 +26,6 @@
  */
 class DynamicFlexForm extends FlexFormTools
 {
-    private const DUMMY_SOURCE = ['sheets' => ['lDEF' => ['ROOT' => ['type' => 'array', 'el' => []]]]];
-
     /**
      * @var ObjectManagerInterface
      */
@@ -125,7 +123,7 @@ public function getDataStructureIdentifierPreProcess(array $tca, $tableName, $fi
         }
         $provider = $this->configurationService->resolvePrimaryConfigurationProvider($tableName, $fieldName, $record);
         if (!$provider) {
-            return static::DUMMY_SOURCE;
+            return [];
         }
         static::$recursed = true;
         $identifier = [
@@ -151,11 +149,11 @@ public function getDataStructureIdentifierPreProcess(array $tca, $tableName, $fi
     public function parseDataStructureByIdentifierPreProcess(array $identifier)
     {
         if ($identifier['type'] !== 'flux') {
-            return static::DUMMY_SOURCE;
+            return [];
         }
         $record = $identifier['record'];
         if (!$record) {
-            return static::DUMMY_SOURCE;
+            return [];
         }
 
         $fromCache = $this->configurationService->getFromCaches($identifier);
@@ -167,7 +165,7 @@ public function parseDataStructureByIdentifierPreProcess(array $identifier)
             $record = BackendUtility::getRecord($identifier['tableName'], $record['uid'], '*', '', false);
         }
         $fieldName = $identifier['fieldName'];
-        $dataStructArray = $this->parseDataStructureByIdentifier($identifier['originalIdentifier']);
+        $dataStructArray = [];
         $provider = $this->configurationService->resolvePrimaryConfigurationProvider(
             $identifier['tableName'],
             $fieldName,

diff --git a/Classes/Provider/AbstractProvider.php b/Classes/Provider/AbstractProvider.php
@@ -773,19 +773,9 @@ public function postProcessCommand($command, $id, array &$row, &$relativeTo, Dat
      */
     public function postProcessDataStructure(array &$row, &$dataStructure, array $conf)
     {
-        $defaultDataStructure = ['sheets' => ['lDEF' => ['ROOT' => ['type' => 'array', 'el' => ['xmlTitle' => ['TCEforms' => ['label' => 'The Title:', 'config' => ['type' => 'input', 'size' => '48']]]]]]]];
         $form = $this->getForm($row);
         if (null !== $form) {
-            $newDataStructure = $form->build();
-            if ($dataStructure === $defaultDataStructure) {
-                $dataStructure = $newDataStructure;
-            } elseif (count($form->getFields()) > 0) {
-                if ($newDataStructure !== ['meta' => ['langDisable' => 1, 'langChildren' => 0], 'ROOT' => ['type' => 'array', 'el' => []]]) {
-                    $dataStructure = array_replace_recursive($dataStructure, $newDataStructure);
-                } else {
-                    $dataStructure = $newDataStructure;
-                }
-            }
+            $dataStructure = array_replace_recursive($dataStructure, $form->build());
         }
     }
 

diff --git a/Tests/Unit/Integration/HookSubscribers/DynamicFlexFormTest.php b/Tests/Unit/Integration/HookSubscribers/DynamicFlexFormTest.php
@@ -23,7 +23,7 @@ public function testReturnsEmptyDataStructureIdentifierForNonMatchingTableAndFie
     {
         $subject = $this->objectManager->get(DynamicFlexForm::class);
         $result = $subject->getDataStructureIdentifierPreProcess(['foo' => 'bar'], 'sometable', 'somefield', ['uid' => 123]);
-        $this->assertSame(['sheets' => ['lDEF' => ['ROOT' => ['type' => 'array', 'el' => []]]]], $result);
+        $this->assertSame([], $result);
     }
 
     /**
@@ -34,7 +34,7 @@ public function testReturnsEmptyDataStructureForIdentifier(array $identifier)
     {
         $subject = $this->objectManager->get(DynamicFlexForm::class);
         $result = $subject->parseDataStructureByIdentifierPreProcess($identifier);
-        $this->assertSame(['sheets' => ['lDEF' => ['ROOT' => ['type' => 'array', 'el' => []]]]], $result);
+        $this->assertSame([], $result);
     }
 
     /**