[BUGFIX] Skip orphan rte options

Fixes: Gernott#458
susannemoog · Dec 20, 2021 · 837e8fc · 837e8fc
1 parent dcff7ff
commit 837e8fc
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/Classes/Loader/JsonLoader.php b/Classes/Loader/JsonLoader.php
@@ -70,7 +70,13 @@ public function load(): TableDefinitionCollection
                 foreach ($element->options as $index => $option) {
                     if ($option === 'rte') {
                         trigger_error('Migration for options rte done in element "' . $element->key . '". Please update your json definition.', E_USER_DEPRECATED);
-                        $fieldKey = $element->columns[$index];
+                        $fieldKey = $element->columns[$index] ?? '';
+
+                        // Sometimes these options are orphans and weren't removed..
+                        if ($fieldKey === '') {
+                            continue;
+                        }
+
                         $field = $this->tableDefinitionCollection->loadField($tableDefinition->table, $fieldKey);
                         if ($field instanceof TcaFieldDefinition) {
                             $field->type = new FieldType(FieldType::RICHTEXT);

diff --git a/Tests/UnitDeprecated/Fixtures/Configuration/legacyRte.json b/Tests/UnitDeprecated/Fixtures/Configuration/legacyRte.json
@@ -11,7 +11,8 @@
 					"0": "tx_mask_rte"
 				},
 				"options": {
-					"0": "rte"
+					"0": "rte",
+					"1": "rte"
 				}
 			}
 		},