[TASK] Remove tx_cms_webinfo and tx_cms_webinfo_lang 09/32409/3
authorWouter Wolters <typo3@wouterwolters.nl>
Tue, 26 Aug 2014 21:05:45 +0000 (23:05 +0200)
committerMarkus Klein <klein.t3@reelworx.at>
Tue, 2 Sep 2014 21:42:38 +0000 (23:42 +0200)
Remove tx_cms_webinfo and tx_cms_webinfo_lang and use
their namespaced variant for registration into web_info module.

Resolves: #61218
Releases: 6.3
Change-Id: I66c25241197d0b3898aee3e126f0b5b212e38a45
Reviewed-on: http://review.typo3.org/32409
Tested-by: Alexander Opitz <opitz.alexander@googlemail.com>
Reviewed-by: Alexander Opitz <opitz.alexander@googlemail.com>
Reviewed-by: Markus Klein <klein.t3@reelworx.at>
Tested-by: Markus Klein <klein.t3@reelworx.at>
typo3/sysext/backend/Classes/Module/AbstractFunctionModule.php
typo3/sysext/cms/ext_tables.php
typo3/sysext/cms/web_info/class.tx_cms_webinfo.php [deleted file]
typo3/sysext/cms/web_info/class.tx_cms_webinfo_lang.php [deleted file]

index 44e6fe3..8acc281 100644 (file)
@@ -46,8 +46,8 @@ use TYPO3\CMS\Core\Utility\GeneralUtility;
  *
  * \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::insertModuleFunction(
  * 'web_info',
- * 'tx_cms_webinfo_page',
- * \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath($_EXTKEY).'web_info/class.tx_cms_webinfo.php',
+ * 'TYPO3\\CMS\\Frontend\\Controller\\PageInformationController',
+ * NULL,
  * 'LLL:EXT:cms/locallang_tca.xlf:mod_tx_cms_webinfo_page'
  * );
  *
@@ -62,7 +62,7 @@ use TYPO3\CMS\Core\Utility\GeneralUtility;
  * \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::insertModuleFunction(
  * 'web_func',
  * 'TYPO3\\CMS\\WizardCrpages\\Controller\\CreatePagesWizardModuleFunctionController',
- * \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath($_EXTKEY) . 'Classes/Controller/CreatePagesWizardModuleFunctionController.php',
+ * NULL,
  * 'LLL:EXT:wizard_crpages/locallang.xlf:wiz_crMany',
  * 'wiz'
  * );
@@ -261,10 +261,11 @@ abstract class AbstractFunctionModule {
 
        /**
         * Dummy function - but is used to set up additional menu items for this submodule.
-        * For an example see the extension 'cms' where the 'web_info' submodule is defined in cms/web_info/class.tx_cms_webinfo.php, tx_cms_webinfo_page::modMenu()
+        * For an example see the extension 'cms' where the 'web_info' submodule is defined
+        * in cms/web_info/class.tx_cms_webinfo.php, \TYPO3\CMS\\Frontend\Controller\PageInformationController::modMenu()
         *
         * @return array A MOD_MENU array which will be merged together with the one from the parent object
-        * @see init(), tx_cms_webinfo_page::modMenu()
+        * @see init(), \TYPO3\CMS\Frontend\Controller\PageInformationController::modMenu()
         * @todo Define visibility
         */
        public function modMenu() {
index 61a972d..1a126e3 100644 (file)
@@ -5,8 +5,18 @@ if (TYPO3_MODE === 'BE') {
        \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addModule('web', 'layout', 'top', \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath($_EXTKEY) . 'layout/');
        \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addLLrefForTCAdescr('_MOD_web_layout', 'EXT:cms/locallang_csh_weblayout.xlf');
        \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addLLrefForTCAdescr('_MOD_web_info', 'EXT:cms/locallang_csh_webinfo.xlf');
-       \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::insertModuleFunction('web_info', 'tx_cms_webinfo_page', NULL, 'LLL:EXT:cms/locallang_tca.xlf:mod_tx_cms_webinfo_page');
-       \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::insertModuleFunction('web_info', 'tx_cms_webinfo_lang', NULL, 'LLL:EXT:cms/locallang_tca.xlf:mod_tx_cms_webinfo_lang');
+       \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::insertModuleFunction(
+               'web_info',
+               'TYPO3\\CMS\\Frontend\\Controller\\PageInformationController',
+               NULL,
+               'LLL:EXT:cms/locallang_tca.xlf:mod_tx_cms_webinfo_page'
+       );
+       \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::insertModuleFunction(
+               'web_info',
+               'TYPO3\\CMS\\Frontend\\Controller\\TranslationStatusController',
+               NULL,
+               'LLL:EXT:cms/locallang_tca.xlf:mod_tx_cms_webinfo_lang'
+       );
 }
 // Add allowed records to pages:
 \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::allowTableOnStandardPages('pages_language_overlay,tt_content,sys_template,sys_domain,backend_layout');
diff --git a/typo3/sysext/cms/web_info/class.tx_cms_webinfo.php b/typo3/sysext/cms/web_info/class.tx_cms_webinfo.php
deleted file mode 100644 (file)
index 7932204..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * This file is part of the TYPO3 CMS project.
- *
- * It is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License, either version 2
- * of the License, or any later version.
- *
- * For the full copyright and license information, please read the
- * LICENSE.txt file that was distributed with this source code.
- *
- * The TYPO3 project - inspiring people to share!
- */
-/**
- * Contains a class with functions for page related statistics added to the backend Info module
- *
- * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- */
-require_once \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('cms') . 'layout/class.tx_cms_layout.php';
-/*
- * @deprecated since 6.0, the classname tx_cms_webinfo_page and this file is obsolete
- * and will be removed with 6.2. The class was renamed and is now located at:
- * typo3/sysext/frontend/Classes/Controller/PageInformationController.php
- */
-require_once \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('frontend') . 'Classes/Controller/PageInformationController.php';
diff --git a/typo3/sysext/cms/web_info/class.tx_cms_webinfo_lang.php b/typo3/sysext/cms/web_info/class.tx_cms_webinfo_lang.php
deleted file mode 100644 (file)
index ddfa816..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-/*
- * @deprecated since 6.0, the classname tx_cms_webinfo_lang and this file is obsolete
- * and will be removed with 6.2. The class was renamed and is now located at:
- * typo3/sysext/frontend/Classes/Controller/TranslationStatusController.php
- */
-require_once \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('frontend') . 'Classes/Controller/TranslationStatusController.php';