From 46df71761e9c002ff8caa590d3511a90b1b9ac0f Mon Sep 17 00:00:00 2001 From: Georg Ringer Date: Mon, 15 May 2017 09:01:37 +0200 Subject: [PATCH] [!!!][TASK] Migrate EXT:context_help into EXT:backend Merge the extension into EXT:backend as it only consists of one AJAX controller - all other functionality related to context help is already in EXT:backend and deeply connected to Backend-related output code, so this is just a regular step. Resolves: #81225 Releases: master Change-Id: Ie5d577d62876f18414b61f5eefc9d9dd48d52430 Reviewed-on: https://review.typo3.org/52804 Reviewed-by: Markus Klein Tested-by: Markus Klein Tested-by: TYPO3com Reviewed-by: Benni Mack Tested-by: Benni Mack --- .../Controller/ContextHelpAjaxController.php | 3 +- .../Classes/Utility/BackendUtility.php | 4 --- .../Configuration/Backend/AjaxRoutes.php | 6 ++++ .../Configuration/Backend/AjaxRoutes.php | 12 ------- .../Resources/Public/Icons/Extension.png | Bin 2349 -> 0 bytes typo3/sysext/context_help/composer.json | 26 -------------- typo3/sysext/context_help/ext_emconf.php | 21 ------------ ...1225-MergedEXTcontext_helpToEXTbackend.rst | 32 ++++++++++++++++++ .../core/Migrations/Code/ClassAliasMap.php | 3 +- .../Migrations/Code/LegacyClassesForIde.php | 6 ++++ 10 files changed, 47 insertions(+), 66 deletions(-) rename typo3/sysext/{context_help => backend}/Classes/Controller/ContextHelpAjaxController.php (96%) delete mode 100644 typo3/sysext/context_help/Configuration/Backend/AjaxRoutes.php delete mode 100644 typo3/sysext/context_help/Resources/Public/Icons/Extension.png delete mode 100644 typo3/sysext/context_help/composer.json delete mode 100644 typo3/sysext/context_help/ext_emconf.php create mode 100644 typo3/sysext/core/Documentation/Changelog/master/Breaking-81225-MergedEXTcontext_helpToEXTbackend.rst diff --git a/typo3/sysext/context_help/Classes/Controller/ContextHelpAjaxController.php b/typo3/sysext/backend/Classes/Controller/ContextHelpAjaxController.php similarity index 96% rename from typo3/sysext/context_help/Classes/Controller/ContextHelpAjaxController.php rename to typo3/sysext/backend/Classes/Controller/ContextHelpAjaxController.php index 5accba2af95e..8399e0dfae0b 100644 --- a/typo3/sysext/context_help/Classes/Controller/ContextHelpAjaxController.php +++ b/typo3/sysext/backend/Classes/Controller/ContextHelpAjaxController.php @@ -1,5 +1,5 @@ getIcon('actions-view-go-forward', Icon::SIZE_SMALL)->render() : ''; return [ diff --git a/typo3/sysext/backend/Classes/Utility/BackendUtility.php b/typo3/sysext/backend/Classes/Utility/BackendUtility.php index 82031dcbf76f..e153658dbd19 100644 --- a/typo3/sysext/backend/Classes/Utility/BackendUtility.php +++ b/typo3/sysext/backend/Classes/Utility/BackendUtility.php @@ -2393,10 +2393,6 @@ class BackendUtility */ public static function wrapInHelp($table, $field, $text = '', array $overloadHelpText = []) { - if (!ExtensionManagementUtility::isLoaded('context_help')) { - return $text; - } - // Initialize some variables $helpText = ''; $abbrClassAdd = ''; diff --git a/typo3/sysext/backend/Configuration/Backend/AjaxRoutes.php b/typo3/sysext/backend/Configuration/Backend/AjaxRoutes.php index 2e7a61198a5c..b314f2043f25 100644 --- a/typo3/sysext/backend/Configuration/Backend/AjaxRoutes.php +++ b/typo3/sysext/backend/Configuration/Backend/AjaxRoutes.php @@ -232,5 +232,11 @@ return [ 'records_localize' => [ 'path' => '/records/localize', 'target' => Controller\Page\LocalizationController::class . '::localizeRecords' + ], + + // context help + 'context_help' => [ + 'path' => '/context-help', + 'target' => \TYPO3\CMS\Backend\Controller\ContextHelpAjaxController::class . '::getHelpAction' ] ]; diff --git a/typo3/sysext/context_help/Configuration/Backend/AjaxRoutes.php b/typo3/sysext/context_help/Configuration/Backend/AjaxRoutes.php deleted file mode 100644 index bb66e969d6c4..000000000000 --- a/typo3/sysext/context_help/Configuration/Backend/AjaxRoutes.php +++ /dev/null @@ -1,12 +0,0 @@ - [ - 'path' => '/context-help', - 'target' => \TYPO3\CMS\ContextHelp\Controller\ContextHelpAjaxController::class . '::getHelpAction' - ] -]; diff --git a/typo3/sysext/context_help/Resources/Public/Icons/Extension.png b/typo3/sysext/context_help/Resources/Public/Icons/Extension.png deleted file mode 100644 index 1b5e5b28143550a766da4c9bfc954c69e646f040..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2349 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 Ag#Z8m diff --git a/typo3/sysext/context_help/composer.json b/typo3/sysext/context_help/composer.json deleted file mode 100644 index 7d094f1ce0b4..000000000000 --- a/typo3/sysext/context_help/composer.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "name": "typo3/cms-context-help", - "type": "typo3-cms-framework", - "description": "TYPO3 Core", - "homepage": "https://typo3.org", - "license": ["GPL-2.0+"], - - "require": { - "typo3/cms-core": "*" - }, - "replace": { - "context_help": "*" - }, - "extra": { - "typo3/cms": { - "Package": { - "partOfFactoryDefault": true - } - } - }, - "autoload": { - "psr-4": { - "TYPO3\\CMS\\ContextHelp\\": "Classes/" - } - } -} diff --git a/typo3/sysext/context_help/ext_emconf.php b/typo3/sysext/context_help/ext_emconf.php deleted file mode 100644 index 696db7b1982d..000000000000 --- a/typo3/sysext/context_help/ext_emconf.php +++ /dev/null @@ -1,21 +0,0 @@ - 'Context Sensitive Help', - 'description' => 'Provides context sensitive help to tables, fields and modules in the system languages.', - 'category' => 'be', - 'state' => 'stable', - 'uploadfolder' => 0, - 'createDirs' => '', - 'clearCacheOnLoad' => 0, - 'author' => 'Kasper Skaarhoj', - 'author_email' => 'kasperYYYY@typo3.com', - 'author_company' => 'Curby Soft Multimedia', - 'version' => '9.0.0', - 'constraints' => [ - 'depends' => [ - 'typo3' => '9.0.0-9.0.99', - ], - 'conflicts' => [], - 'suggests' => [], - ], -]; diff --git a/typo3/sysext/core/Documentation/Changelog/master/Breaking-81225-MergedEXTcontext_helpToEXTbackend.rst b/typo3/sysext/core/Documentation/Changelog/master/Breaking-81225-MergedEXTcontext_helpToEXTbackend.rst new file mode 100644 index 000000000000..d62679abc7db --- /dev/null +++ b/typo3/sysext/core/Documentation/Changelog/master/Breaking-81225-MergedEXTcontext_helpToEXTbackend.rst @@ -0,0 +1,32 @@ +.. include:: ../../Includes.txt + +========================================================= +Breaking: #81225 - Merged EXT:context_help to EXT:backend +========================================================= + +See :issue:`81225` + +Description +=========== + +The extension context_help has been merged into the extension backend. + + +Impact +====== + +The extension backend can't be deactivated. Therefore any check if context_help is installed will return false. + + +Affected Installations +====================== + +Installations with extensions with checks for extension context_help being installed. + + +Migration +========= + +Remove the checks. + +.. index:: Backend diff --git a/typo3/sysext/core/Migrations/Code/ClassAliasMap.php b/typo3/sysext/core/Migrations/Code/ClassAliasMap.php index d95341e858ab..422fa7fc4e8e 100644 --- a/typo3/sysext/core/Migrations/Code/ClassAliasMap.php +++ b/typo3/sysext/core/Migrations/Code/ClassAliasMap.php @@ -1,4 +1,5 @@ \TYPO3\CMS\Core\Localization\LanguageService::class + 'TYPO3\\CMS\\Lang\\LanguageService' => \TYPO3\CMS\Core\Localization\LanguageService::class, + 'TYPO3\\CMS\\ContextHelp\\Controller\\ContextHelpAjaxController' => \TYPO3\CMS\Backend\Controller\ContextHelpAjaxController::class ]; diff --git a/typo3/sysext/core/Migrations/Code/LegacyClassesForIde.php b/typo3/sysext/core/Migrations/Code/LegacyClassesForIde.php index 2bdcf1006804..869c2019c80c 100644 --- a/typo3/sysext/core/Migrations/Code/LegacyClassesForIde.php +++ b/typo3/sysext/core/Migrations/Code/LegacyClassesForIde.php @@ -8,3 +8,9 @@ namespace TYPO3\CMS\Lang { { } } + +namespace TYPO3\CMS\ContextHelp\Controller { + class ContextHelpAjaxController extends \TYPO3\CMS\Backend\Controller\ContextHelpAjaxController + { + } +} -- 2.20.1