From 8713405cdb4430be32802afd64cc80266cd3919e Mon Sep 17 00:00:00 2001
From: Benni Mack <benni@typo3.org>
Date: Tue, 26 May 2020 16:40:32 +0200
Subject: [PATCH] [!!!][TASK] Remove TCA + DB definition for
pages_language_overlay
The TCA schema and the database of page translations within "pages_language_overlay"
was still available for legacy reasons, but is now gone.
Resolves: #91479
Releases: master
Change-Id: Id330273f9bf72335b685c43f819080bca2864adb
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/64586
Tested-by: TYPO3com <noreply@typo3.com>
Tested-by: Wouter Wolters <typo3@wouterwolters.nl>
Tested-by: Georg Ringer <georg.ringer@gmail.com>
Reviewed-by: Wouter Wolters <typo3@wouterwolters.nl>
Reviewed-by: Georg Ringer <georg.ringer@gmail.com>
---
.../Database/Schema/SchemaMigrator.php | 5 -
...g-91473-DeprecatedFunctionalityRemoved.rst | 4 +-
typo3/sysext/core/ext_tables.sql | 2 -
.../TCA/pages_language_overlay.php | 429 ------------------
4 files changed, 3 insertions(+), 437 deletions(-)
delete mode 100644 typo3/sysext/frontend/Configuration/TCA/pages_language_overlay.php
diff --git a/typo3/sysext/core/Classes/Database/Schema/SchemaMigrator.php b/typo3/sysext/core/Classes/Database/Schema/SchemaMigrator.php
index 80ceaa0ea230..b142d377b962 100644
--- a/typo3/sysext/core/Classes/Database/Schema/SchemaMigrator.php
+++ b/typo3/sysext/core/Classes/Database/Schema/SchemaMigrator.php
@@ -267,11 +267,6 @@ class SchemaMigrator
$tables = $defaultTcaSchema->enrich($tables);
// Ensure the default TCA fields are ordered
foreach ($tables as $k => $table) {
- // @deprecated since v10 and will be removed in TYPO3 v11. "pages_language_overlay" is not to be added anymore in TYPO3 v10.
- if ($table->getName() === 'pages_language_overlay') {
- unset($tables[$k]);
- continue;
- }
$prioritizedColumnNames = $defaultTcaSchema->getPrioritizedFieldNames($table->getName());
// no TCA table
if (empty($prioritizedColumnNames)) {
diff --git a/typo3/sysext/core/Documentation/Changelog/master/Breaking-91473-DeprecatedFunctionalityRemoved.rst b/typo3/sysext/core/Documentation/Changelog/master/Breaking-91473-DeprecatedFunctionalityRemoved.rst
index 3f15acbdca6e..1aef846576a4 100644
--- a/typo3/sysext/core/Documentation/Changelog/master/Breaking-91473-DeprecatedFunctionalityRemoved.rst
+++ b/typo3/sysext/core/Documentation/Changelog/master/Breaking-91473-DeprecatedFunctionalityRemoved.rst
@@ -37,7 +37,7 @@ The following class methods have changed visibility:
The following class properties have changed visibility:
-The following VieHelpers have changed:
+The following ViewHelpers have changed:
The following scheduler tasks have been removed:
@@ -198,6 +198,8 @@ The following database tables have been removed:
The following database fields have been removed:
+- pages.legacy_overlay_uid
+
The following php doc annotations have been removed:
The following global JavaScript functions have been removed:
diff --git a/typo3/sysext/core/ext_tables.sql b/typo3/sysext/core/ext_tables.sql
index 88d91afaee41..d13f1551a935 100644
--- a/typo3/sysext/core/ext_tables.sql
+++ b/typo3/sysext/core/ext_tables.sql
@@ -112,8 +112,6 @@ CREATE TABLE pages (
backend_layout varchar(64) DEFAULT '' NOT NULL,
backend_layout_next_level varchar(64) DEFAULT '' NOT NULL,
tsconfig_includes text,
- # @deprecated since v9 and will be removed in TYPO3 v11. Legacy connection UID field to pages_language_overlay table
- legacy_overlay_uid int(11) unsigned DEFAULT '0' NOT NULL,
KEY determineSiteRoot (is_siteroot),
KEY language_identifier (l10n_parent,sys_language_uid),
diff --git a/typo3/sysext/frontend/Configuration/TCA/pages_language_overlay.php b/typo3/sysext/frontend/Configuration/TCA/pages_language_overlay.php
deleted file mode 100644
index e4d0c82a03d2..000000000000
--- a/typo3/sysext/frontend/Configuration/TCA/pages_language_overlay.php
+++ /dev/null
@@ -1,429 +0,0 @@
-<?php
-
-// @deprecated since v9 and will be removed in v11. Remove file and migration wizard "MigratePagesLanguageOverlayUpdate"
-return [
- 'ctrl' => [
- 'label' => 'title',
- 'tstamp' => 'tstamp',
- 'title' => 'LLL:EXT:frontend/Resources/Private/Language/locallang_tca.xlf:pages_language_overlay',
- 'versioningWS' => true,
- 'origUid' => 't3_origuid',
- 'crdate' => 'crdate',
- 'hideAtCopy' => 1,
- 'prependAtCopy' => 'LLL:EXT:core/Resources/Private/Language/locallang_general.xlf:LGL.prependAtCopy',
- 'cruser_id' => 'cruser_id',
- 'delete' => 'deleted',
- 'enablecolumns' => [
- 'disabled' => 'hidden',
- 'starttime' => 'starttime',
- 'endtime' => 'endtime'
- ],
- 'transOrigPointerField' => 'pid',
- 'transOrigDiffSourceField' => 'l18n_diffsource',
- 'shadowColumnsForNewPlaceholders' => 'title',
- 'languageField' => 'sys_language_uid',
- 'type' => 'doktype',
- 'typeicon_classes' => [
- 'default' => 'mimetypes-x-content-page-language-overlay'
- ],
- // disabled until all migration has been done
- 'hideTable' => true,
- // This option needs to be set to the record is not shown in the be_groups ACLs
- 'adminOnly' => true,
- 'searchFields' => 'title,subtitle,nav_title,keywords,description,abstract,author,author_email,url'
- ],
- 'columns' => [
- 'doktype' => $GLOBALS['TCA']['pages']['columns']['doktype'],
- 'hidden' => [
- 'exclude' => true,
- 'label' => 'LLL:EXT:frontend/Resources/Private/Language/locallang_tca.xlf:pages.hidden',
- 'config' => [
- 'type' => 'check',
- 'default' => 0,
- 'items' => [
- '1' => [
- '0' => 'LLL:EXT:frontend/Resources/Private/Language/locallang_tca.xlf:pages.hidden_checkbox_1_formlabel'
- ]
- ]
- ]
- ],
- 'starttime' => [
- 'exclude' => true,
- 'label' => 'LLL:EXT:core/Resources/Private/Language/locallang_general.xlf:LGL.starttime',
- 'config' => [
- 'type' => 'input',
- 'renderType' => 'inputDateTime',
- 'eval' => 'datetime,int',
- 'default' => 0
- ]
- ],
- 'endtime' => [
- 'exclude' => true,
- 'label' => 'LLL:EXT:core/Resources/Private/Language/locallang_general.xlf:LGL.endtime',
- 'config' => [
- 'type' => 'input',
- 'renderType' => 'inputDateTime',
- 'eval' => 'datetime,int',
- 'default' => 0,
- 'range' => [
- 'upper' => mktime(0, 0, 0, 1, 1, 2038)
- ]
- ]
- ],
- 'title' => [
- 'label' => $GLOBALS['TCA']['pages']['columns']['title']['label'],
- 'config' => [
- 'type' => 'input',
- 'size' => 50,
- 'max' => 255,
- 'eval' => 'trim,required'
- ]
- ],
- 'subtitle' => [
- 'exclude' => true,
- 'label' => $GLOBALS['TCA']['pages']['columns']['subtitle']['label'],
- 'config' => [
- 'type' => 'input',
- 'size' => 50,
- 'max' => 255,
- 'eval' => 'trim'
- ]
- ],
- 'nav_title' => [
- 'exclude' => true,
- 'label' => $GLOBALS['TCA']['pages']['columns']['nav_title']['label'],
- 'config' => [
- 'type' => 'input',
- 'size' => 50,
- 'max' => 255,
- 'eval' => 'trim'
- ]
- ],
- 'keywords' => [
- 'exclude' => true,
- 'label' => $GLOBALS['TCA']['pages']['columns']['keywords']['label'],
- 'config' => [
- 'type' => 'text',
- 'cols' => 40,
- 'rows' => 3
- ]
- ],
- 'description' => [
- 'exclude' => true,
- 'label' => $GLOBALS['TCA']['pages']['columns']['description']['label'],
- 'config' => [
- 'type' => 'text',
- 'cols' => 40,
- 'rows' => 3
- ]
- ],
- 'abstract' => [
- 'exclude' => true,
- 'label' => $GLOBALS['TCA']['pages']['columns']['abstract']['label'],
- 'config' => [
- 'type' => 'text',
- 'cols' => 40,
- 'rows' => 3
- ]
- ],
- 'author' => [
- 'exclude' => true,
- 'label' => $GLOBALS['TCA']['pages']['columns']['author']['label'],
- 'config' => [
- 'type' => 'input',
- 'size' => 23,
- 'eval' => 'trim',
- 'max' => 80
- ]
- ],
- 'author_email' => [
- 'exclude' => true,
- 'label' => $GLOBALS['TCA']['pages']['columns']['author_email']['label'],
- 'config' => [
- 'type' => 'input',
- 'size' => 23,
- 'eval' => 'trim',
- 'max' => 255,
- 'softref' => 'email[subst]'
- ]
- ],
- 'media' => [
- 'exclude' => true,
- 'label' => $GLOBALS['TCA']['pages']['columns']['media']['label'],
- 'config' => \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::getFileFieldTCAConfig(
- 'media',
- [
- // Use the imageoverlayPalette instead of the basicoverlayPalette
- 'overrideChildTca' => [
- 'types' => [
- '0' => [
- 'showitem' => '
- --palette--;;imageoverlayPalette,
- --palette--;;filePalette'
- ],
- \TYPO3\CMS\Core\Resource\File::FILETYPE_TEXT => [
- 'showitem' => '
- --palette--;;imageoverlayPalette,
- --palette--;;filePalette'
- ],
- \TYPO3\CMS\Core\Resource\File::FILETYPE_IMAGE => [
- 'showitem' => '
- --palette--;;imageoverlayPalette,
- --palette--;;filePalette'
- ],
- \TYPO3\CMS\Core\Resource\File::FILETYPE_AUDIO => [
- 'showitem' => '
- --palette--;;audioOverlayPalette,
- --palette--;;filePalette'
- ],
- \TYPO3\CMS\Core\Resource\File::FILETYPE_VIDEO => [
- 'showitem' => '
- --palette--;;videoOverlayPalette,
- --palette--;;filePalette'
- ],
- \TYPO3\CMS\Core\Resource\File::FILETYPE_APPLICATION => [
- 'showitem' => '
- --palette--;;imageoverlayPalette,
- --palette--;;filePalette'
- ]
- ],
- ],
- ]
- )
- ],
- 'url' => [
- 'exclude' => true,
- 'label' => 'LLL:EXT:frontend/Resources/Private/Language/locallang_tca.xlf:pages.url',
- 'config' => [
- 'type' => 'input',
- 'size' => 23,
- 'max' => 255,
- 'eval' => 'trim',
- 'softref' => 'url'
- ]
- ],
- 'shortcut' => [
- 'label' => 'LLL:EXT:core/Resources/Private/Language/locallang_general.xlf:LGL.shortcut_page',
- 'config' => [
- 'type' => 'group',
- 'internal_type' => 'db',
- 'allowed' => 'pages',
- 'size' => 1,
- 'maxitems' => 1,
- 'minitems' => 0,
- 'default' => 0
- ]
- ],
- 'shortcut_mode' => [
- 'exclude' => true,
- 'label' => 'LLL:EXT:frontend/Resources/Private/Language/locallang_tca.xlf:pages.shortcut_mode',
- 'config' => [
- 'type' => 'select',
- 'renderType' => 'selectSingle',
- 'items' => $GLOBALS['TCA']['pages']['columns']['shortcut_mode']['config']['items'],
- 'default' => 0
- ]
- ],
- 'sys_language_uid' => [
- 'label' => 'LLL:EXT:core/Resources/Private/Language/locallang_general.xlf:LGL.language',
- 'config' => [
- 'type' => 'select',
- 'renderType' => 'selectSingle',
- 'foreign_table' => 'sys_language',
- 'items' => [], // no default language here, as the pages table is always the default language
- 'default' => 0,
- 'fieldWizard' => [
- 'selectIcons' => [
- 'disabled' => false,
- ],
- ],
- ]
- ],
- 'l18n_diffsource' => [
- 'config' => [
- 'type' => 'passthrough',
- 'default' => ''
- ]
- ]
- ],
- 'types' => [
- // normal
- (string)\TYPO3\CMS\Core\Domain\Repository\PageRepository::DOKTYPE_DEFAULT => [
- 'showitem' => '
- --div--;LLL:EXT:core/Resources/Private/Language/Form/locallang_tabs.xlf:general,
- --palette--;;standard,
- --palette--;;title,
- --div--;LLL:EXT:frontend/Resources/Private/Language/locallang_tca.xlf:pages.tabs.metadata,
- --palette--;;abstract,
- --palette--;;metatags,
- --palette--;;editorial,
- --div--;LLL:EXT:frontend/Resources/Private/Language/locallang_tca.xlf:pages.tabs.resources,
- --palette--;;media,
- --div--;LLL:EXT:core/Resources/Private/Language/Form/locallang_tabs.xlf:language,
- sys_language_uid,
- --div--;LLL:EXT:core/Resources/Private/Language/Form/locallang_tabs.xlf:access,
- --palette--;;hiddenonly,
- --palette--;;access,
- --div--;LLL:EXT:core/Resources/Private/Language/Form/locallang_tabs.xlf:extended,
- '
- ],
- // external URL
- (string)\TYPO3\CMS\Core\Domain\Repository\PageRepository::DOKTYPE_LINK => [
- 'showitem' => '
- --div--;LLL:EXT:core/Resources/Private/Language/Form/locallang_tabs.xlf:general,
- doktype,
- --palette--;;title,
- --palette--;;external,
- --div--;LLL:EXT:frontend/Resources/Private/Language/locallang_tca.xlf:pages.tabs.metadata,
- --palette--;;abstract,
- --palette--;;editorial,
- --div--;LLL:EXT:frontend/Resources/Private/Language/locallang_tca.xlf:pages.tabs.resources,
- --palette--;;media,
- --div--;LLL:EXT:core/Resources/Private/Language/Form/locallang_tabs.xlf:language,
- sys_language_uid,
- --div--;LLL:EXT:core/Resources/Private/Language/Form/locallang_tabs.xlf:access,
- --palette--;;hiddenonly,
- --palette--;;access,
- --div--;LLL:EXT:core/Resources/Private/Language/Form/locallang_tabs.xlf:extended,
- '
- ],
- // shortcut
- (string)\TYPO3\CMS\Core\Domain\Repository\PageRepository::DOKTYPE_SHORTCUT => [
- 'showitem' => '
- --div--;LLL:EXT:core/Resources/Private/Language/Form/locallang_tabs.xlf:general,
- doktype,
- --palette--;;title,
- --palette--;;shortcut,
- --palette--;;shortcutpage,
- --div--;LLL:EXT:frontend/Resources/Private/Language/locallang_tca.xlf:pages.tabs.metadata,
- --palette--;;abstract,
- --palette--;;editorial,
- --div--;LLL:EXT:frontend/Resources/Private/Language/locallang_tca.xlf:pages.tabs.resources,
- --palette--;;media,
- --div--;LLL:EXT:core/Resources/Private/Language/Form/locallang_tabs.xlf:language,
- sys_language_uid,
- --div--;LLL:EXT:core/Resources/Private/Language/Form/locallang_tabs.xlf:access,
- --palette--;;hiddenonly,
- --palette--;;access,
- --div--;LLL:EXT:core/Resources/Private/Language/Form/locallang_tabs.xlf:extended,
- '
- ],
- // mount page
- (string)\TYPO3\CMS\Core\Domain\Repository\PageRepository::DOKTYPE_MOUNTPOINT => [
- 'showitem' => '
- --div--;LLL:EXT:core/Resources/Private/Language/Form/locallang_tabs.xlf:general,
- --palette--;;standard,
- --palette--;;title,
- --div--;LLL:EXT:frontend/Resources/Private/Language/locallang_tca.xlf:pages.tabs.metadata,
- --palette--;;abstract,
- --palette--;;editorial,
- --div--;LLL:EXT:frontend/Resources/Private/Language/locallang_tca.xlf:pages.tabs.resources,
- --palette--;;media,
- --div--;LLL:EXT:core/Resources/Private/Language/Form/locallang_tabs.xlf:language,
- sys_language_uid,
- --div--;LLL:EXT:core/Resources/Private/Language/Form/locallang_tabs.xlf:access,
- --palette--;;hiddenonly,
- --palette--;;access,
- --div--;LLL:EXT:core/Resources/Private/Language/Form/locallang_tabs.xlf:extended,
- '
- ],
- // spacer
- (string)\TYPO3\CMS\Core\Domain\Repository\PageRepository::DOKTYPE_SPACER => [
- 'showitem' => '
- --div--;LLL:EXT:core/Resources/Private/Language/Form/locallang_tabs.xlf:general,
- --palette--;;standard,
- --palette--;;titleonly,
- --div--;LLL:EXT:core/Resources/Private/Language/Form/locallang_tabs.xlf:language,
- sys_language_uid,
- --div--;LLL:EXT:core/Resources/Private/Language/Form/locallang_tabs.xlf:access,
- --palette--;;hiddenonly,
- --palette--;;access,
- --div--;LLL:EXT:core/Resources/Private/Language/Form/locallang_tabs.xlf:extended,
- '
- ],
- // sysfolder
- (string)\TYPO3\CMS\Core\Domain\Repository\PageRepository::DOKTYPE_SYSFOLDER => [
- 'showitem' => '
- --div--;LLL:EXT:core/Resources/Private/Language/Form/locallang_tabs.xlf:general,
- --palette--;;standard,
- --palette--;;titleonly,
- --div--;LLL:EXT:frontend/Resources/Private/Language/locallang_tca.xlf:pages.tabs.resources,
- --palette--;;media,
- --div--;LLL:EXT:core/Resources/Private/Language/Form/locallang_tabs.xlf:language,
- sys_language_uid,
- --div--;LLL:EXT:core/Resources/Private/Language/Form/locallang_tabs.xlf:access,
- --palette--;;hiddenonly,
- --div--;LLL:EXT:core/Resources/Private/Language/Form/locallang_tabs.xlf:extended,
- '
- ],
- // trash
- (string)\TYPO3\CMS\Core\Domain\Repository\PageRepository::DOKTYPE_RECYCLER => [
- 'showitem' => '
- --div--;LLL:EXT:core/Resources/Private/Language/Form/locallang_tabs.xlf:general,
- --palette--;;standard,
- --palette--;;titleonly,
- --div--;LLL:EXT:core/Resources/Private/Language/Form/locallang_tabs.xlf:language,
- sys_language_uid,
- --div--;LLL:EXT:core/Resources/Private/Language/Form/locallang_tabs.xlf:access,
- --palette--;;hiddenonly,
- --div--;LLL:EXT:core/Resources/Private/Language/Form/locallang_tabs.xlf:extended,
- '
- ]
- ],
- 'palettes' => [
- '5' => [
- 'showitem' => 'author,author_email',
- ],
- 'standard' => [
- 'label' => 'LLL:EXT:frontend/Resources/Private/Language/locallang_tca.xlf:pages.palettes.standard',
- 'showitem' => 'doktype;LLL:EXT:frontend/Resources/Private/Language/locallang_tca.xlf:pages.doktype_formlabel',
- ],
- 'shortcut' => [
- 'label' => 'LLL:EXT:frontend/Resources/Private/Language/locallang_tca.xlf:pages.palettes.shortcut',
- 'showitem' => 'shortcut_mode;LLL:EXT:frontend/Resources/Private/Language/locallang_tca.xlf:pages.shortcut_mode_formlabel',
- ],
- 'shortcutpage' => [
- 'label' => 'LLL:EXT:frontend/Resources/Private/Language/locallang_tca.xlf:pages.palettes.shortcutpage',
- 'showitem' => 'shortcut;LLL:EXT:frontend/Resources/Private/Language/locallang_tca.xlf:pages.shortcut_formlabel',
- ],
- 'external' => [
- 'label' => 'LLL:EXT:frontend/Resources/Private/Language/locallang_tca.xlf:pages.palettes.external',
- 'showitem' => 'url;LLL:EXT:frontend/Resources/Private/Language/locallang_tca.xlf:pages.url_formlabel',
- ],
- 'title' => [
- 'label' => 'LLL:EXT:frontend/Resources/Private/Language/locallang_tca.xlf:pages.palettes.title',
- 'showitem' => 'title;LLL:EXT:frontend/Resources/Private/Language/locallang_tca.xlf:pages.title_formlabel, --linebreak--, nav_title;LLL:EXT:frontend/Resources/Private/Language/locallang_tca.xlf:pages.nav_title_formlabel, --linebreak--, subtitle;LLL:EXT:frontend/Resources/Private/Language/locallang_tca.xlf:pages.subtitle_formlabel',
- ],
- 'titleonly' => [
- 'label' => 'LLL:EXT:frontend/Resources/Private/Language/locallang_tca.xlf:pages.palettes.title',
- 'showitem' => 'title;LLL:EXT:frontend/Resources/Private/Language/locallang_tca.xlf:pages.title_formlabel',
- ],
- 'hiddenonly' => [
- 'label' => 'LLL:EXT:frontend/Resources/Private/Language/locallang_tca.xlf:pages.palettes.visibility',
- 'showitem' => 'hidden;LLL:EXT:frontend/Resources/Private/Language/locallang_tca.xlf:pages.hidden_formlabel',
- ],
- 'access' => [
- 'label' => 'LLL:EXT:frontend/Resources/Private/Language/locallang_tca.xlf:pages.palettes.access',
- 'showitem' => 'starttime;LLL:EXT:frontend/Resources/Private/Language/locallang_tca.xlf:pages.starttime_formlabel, endtime;LLL:EXT:frontend/Resources/Private/Language/locallang_tca.xlf:pages.endtime_formlabel',
- ],
- 'abstract' => [
- 'label' => 'LLL:EXT:frontend/Resources/Private/Language/locallang_tca.xlf:pages.palettes.abstract',
- 'showitem' => 'abstract;LLL:EXT:frontend/Resources/Private/Language/locallang_tca.xlf:pages.abstract_formlabel',
- ],
- 'metatags' => [
- 'label' => 'LLL:EXT:frontend/Resources/Private/Language/locallang_tca.xlf:pages.palettes.metatags',
- 'showitem' => 'keywords;LLL:EXT:frontend/Resources/Private/Language/locallang_tca.xlf:pages.keywords_formlabel, --linebreak--, description;LLL:EXT:frontend/Resources/Private/Language/locallang_tca.xlf:pages.description_formlabel',
- ],
- 'editorial' => [
- 'label' => 'LLL:EXT:frontend/Resources/Private/Language/locallang_tca.xlf:pages.palettes.editorial',
- 'showitem' => 'author;LLL:EXT:frontend/Resources/Private/Language/locallang_tca.xlf:pages.author_formlabel, author_email;LLL:EXT:frontend/Resources/Private/Language/locallang_tca.xlf:pages.author_email_formlabel',
- ],
- 'language' => [
- 'showitem' => 'l18n_cfg;LLL:EXT:frontend/Resources/Private/Language/locallang_tca.xlf:pages.l18n_cfg_formlabel',
- ],
- 'media' => [
- 'label' => 'LLL:EXT:frontend/Resources/Private/Language/locallang_tca.xlf:pages.palettes.media',
- 'showitem' => 'media;LLL:EXT:frontend/Resources/Private/Language/locallang_tca.xlf:pages.media_formlabel',
- ],
- ],
-];
--
GitLab