[TASK] Rename ExtensionManager class

The class ExtensionManager is actually a utility
to manage extensions. Rename it to better reflect
it's purpose.

Resolves: #42661
Releases: 6.0

Change-Id: I157ead0a4584ef38b87bd1994c2bf3ea5c979ccc
Reviewed-on: http://review.typo3.org/16174
Reviewed-by: Helmut Hummel
Tested-by: Helmut Hummel

diff --git a/typo3/sysext/version/Classes/ClickMenu/VersionClickMenu.php b/typo3/sysext/version/Classes/ClickMenu/VersionClickMenu.php
index a354d9c..0845ba0 100644 (file)
--- a/typo3/sysext/version/Classes/ClickMenu/VersionClickMenu.php
+++ b/typo3/sysext/version/Classes/ClickMenu/VersionClickMenu.php
@@ -52,8 +52,8 @@ class VersionClickMenu {
                        // Adds the regular item
                        $LL = $this->includeLL();
                        // "Versioning" element added:
-                       $url = \TYPO3\CMS\Core\Extension\ExtensionManager::extRelPath('version') . 'cm1/index.php?table=' . rawurlencode($table) . '&uid=' . $uid;
-                       $localItems[] = $backRef->linkItem($GLOBALS['LANG']->getLLL('title', $LL), $backRef->excludeIcon('<img src="' . $backRef->backPath . \TYPO3\CMS\Core\Extension\ExtensionManager::extRelPath('version') . 'cm1/cm_icon.gif" width="15" height="12" border="0" align="top" alt="" />'), $backRef->urlRefForCM($url), 1);
+                       $url = \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extRelPath('version') . 'cm1/index.php?table=' . rawurlencode($table) . '&uid=' . $uid;
+                       $localItems[] = $backRef->linkItem($GLOBALS['LANG']->getLLL('title', $LL), $backRef->excludeIcon('<img src="' . $backRef->backPath . \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extRelPath('version') . 'cm1/cm_icon.gif" width="15" height="12" border="0" align="top" alt="" />'), $backRef->urlRefForCM($url), 1);
                        // "Send to review" element added:
                        /*
                        $url = t3lib_extMgm::extRelPath('version').'cm1/index.php?id='.($table=='pages'?$uid:$backRef->rec['pid']).'&table='.rawurlencode($table).'&uid='.$uid.'&sendToReview=1';

diff --git a/typo3/sysext/version/Classes/Hook/DataHandlerHook.php b/typo3/sysext/version/Classes/Hook/DataHandlerHook.php
index 21993dd..6aa0e46 100644 (file)
--- a/typo3/sysext/version/Classes/Hook/DataHandlerHook.php
+++ b/typo3/sysext/version/Classes/Hook/DataHandlerHook.php
@@ -347,7 +347,7 @@ class DataHandlerHook {
                $elementName = $id ? $table . ':' . $id : $table;
                if (is_array($workspaceRec)) {
                        // Get the new stage title from workspaces library, if workspaces extension is installed
-                       if (\TYPO3\CMS\Core\Extension\ExtensionManager::isLoaded('workspaces')) {
+                       if (\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::isLoaded('workspaces')) {
                                $stageService = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Workspaces\\Service\\StagesService');
                                $newStage = $stageService->getStageTitle((int) $stageId);
                        } else {
@@ -457,7 +457,7 @@ class DataHandlerHook {
                                        '###USER_USERNAME###' => $tcemainObj->BE_USER->user['username']
                                );
                                // add marker for preview links if workspace extension is loaded
-                               if (\TYPO3\CMS\Core\Extension\ExtensionManager::isLoaded('workspaces')) {
+                               if (\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::isLoaded('workspaces')) {
                                        $this->workspaceService = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('tx_Workspaces_Service_Workspaces');
                                        // only generate the link if the marker is in the template - prevents database from getting to much entries
                                        if (\TYPO3\CMS\Core\Utility\GeneralUtility::isFirstPartOfStr($emailConfig['message'], 'LLL:')) {

diff --git a/typo3/sysext/version/Classes/Preview.php b/typo3/sysext/version/Classes/Preview.php
index e61e353..ec8f081 100644 (file)
--- a/typo3/sysext/version/Classes/Preview.php
+++ b/typo3/sysext/version/Classes/Preview.php
@@ -4,5 +4,5 @@
  * and will be removed by 7.0. The class was renamed and is now located at:
  * typo3/sysext/version/Classes/Hook/PreviewHook.php
  */
-require_once \TYPO3\CMS\Core\Extension\ExtensionManager::extPath('version') . 'Classes/Hook/PreviewHook.php';
+require_once \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('version') . 'Classes/Hook/PreviewHook.php';
 ?>
\ No newline at end of file

diff --git a/typo3/sysext/version/Classes/Task/AutoPublishTask.php b/typo3/sysext/version/Classes/Task/AutoPublishTask.php
index 110c553..2e631db 100644 (file)
--- a/typo3/sysext/version/Classes/Task/AutoPublishTask.php
+++ b/typo3/sysext/version/Classes/Task/AutoPublishTask.php
@@ -42,7 +42,7 @@ class AutoPublishTask extends \TYPO3\CMS\Scheduler\Task {
         */
        public function execute() {
                // Load the workspace library class and instatiate it
-               require_once \TYPO3\CMS\Core\Extension\ExtensionManager::extPath('version') . 'ws/class.wslib.php';
+               require_once \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('version') . 'ws/class.wslib.php';
                $autopubObj = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Version\\Utility\\WorkspacesUtility');
                // Publish the workspaces that need to be
                $autopubObj->autoPublishWorkspaces();

diff --git a/typo3/sysext/version/Classes/View/VersionView.php b/typo3/sysext/version/Classes/View/VersionView.php
index 6816e9d..ee8dabd 100644 (file)
--- a/typo3/sysext/version/Classes/View/VersionView.php
+++ b/typo3/sysext/version/Classes/View/VersionView.php
@@ -68,7 +68,7 @@ class VersionView {
                                        $opt[] = '<option value="' . htmlspecialchars(\TYPO3\CMS\Core\Utility\GeneralUtility::linkThisScript(array('id' => $vRow['uid']))) . '"' . ($id == $vRow['uid'] ? ' selected="selected"' : '') . '>' . htmlspecialchars($label) . '</option>';
                                }
                                // Add management link:
-                               $management = '<input type="button" value="' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:ver.mgm', TRUE) . '" onclick="window.location.href=\'' . htmlspecialchars(($GLOBALS['BACK_PATH'] . \TYPO3\CMS\Core\Extension\ExtensionManager::extRelPath('version') . 'cm1/index.php?table=pages&uid=' . $onlineId)) . '\';" />';
+                               $management = '<input type="button" value="' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:ver.mgm', TRUE) . '" onclick="window.location.href=\'' . htmlspecialchars(($GLOBALS['BACK_PATH'] . \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extRelPath('version') . 'cm1/index.php?table=pages&uid=' . $onlineId)) . '\';" />';
                                // Create onchange handler:
                                $onChange = 'window.location.href=this.options[this.selectedIndex].value;';
                                // Controls:

diff --git a/typo3/sysext/version/class.tx_version_cm1.php b/typo3/sysext/version/class.tx_version_cm1.php
index 87afd9b..ca60abb 100755 (executable)
--- a/typo3/sysext/version/class.tx_version_cm1.php
+++ b/typo3/sysext/version/class.tx_version_cm1.php
@@ -4,5 +4,5 @@
  * and will be removed by 7.0. The class was renamed and is now located at:
  * typo3/sysext/version/Classes/ClickMenu/VersionClickMenu.php
  */
-require_once \TYPO3\CMS\Core\Extension\ExtensionManager::extPath('version') . 'Classes/ClickMenu/VersionClickMenu.php';
+require_once \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('version') . 'Classes/ClickMenu/VersionClickMenu.php';
 ?>
\ No newline at end of file

diff --git a/typo3/sysext/version/class.tx_version_gui.php b/typo3/sysext/version/class.tx_version_gui.php
index 2154067..0483b79 100644 (file)
--- a/typo3/sysext/version/class.tx_version_gui.php
+++ b/typo3/sysext/version/class.tx_version_gui.php
@@ -4,5 +4,5 @@
  * and will be removed by 7.0. The class was renamed and is now located at:
  * typo3/sysext/version/Classes/View/VersionView.php
  */
-require_once \TYPO3\CMS\Core\Extension\ExtensionManager::extPath('version') . 'Classes/View/VersionView.php';
+require_once \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('version') . 'Classes/View/VersionView.php';
 ?>
\ No newline at end of file

diff --git a/typo3/sysext/version/class.tx_version_iconworks.php b/typo3/sysext/version/class.tx_version_iconworks.php
index 40a3efe..3d84eee 100644 (file)
--- a/typo3/sysext/version/class.tx_version_iconworks.php
+++ b/typo3/sysext/version/class.tx_version_iconworks.php
@@ -4,5 +4,5 @@
  * and will be removed by 7.0. The class was renamed and is now located at:
  * typo3/sysext/version/Classes/Hook/IconUtilityHook.php
  */
-require_once \TYPO3\CMS\Core\Extension\ExtensionManager::extPath('version') . 'Classes/Hook/IconUtilityHook.php';
+require_once \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('version') . 'Classes/Hook/IconUtilityHook.php';
 ?>
\ No newline at end of file

diff --git a/typo3/sysext/version/class.tx_version_tcemain.php b/typo3/sysext/version/class.tx_version_tcemain.php
index cb1df51..ab45b7d 100644 (file)
--- a/typo3/sysext/version/class.tx_version_tcemain.php
+++ b/typo3/sysext/version/class.tx_version_tcemain.php
@@ -4,5 +4,5 @@
  * and will be removed by 7.0. The class was renamed and is now located at:
  * typo3/sysext/version/Classes/Hook/DataHandlerHook.php
  */
-require_once \TYPO3\CMS\Core\Extension\ExtensionManager::extPath('version') . 'Classes/Hook/DataHandlerHook.php';
+require_once \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('version') . 'Classes/Hook/DataHandlerHook.php';
 ?>
\ No newline at end of file

diff --git a/typo3/sysext/version/class.tx_version_tcemain_commandmap.php b/typo3/sysext/version/class.tx_version_tcemain_commandmap.php
index 42c6858..b72bbfa 100644 (file)
--- a/typo3/sysext/version/class.tx_version_tcemain_commandmap.php
+++ b/typo3/sysext/version/class.tx_version_tcemain_commandmap.php
@@ -4,5 +4,5 @@
  * and will be removed by 7.0. The class was renamed and is now located at:
  * typo3/sysext/version/Classes/DataHandler/CommandMap.php
  */
-require_once \TYPO3\CMS\Core\Extension\ExtensionManager::extPath('version') . 'Classes/DataHandler/CommandMap.php';
+require_once \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('version') . 'Classes/DataHandler/CommandMap.php';
 ?>
\ No newline at end of file

diff --git a/typo3/sysext/version/cm1/index.php b/typo3/sysext/version/cm1/index.php
index bce3cba..9d76d66 100755 (executable)
--- a/typo3/sysext/version/cm1/index.php
+++ b/typo3/sysext/version/cm1/index.php
@@ -34,7 +34,7 @@ require_once '../ws/class.wslib.php';
  * and will be removed by 7.0. The class was renamed and is now located at:
  * typo3/sysext/version/Classes/Controller/VersionModuleController.php
  */
-require_once \TYPO3\CMS\Core\Extension\ExtensionManager::extPath('version') . 'Classes/Controller/VersionModuleController.php';
+require_once \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('version') . 'Classes/Controller/VersionModuleController.php';
 // Make instance:
 $SOBE = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Version\\Controller\\VersionModuleController');
 $SOBE->init();

diff --git a/typo3/sysext/version/ext_autoload.php b/typo3/sysext/version/ext_autoload.php
index 5b8b22a..acc15cc 100644 (file)
--- a/typo3/sysext/version/ext_autoload.php
+++ b/typo3/sysext/version/ext_autoload.php
@@ -1,7 +1,7 @@
 <?php
 // DO NOT CHANGE THIS FILE! It is automatically generated by extdeveval::buildAutoloadRegistry.
 // This file was generated on 2010-11-13 17:45
-$extensionPath = \TYPO3\CMS\Core\Extension\ExtensionManager::extPath('version');
+$extensionPath = \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('version');
 return array(
        'tx_version_tcemain_commandmap' => $extensionPath . 'class.tx_version_tcemain_commandmap.php',
        'tx_version_cm1' => $extensionPath . 'cm1/index.php',

diff --git a/typo3/sysext/version/ext_localconf.php b/typo3/sysext/version/ext_localconf.php
index 4995445..332e6b6 100644 (file)
--- a/typo3/sysext/version/ext_localconf.php
+++ b/typo3/sysext/version/ext_localconf.php
@@ -4,16 +4,16 @@ if (!defined('TYPO3_MODE')) {
        die('Access denied.');
 }
 // register the hook to actually do the work within TCEmain
-$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['t3lib/class.t3lib_tcemain.php']['processCmdmapClass']['version'] = \TYPO3\CMS\Core\Extension\ExtensionManager::extPath('version', 'class.tx_version_tcemain.php:&TYPO3\\CMS\\Version\\Hook\\DataHandlerHook');
-$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['t3lib/class.t3lib_tcemain.php']['moveRecordClass']['version'] = \TYPO3\CMS\Core\Extension\ExtensionManager::extPath('version', 'class.tx_version_tcemain.php:&TYPO3\\CMS\\Version\\Hook\\DataHandlerHook');
+$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['t3lib/class.t3lib_tcemain.php']['processCmdmapClass']['version'] = \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('version', 'class.tx_version_tcemain.php:&TYPO3\\CMS\\Version\\Hook\\DataHandlerHook');
+$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['t3lib/class.t3lib_tcemain.php']['moveRecordClass']['version'] = \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('version', 'class.tx_version_tcemain.php:&TYPO3\\CMS\\Version\\Hook\\DataHandlerHook');
 // Register hook for overriding the icon status overlay
-$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['t3lib/class.t3lib_iconworks.php']['overrideIconOverlay']['version'] = \TYPO3\CMS\Core\Extension\ExtensionManager::extPath('version', 'class.tx_version_iconworks.php:&TYPO3\\CMS\\Version\\Hook\\IconUtilityHook');
+$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['t3lib/class.t3lib_iconworks.php']['overrideIconOverlay']['version'] = \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('version', 'class.tx_version_iconworks.php:&TYPO3\\CMS\\Version\\Hook\\IconUtilityHook');
 // Register hook to check for the preview mode in the FE
 $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['tslib/class.tslib_fe.php']['connectToDB']['version_preview'] = 'EXT:version/Classes/Preview.php:TYPO3\\CMS\\Version\\Hook\\PreviewHook->checkForPreview';
 $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['tslib/index_ts.php']['postBeUser']['version_preview'] = 'EXT:version/Classes/Preview.php:TYPO3\\CMS\\Version\\Hook\\PreviewHook->initializePreviewUser';
 if (TYPO3_MODE == 'BE') {
        // add default notification options to every page
-       \TYPO3\CMS\Core\Extension\ExtensionManager::addPageTSconfig('
+       \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPageTSconfig('
        tx_version.workspaces.stageNotificationEmail.subject = LLL:EXT:version/Resources/Private/Language/locallang_emails.xml:subject
        tx_version.workspaces.stageNotificationEmail.message = LLL:EXT:version/Resources/Private/Language/locallang_emails.xml:message
        # tx_version.workspaces.stageNotificationEmail.additionalHeaders =

diff --git a/typo3/sysext/version/ext_tables.php b/typo3/sysext/version/ext_tables.php
index 6e39841..cafbb74 100644 (file)
--- a/typo3/sysext/version/ext_tables.php
+++ b/typo3/sysext/version/ext_tables.php
@@ -3,10 +3,10 @@ if (!defined('TYPO3_MODE')) {
        die('Access denied.');
 }
 if (TYPO3_MODE == 'BE') {
-       if (!\TYPO3\CMS\Core\Extension\ExtensionManager::isLoaded('workspaces')) {
+       if (!\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::isLoaded('workspaces')) {
                $GLOBALS['TBE_MODULES_EXT']['xMOD_alt_clickmenu']['extendCMclasses'][] = array(
                        'name' => 'TYPO3\\CMS\\Version\\ClickMenu\\VersionClickMenu',
-                       'path' => \TYPO3\CMS\Core\Extension\ExtensionManager::extPath($_EXTKEY) . 'class.tx_version_cm1.php'
+                       'path' => \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath($_EXTKEY) . 'class.tx_version_cm1.php'
                );
        }
 }

diff --git a/typo3/sysext/version/tasks/class.tx_version_tasks_autopublish.php b/typo3/sysext/version/tasks/class.tx_version_tasks_autopublish.php
index 043f29b..1fd5d7a 100644 (file)
--- a/typo3/sysext/version/tasks/class.tx_version_tasks_autopublish.php
+++ b/typo3/sysext/version/tasks/class.tx_version_tasks_autopublish.php
@@ -4,5 +4,5 @@
  * and will be removed by 7.0. The class was renamed and is now located at:
  * typo3/sysext/version/Classes/Task/AutoPublishTask.php
  */
-require_once \TYPO3\CMS\Core\Extension\ExtensionManager::extPath('version') . 'Classes/Task/AutoPublishTask.php';
+require_once \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('version') . 'Classes/Task/AutoPublishTask.php';
 ?>
\ No newline at end of file

diff --git a/typo3/sysext/version/ws/class.wslib.php b/typo3/sysext/version/ws/class.wslib.php
index 118cfd0..dce5b0f 100755 (executable)
--- a/typo3/sysext/version/ws/class.wslib.php
+++ b/typo3/sysext/version/ws/class.wslib.php
@@ -4,5 +4,5 @@
  * and will be removed by 7.0. The class was renamed and is now located at:
  * typo3/sysext/version/Classes/Utility/WorkspacesUtility.php
  */
-require_once \TYPO3\CMS\Core\Extension\ExtensionManager::extPath('version') . 'Classes/Utility/WorkspacesUtility.php';
+require_once \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('version') . 'Classes/Utility/WorkspacesUtility.php';
 ?>
\ No newline at end of file

diff --git a/typo3/sysext/version/ws/index.php b/typo3/sysext/version/ws/index.php
index 3112e9d..c75a725 100755 (executable)
--- a/typo3/sysext/version/ws/index.php
+++ b/typo3/sysext/version/ws/index.php
@@ -40,7 +40,7 @@ require_once 'class.wslib_gui.php';
  * and will be removed by 7.0. The class was renamed and is now located at:
  * typo3/sysext/version/Classes/Controller/WorkspaceModuleController.php
  */
-require_once \TYPO3\CMS\Core\Extension\ExtensionManager::extPath('version') . 'Classes/Controller/WorkspaceModuleController.php';
+require_once \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('version') . 'Classes/Controller/WorkspaceModuleController.php';
 // Make instance:
 $SOBE = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Version\\Controller\\WorkspaceModuleController');
 $SOBE->execute();