From 5eccdbf6c4d1bef680e32ce07757ce049015fec1 Mon Sep 17 00:00:00 2001
From: Helmut Hummel <helmut.hummel@typo3.org>
Date: Tue, 7 Jul 2015 18:31:23 +0200
Subject: [PATCH] [TASK] Move t3lib_extMgm alias to compatibility6 extension
ext_autoload.php is ignored now, so the issues why we kept
this alias in the core is obsolete.
Releases: master
Resolves: #67966
Change-Id: Ibdcf362b5c31e938941b374aff786d81da4668ba
Reviewed-on: http://review.typo3.org/40969
Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
Tested-by: Christian Kuhn <lolli@schwarzbu.ch>
Reviewed-by: Wouter Wolters <typo3@wouterwolters.nl>
Tested-by: Wouter Wolters <typo3@wouterwolters.nl>
---
composer.json | 1 -
.../compatibility6/Migrations/Code/ClassAliasMap.php | 1 +
.../compatibility6/Migrations/Code/LegacyClassesForIde.php | 5 +++++
typo3/sysext/core/Migrations/Code/ClassAliasMap.php | 4 ----
.../sysext/core/Migrations/Code/LegacyClassesForIde001.php | 7 -------
typo3/sysext/core/composer.json | 5 +----
.../Migrations/Code/LegacyClassesForIde.php} | 0
7 files changed, 7 insertions(+), 16 deletions(-)
delete mode 100644 typo3/sysext/core/Migrations/Code/ClassAliasMap.php
delete mode 100644 typo3/sysext/core/Migrations/Code/LegacyClassesForIde001.php
rename typo3/sysext/{core/Migrations/Code/LegacyClassesForIde002.php => rtehtmlarea/Migrations/Code/LegacyClassesForIde.php} (100%)
diff --git a/composer.json b/composer.json
index 464c604868b8..e066997c980d 100644
--- a/composer.json
+++ b/composer.json
@@ -59,7 +59,6 @@
"dev-master": "7.x-dev"
},
"class-alias-maps": [
- "typo3/sysext/core/Migrations/Code/ClassAliasMap.php",
"typo3/sysext/backend/Migrations/Code/ClassAliasMap.php",
"typo3/sysext/form/Migrations/Code/ClassAliasMap.php",
"typo3/sysext/rtehtmlarea/Migrations/Code/ClassAliasMap.php"
diff --git a/typo3/sysext/compatibility6/Migrations/Code/ClassAliasMap.php b/typo3/sysext/compatibility6/Migrations/Code/ClassAliasMap.php
index 5024800defa2..015fbf1a4d96 100644
--- a/typo3/sysext/compatibility6/Migrations/Code/ClassAliasMap.php
+++ b/typo3/sysext/compatibility6/Migrations/Code/ClassAliasMap.php
@@ -21,6 +21,7 @@ return array(
't3lib_contextmenu_pagetree_DataProvider' => \TYPO3\CMS\Backend\ContextMenu\Pagetree\ContextMenuDataProvider::class,
't3lib_contextmenu_pagetree_extdirect_ContextMenu' => \TYPO3\CMS\Backend\ContextMenu\Pagetree\Extdirect\ContextMenuConfiguration::class,
't3lib_contextmenu_renderer_Abstract' => \TYPO3\CMS\Backend\ContextMenu\Renderer\AbstractContextMenuRenderer::class,
+ 't3lib_extMgm' => \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::class,
'TYPO3backend' => \TYPO3\CMS\Backend\Controller\BackendController::class,
'SC_wizard_backend_layout' => \TYPO3\CMS\Backend\Controller\BackendLayoutWizardController::class,
'SC_alt_clickmenu' => \TYPO3\CMS\Backend\Controller\ClickMenuController::class,
diff --git a/typo3/sysext/compatibility6/Migrations/Code/LegacyClassesForIde.php b/typo3/sysext/compatibility6/Migrations/Code/LegacyClassesForIde.php
index b9123592dbb1..50c7a145ad08 100644
--- a/typo3/sysext/compatibility6/Migrations/Code/LegacyClassesForIde.php
+++ b/typo3/sysext/compatibility6/Migrations/Code/LegacyClassesForIde.php
@@ -41,6 +41,11 @@ class clickMenu extends \TYPO3\CMS\Backend\ClickMenu\ClickMenu {}
*/
class t3lib_cli extends \TYPO3\CMS\Core\Controller\CommandLineController {}
+/**
+ * @deprecated since TYPO3 CMS 6.0, will be removed in TYPO3 CMS 8
+ */
+class t3lib_extMgm extends TYPO3\CMS\Core\Utility\ExtensionManagementUtility {}
+
/**
* @deprecated since 6.0, removed since 7.0
*/
diff --git a/typo3/sysext/core/Migrations/Code/ClassAliasMap.php b/typo3/sysext/core/Migrations/Code/ClassAliasMap.php
deleted file mode 100644
index e41b14f975bc..000000000000
--- a/typo3/sysext/core/Migrations/Code/ClassAliasMap.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-return array(
- 't3lib_extMgm' => \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::class,
-);
diff --git a/typo3/sysext/core/Migrations/Code/LegacyClassesForIde001.php b/typo3/sysext/core/Migrations/Code/LegacyClassesForIde001.php
deleted file mode 100644
index 8642b8348c45..000000000000
--- a/typo3/sysext/core/Migrations/Code/LegacyClassesForIde001.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-die('Access denied');
-
-/**
- * @deprecated since TYPO3 CMS 6.0, will be removed in TYPO3 CMS 8
- */
-class t3lib_extMgm extends TYPO3\CMS\Core\Utility\ExtensionManagementUtility {}
diff --git a/typo3/sysext/core/composer.json b/typo3/sysext/core/composer.json
index 353759b33ec1..91bde4768a9b 100644
--- a/typo3/sysext/core/composer.json
+++ b/typo3/sysext/core/composer.json
@@ -19,10 +19,7 @@
"partOfFactoryDefault": true,
"partOfMinimalUsableSystem": true
}
- },
- "class-alias-maps": [
- "Migrations/Code/ClassAliasMap.php"
- ]
+ }
},
"autoload": {
"psr-4": {
diff --git a/typo3/sysext/core/Migrations/Code/LegacyClassesForIde002.php b/typo3/sysext/rtehtmlarea/Migrations/Code/LegacyClassesForIde.php
similarity index 100%
rename from typo3/sysext/core/Migrations/Code/LegacyClassesForIde002.php
rename to typo3/sysext/rtehtmlarea/Migrations/Code/LegacyClassesForIde.php
--
GitLab