[TASK] Rename ExtensionManager class
authorHelmut Hummel <helmut.hummel@typo3.org>
Sat, 3 Nov 2012 18:46:14 +0000 (19:46 +0100)
committerHelmut Hummel <helmut.hummel@typo3.org>
Sat, 3 Nov 2012 18:50:44 +0000 (19:50 +0100)
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: I6d7082e3f4fce767afb8cabe027d54cf786c24b2
Reviewed-on: http://review.typo3.org/16171
Reviewed-by: Helmut Hummel
Tested-by: Helmut Hummel
32 files changed:
typo3/sysext/extbase/Classes/Command/HelpCommandController.php
typo3/sysext/extbase/Classes/Configuration/Exception/ContainerIsLocked.php
typo3/sysext/extbase/Classes/Configuration/Exception/InvalidConfigurationType.php
typo3/sysext/extbase/Classes/Configuration/Exception/NoSuchFile.php
typo3/sysext/extbase/Classes/Configuration/Exception/NoSuchOption.php
typo3/sysext/extbase/Classes/Configuration/Exception/ParseError.php
typo3/sysext/extbase/Classes/Mvc/View/NotFoundView.php
typo3/sysext/extbase/Classes/Persistence/Exception/CleanStateNotMemorized.php
typo3/sysext/extbase/Classes/Persistence/Exception/IllegalObjectType.php
typo3/sysext/extbase/Classes/Persistence/Exception/InconsistentQuerySettings.php
typo3/sysext/extbase/Classes/Persistence/Exception/InvalidClass.php
typo3/sysext/extbase/Classes/Persistence/Exception/InvalidNumberOfConstraints.php
typo3/sysext/extbase/Classes/Persistence/Exception/InvalidPropertyType.php
typo3/sysext/extbase/Classes/Persistence/Exception/MissingBackend.php
typo3/sysext/extbase/Classes/Persistence/Exception/TooDirty.php
typo3/sysext/extbase/Classes/Persistence/Exception/UnknownObject.php
typo3/sysext/extbase/Classes/Persistence/Exception/UnsupportedMethod.php
typo3/sysext/extbase/Classes/Persistence/Exception/UnsupportedOrder.php
typo3/sysext/extbase/Classes/Persistence/Exception/UnsupportedRelation.php
typo3/sysext/extbase/Classes/Property/Exception/InvalidSource.php
typo3/sysext/extbase/Classes/Property/Exception/InvalidTarget.php
typo3/sysext/extbase/Classes/Utility/ClassLoaderUtility.php
typo3/sysext/extbase/Classes/Utility/ExtbaseRequirementsCheckUtility.php
typo3/sysext/extbase/Classes/Utility/ExtensionUtility.php
typo3/sysext/extbase/Classes/Utility/TypeHandlingUtility.php
typo3/sysext/extbase/Classes/Utility/TypoScriptUtility.php
typo3/sysext/extbase/Scripts/CommandLineLauncher.php
typo3/sysext/extbase/Tests/Functional/Domain/Model/FileContextTest.php
typo3/sysext/extbase/Tests/Unit/Object/Container/ClassInfoFactoryTest.php
typo3/sysext/extbase/Tests/Unit/Object/Container/ContainerTest.php
typo3/sysext/extbase/ext_localconf.php
typo3/sysext/extbase/ext_tables.php

index 4f4cb65..fa7a8e8 100644 (file)
@@ -57,7 +57,7 @@ class HelpCommandController extends \TYPO3\CMS\Extbase\Mvc\Controller\CommandCon
         * @internal
         */
        public function helpStubCommand() {
-               $this->outputLine('Extbase %s', array(\TYPO3\CMS\Core\Extension\ExtensionManager::getExtensionVersion('extbase')));
+               $this->outputLine('Extbase %s', array(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::getExtensionVersion('extbase')));
                $this->outputLine('usage: ./cli_dispatch.phpsh extbase <command identifier>');
                $this->outputLine();
                $this->outputLine('See \'./cli_dispatch.phpsh extbase help\' for a list of all available commands.');
@@ -92,7 +92,7 @@ class HelpCommandController extends \TYPO3\CMS\Extbase\Mvc\Controller\CommandCon
         */
        protected function displayHelpIndex() {
                $this->buildCommandsIndex();
-               $this->outputLine('Extbase %s', array(\TYPO3\CMS\Core\Extension\ExtensionManager::getExtensionVersion('extbase')));
+               $this->outputLine('Extbase %s', array(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::getExtensionVersion('extbase')));
                $this->outputLine('usage: ./cli_dispatch.phpsh extbase <command identifier>');
                $this->outputLine();
                $this->outputLine('The following commands are currently available:');
index d147fee..9153ad6 100644 (file)
@@ -4,5 +4,5 @@
  * and will be removed by 7.0. The class was renamed and is now located at:
  * typo3/sysext/extbase/Classes/Configuration/Exception/ContainerIsLockedException.php
  */
-require_once \TYPO3\CMS\Core\Extension\ExtensionManager::extPath('extbase') . 'Classes/Configuration/Exception/ContainerIsLockedException.php';
+require_once \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('extbase') . 'Classes/Configuration/Exception/ContainerIsLockedException.php';
 ?>
\ No newline at end of file
index decf64c..21b2b38 100644 (file)
@@ -4,5 +4,5 @@
  * and will be removed by 7.0. The class was renamed and is now located at:
  * typo3/sysext/extbase/Classes/Configuration/Exception/InvalidConfigurationTypeException.php
  */
-require_once \TYPO3\CMS\Core\Extension\ExtensionManager::extPath('extbase') . 'Classes/Configuration/Exception/InvalidConfigurationTypeException.php';
+require_once \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('extbase') . 'Classes/Configuration/Exception/InvalidConfigurationTypeException.php';
 ?>
\ No newline at end of file
index fd23feb..09901c8 100644 (file)
@@ -4,5 +4,5 @@
  * and will be removed by 7.0. The class was renamed and is now located at:
  * typo3/sysext/extbase/Classes/Configuration/Exception/NoSuchFileException.php
  */
-require_once \TYPO3\CMS\Core\Extension\ExtensionManager::extPath('extbase') . 'Classes/Configuration/Exception/NoSuchFileException.php';
+require_once \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('extbase') . 'Classes/Configuration/Exception/NoSuchFileException.php';
 ?>
\ No newline at end of file
index 6d6393d..ce8374c 100644 (file)
@@ -4,5 +4,5 @@
  * and will be removed by 7.0. The class was renamed and is now located at:
  * typo3/sysext/extbase/Classes/Configuration/Exception/NoSuchOptionException.php
  */
-require_once \TYPO3\CMS\Core\Extension\ExtensionManager::extPath('extbase') . 'Classes/Configuration/Exception/NoSuchOptionException.php';
+require_once \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('extbase') . 'Classes/Configuration/Exception/NoSuchOptionException.php';
 ?>
\ No newline at end of file
index a38f0d9..4c7b43e 100644 (file)
@@ -4,5 +4,5 @@
  * and will be removed by 7.0. The class was renamed and is now located at:
  * typo3/sysext/extbase/Classes/Configuration/Exception/ParseErrorException.php
  */
-require_once \TYPO3\CMS\Core\Extension\ExtensionManager::extPath('extbase') . 'Classes/Configuration/Exception/ParseErrorException.php';
+require_once \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('extbase') . 'Classes/Configuration/Exception/ParseErrorException.php';
 ?>
\ No newline at end of file
index 7a010dc..f81f6de 100644 (file)
@@ -67,7 +67,7 @@ class NotFoundView extends \TYPO3\CMS\Extbase\Mvc\View\AbstractView {
         * @author Bastian Waidelich <bastian@typo3.org>
         */
        protected function getTemplatePathAndFilename() {
-               return \TYPO3\CMS\Core\Extension\ExtensionManager::extPath('extbase') . 'Resources/Private/MVC/NotFoundView_Template.html';
+               return \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('extbase') . 'Resources/Private/MVC/NotFoundView_Template.html';
        }
 
        /**
index a1d9096..1d3568b 100644 (file)
@@ -4,5 +4,5 @@
  * and will be removed by 7.0. The class was renamed and is now located at:
  * typo3/sysext/extbase/Classes/Persistence/Generic/Exception/CleanStateNotMemorizedException.php
  */
-require_once \TYPO3\CMS\Core\Extension\ExtensionManager::extPath('extbase') . 'Classes/Persistence/Generic/Exception/CleanStateNotMemorizedException.php';
+require_once \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('extbase') . 'Classes/Persistence/Generic/Exception/CleanStateNotMemorizedException.php';
 ?>
\ No newline at end of file
index b7edd8c..389c6e6 100644 (file)
@@ -4,5 +4,5 @@
  * and will be removed by 7.0. The class was renamed and is now located at:
  * typo3/sysext/extbase/Classes/Persistence/Exception/IllegalObjectTypeException.php
  */
-require_once \TYPO3\CMS\Core\Extension\ExtensionManager::extPath('extbase') . 'Classes/Persistence/Exception/IllegalObjectTypeException.php';
+require_once \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('extbase') . 'Classes/Persistence/Exception/IllegalObjectTypeException.php';
 ?>
\ No newline at end of file
index 539602e..a21a9e5 100644 (file)
@@ -4,5 +4,5 @@
  * and will be removed by 7.0. The class was renamed and is now located at:
  * typo3/sysext/extbase/Classes/Persistence/Generic/Exception/InconsistentQuerySettingsException.php
  */
-require_once \TYPO3\CMS\Core\Extension\ExtensionManager::extPath('extbase') . 'Classes/Persistence/Generic/Exception/InconsistentQuerySettingsException.php';
+require_once \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('extbase') . 'Classes/Persistence/Generic/Exception/InconsistentQuerySettingsException.php';
 ?>
\ No newline at end of file
index 8957a18..c1f36fa 100644 (file)
@@ -4,5 +4,5 @@
  * and will be removed by 7.0. The class was renamed and is now located at:
  * typo3/sysext/extbase/Classes/Persistence/Generic/Exception/InvalidClassException.php
  */
-require_once \TYPO3\CMS\Core\Extension\ExtensionManager::extPath('extbase') . 'Classes/Persistence/Generic/Exception/InvalidClassException.php';
+require_once \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('extbase') . 'Classes/Persistence/Generic/Exception/InvalidClassException.php';
 ?>
\ No newline at end of file
index d977e9e..99479ca 100644 (file)
@@ -4,5 +4,5 @@
  * and will be removed by 7.0. The class was renamed and is now located at:
  * typo3/sysext/extbase/Classes/Persistence/Generic/Exception/InvalidNumberOfConstraintsException.php
  */
-require_once \TYPO3\CMS\Core\Extension\ExtensionManager::extPath('extbase') . 'Classes/Persistence/Generic/Exception/InvalidNumberOfConstraintsException.php';
+require_once \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('extbase') . 'Classes/Persistence/Generic/Exception/InvalidNumberOfConstraintsException.php';
 ?>
\ No newline at end of file
index f874d3b..05f7989 100644 (file)
@@ -4,5 +4,5 @@
  * and will be removed by 7.0. The class was renamed and is now located at:
  * typo3/sysext/extbase/Classes/Persistence/Generic/Exception/InvalidPropertyTypeException.php
  */
-require_once \TYPO3\CMS\Core\Extension\ExtensionManager::extPath('extbase') . 'Classes/Persistence/Generic/Exception/InvalidPropertyTypeException.php';
+require_once \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('extbase') . 'Classes/Persistence/Generic/Exception/InvalidPropertyTypeException.php';
 ?>
\ No newline at end of file
index 511c2ed..0a18c9e 100644 (file)
@@ -4,5 +4,5 @@
  * and will be removed by 7.0. The class was renamed and is now located at:
  * typo3/sysext/extbase/Classes/Persistence/Generic/Exception/MissingBackendException.php
  */
-require_once \TYPO3\CMS\Core\Extension\ExtensionManager::extPath('extbase') . 'Classes/Persistence/Generic/Exception/MissingBackendException.php';
+require_once \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('extbase') . 'Classes/Persistence/Generic/Exception/MissingBackendException.php';
 ?>
\ No newline at end of file
index c52464c..99efcd7 100644 (file)
@@ -4,5 +4,5 @@
  * and will be removed by 7.0. The class was renamed and is now located at:
  * typo3/sysext/extbase/Classes/Persistence/Generic/Exception/TooDirtyException.php
  */
-require_once \TYPO3\CMS\Core\Extension\ExtensionManager::extPath('extbase') . 'Classes/Persistence/Generic/Exception/TooDirtyException.php';
+require_once \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('extbase') . 'Classes/Persistence/Generic/Exception/TooDirtyException.php';
 ?>
\ No newline at end of file
index 6711db6..30a0ab8 100644 (file)
@@ -4,5 +4,5 @@
  * and will be removed by 7.0. The class was renamed and is now located at:
  * typo3/sysext/extbase/Classes/Persistence/Exception/UnknownObjectException.php
  */
-require_once \TYPO3\CMS\Core\Extension\ExtensionManager::extPath('extbase') . 'Classes/Persistence/Exception/UnknownObjectException.php';
+require_once \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('extbase') . 'Classes/Persistence/Exception/UnknownObjectException.php';
 ?>
\ No newline at end of file
index 4a45e52..ec820cc 100644 (file)
@@ -4,5 +4,5 @@
  * and will be removed by 7.0. The class was renamed and is now located at:
  * typo3/sysext/extbase/Classes/Persistence/Generic/Exception/UnsupportedMethodException.php
  */
-require_once \TYPO3\CMS\Core\Extension\ExtensionManager::extPath('extbase') . 'Classes/Persistence/Generic/Exception/UnsupportedMethodException.php';
+require_once \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('extbase') . 'Classes/Persistence/Generic/Exception/UnsupportedMethodException.php';
 ?>
\ No newline at end of file
index dc69f1b..9cb1235 100644 (file)
@@ -4,5 +4,5 @@
  * and will be removed by 7.0. The class was renamed and is now located at:
  * typo3/sysext/extbase/Classes/Persistence/Generic/Exception/UnsupportedOrderException.php
  */
-require_once \TYPO3\CMS\Core\Extension\ExtensionManager::extPath('extbase') . 'Classes/Persistence/Generic/Exception/UnsupportedOrderException.php';
+require_once \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('extbase') . 'Classes/Persistence/Generic/Exception/UnsupportedOrderException.php';
 ?>
\ No newline at end of file
index e7e4f44..7be806b 100644 (file)
@@ -4,5 +4,5 @@
  * and will be removed by 7.0. The class was renamed and is now located at:
  * typo3/sysext/extbase/Classes/Persistence/Generic/Exception/UnsupportedRelationException.php
  */
-require_once \TYPO3\CMS\Core\Extension\ExtensionManager::extPath('extbase') . 'Classes/Persistence/Generic/Exception/UnsupportedRelationException.php';
+require_once \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('extbase') . 'Classes/Persistence/Generic/Exception/UnsupportedRelationException.php';
 ?>
\ No newline at end of file
index 4d1de96..2f3c144 100644 (file)
@@ -4,5 +4,5 @@
  * and will be removed by 7.0. The class was renamed and is now located at:
  * typo3/sysext/extbase/Classes/Property/Exception/InvalidSourceException.php
  */
-require_once \TYPO3\CMS\Core\Extension\ExtensionManager::extPath('extbase') . 'Classes/Property/Exception/InvalidSourceException.php';
+require_once \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('extbase') . 'Classes/Property/Exception/InvalidSourceException.php';
 ?>
\ No newline at end of file
index 4b5114b..c1705cc 100644 (file)
@@ -4,5 +4,5 @@
  * and will be removed by 7.0. The class was renamed and is now located at:
  * typo3/sysext/extbase/Classes/Property/Exception/InvalidTargetException.php
  */
-require_once \TYPO3\CMS\Core\Extension\ExtensionManager::extPath('extbase') . 'Classes/Property/Exception/InvalidTargetException.php';
+require_once \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('extbase') . 'Classes/Property/Exception/InvalidTargetException.php';
 ?>
\ No newline at end of file
index 8d11d9e..e33b1b4 100644 (file)
@@ -44,8 +44,8 @@ class ClassLoaderUtility {
                \TYPO3\CMS\Core\Utility\GeneralUtility::logDeprecatedFunction();
                $classNameParts = explode('_', $className, 3);
                $extensionKey = \TYPO3\CMS\Core\Utility\GeneralUtility::camelCaseToLowerCaseUnderscored($classNameParts[1]);
-               if (\TYPO3\CMS\Core\Extension\ExtensionManager::isLoaded($extensionKey)) {
-                       $classFilePathAndName = \TYPO3\CMS\Core\Extension\ExtensionManager::extPath($extensionKey) . 'Classes/' . strtr($classNameParts[2], '_', '/') . '.php';
+               if (\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::isLoaded($extensionKey)) {
+                       $classFilePathAndName = \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath($extensionKey) . 'Classes/' . strtr($classNameParts[2], '_', '/') . '.php';
                        if (file_exists($classFilePathAndName)) {
                                require_once $classFilePathAndName;
                        }
index 6a3f529..29704d6 100644 (file)
@@ -71,7 +71,7 @@ class ExtbaseRequirementsCheckUtility implements \TYPO3\CMS\Reports\StatusProvid
         * @return \TYPO3\CMS\Reports\Status
         */
        protected function checkIfDbalExtensionIsInstalled() {
-               if (\TYPO3\CMS\Core\Extension\ExtensionManager::isLoaded('dbal')) {
+               if (\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::isLoaded('dbal')) {
                        $value = 'DBAL is loaded';
                        $message = 'The Database Abstraction Layer Extension (dbal) is loaded. Extbase does not fully support dbal at the moment. If you are aware of this fact or don\'t make use of the incompatible parts on this installation, you can ignore this notice.';
                        $status = \TYPO3\CMS\Reports\Status::INFO;
index 1476247..265678b 100644 (file)
@@ -41,7 +41,7 @@ class ExtensionUtility {
         */
        static protected function getExtensionService() {
                if (self::$extensionService === NULL) {
-                       require_once \TYPO3\CMS\Core\Extension\ExtensionManager::extPath('extbase', 'Classes/Service/ExtensionService.php');
+                       require_once \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('extbase', 'Classes/Service/ExtensionService.php');
                        $objectManager = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Extbase\\Object\\ObjectManager');
                        self::$extensionService = $objectManager->get('TYPO3\\CMS\\Extbase\\Service\\ExtensionService');
                }
@@ -108,7 +108,7 @@ class ExtensionUtility {
                defaultPid =
        }
 }';
-               \TYPO3\CMS\Core\Extension\ExtensionManager::addTypoScript($extensionName, 'setup', '
+               \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addTypoScript($extensionName, 'setup', '
 # Setting ' . $extensionName . ' plugin TypoScript
 ' . $pluginTemplate);
                switch ($pluginType) {
@@ -138,7 +138,7 @@ tt_content.' . $pluginSignature . ' {
                        throw new \InvalidArgumentException('The pluginType "' . $pluginType . '" is not suported', 1289858856);
                }
                $GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['extbase']['extensions'][$extensionName]['plugins'][$pluginName]['pluginType'] = $pluginType;
-               \TYPO3\CMS\Core\Extension\ExtensionManager::addTypoScript($extensionName, 'setup', '
+               \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addTypoScript($extensionName, 'setup', '
 # Setting ' . $extensionName . ' plugin TypoScript
 ' . $pluginContent, 43);
        }
@@ -163,7 +163,7 @@ tt_content.' . $pluginSignature . ' {
                }
                $extensionName = str_replace(' ', '', ucwords(str_replace('_', ' ', $extensionName)));
                $pluginSignature = strtolower($extensionName) . '_' . strtolower($pluginName);
-               \TYPO3\CMS\Core\Extension\ExtensionManager::addPlugin(array($pluginTitle, $pluginSignature, $pluginIconPathAndFilename), $GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['extbase']['extensions'][$extensionName]['plugins'][$pluginName]['pluginType']);
+               \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPlugin(array($pluginTitle, $pluginSignature, $pluginIconPathAndFilename), $GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['extbase']['extensions'][$extensionName]['plugins'][$pluginName]['pluginType']);
        }
 
        /**
@@ -178,7 +178,7 @@ tt_content.' . $pluginSignature . ' {
                $iconPathAndFilename = $moduleConfiguration['icon'];
                if (substr($iconPathAndFilename, 0, 4) === 'EXT:') {
                        list($extensionKey, $relativePath) = explode('/', substr($iconPathAndFilename, 4), 2);
-                       $iconPathAndFilename = \TYPO3\CMS\Core\Extension\ExtensionManager::extPath($extensionKey) . $relativePath;
+                       $iconPathAndFilename = \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath($extensionKey) . $relativePath;
                }
                // TODO: skin support
                $moduleLabels = array(
@@ -226,7 +226,7 @@ tt_content.' . $pluginSignature . ' {
                        'access' => 'admin',
                        'icon' => 'EXT:extbase/ext_icon.gif',
                        'labels' => '',
-                       'extRelPath' => \TYPO3\CMS\Core\Extension\ExtensionManager::extRelPath($extensionKey) . 'Classes/'
+                       'extRelPath' => \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extRelPath($extensionKey) . 'Classes/'
                );
                if (strlen($mainModuleName) > 0 && !array_key_exists($mainModuleName, $GLOBALS['TBE_MODULES'])) {
                        $mainModuleName = $extensionName . \TYPO3\CMS\Core\Utility\GeneralUtility::underscoredToUpperCamelCase($mainModuleName);
@@ -259,7 +259,7 @@ tt_content.' . $pluginSignature . ' {
                                'actions' => \TYPO3\CMS\Core\Utility\GeneralUtility::trimExplode(',', $actions)
                        );
                }
-               \TYPO3\CMS\Core\Extension\ExtensionManager::addModule($mainModuleName, $subModuleName, $position);
+               \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addModule($mainModuleName, $subModuleName, $position);
        }
 
        /**
@@ -293,7 +293,7 @@ tt_content.' . $pluginSignature . ' {
                if ($errors) {
                        return $errors;
                }
-               $globalPrefix = '$extensionClassesPath = TYPO3\\CMS\\Core\\Extension\\ExtensionManager::extPath(\'' . $extensionKey . '\') . \'Classes/\';';
+               $globalPrefix = '$extensionClassesPath = TYPO3\\CMS\\Core\\Utility\\ExtensionManagementUtility::extPath(\'' . $extensionKey . '\') . \'Classes/\';';
                $errors = array();
                foreach ($classNameToFileMapping as $className => $fileName) {
                        if (!(strpos($className, 'tx_' . strtolower($extensionName)) === 0)) {
index 971baf0..4a8f1f0 100644 (file)
@@ -41,7 +41,7 @@ class TypeHandlingUtility {
         */
        static protected function getTypeHandlingService() {
                if (self::$typeHandlingService === NULL) {
-                       require_once \TYPO3\CMS\Core\Extension\ExtensionManager::extPath('extbase', 'Classes/Service/TypeHandlingService.php');
+                       require_once \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('extbase', 'Classes/Service/TypeHandlingService.php');
                        $objectManager = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Extbase\\Object\\ObjectManager');
                        self::$typeHandlingService = $objectManager->get('TYPO3\\CMS\\Extbase\\Service\\TypeHandlingService');
                }
index b6934cc..8b2beee 100644 (file)
@@ -40,7 +40,7 @@ class TypoScriptUtility {
         */
        static protected function getTypoScriptService() {
                if (self::$typoScriptService === NULL) {
-                       require_once \TYPO3\CMS\Core\Extension\ExtensionManager::extPath('extbase', 'Classes/Service/TypoScriptService.php');
+                       require_once \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('extbase', 'Classes/Service/TypoScriptService.php');
                        $objectManager = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Extbase\\Object\\ObjectManager');
                        self::$typoScriptService = $objectManager->get('TYPO3\\CMS\\Extbase\\Service\\TypoScriptService');
                }
index 8b59077..9efa37a 100644 (file)
@@ -27,7 +27,7 @@
  *
  * ONLY USED INTERNALLY, MIGHT CHANGE WITHOUT NOTICE!
  */
-require_once \TYPO3\CMS\Core\Extension\ExtensionManager::extPath('extbase', 'Classes/Core/Bootstrap.php');
+require_once \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('extbase', 'Classes/Core/Bootstrap.php');
 $bootstrap = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Extbase\\Core\\Bootstrap');
 echo $bootstrap->run('', array());
 ?>
\ No newline at end of file
index e2016b7..0e01c40 100644 (file)
@@ -23,7 +23,7 @@ namespace TYPO3\CMS\Extbase\Tests\Functional\Domain\Model;
  *
  * This copyright notice MUST APPEAR in all copies of the script!
  ***************************************************************/
-require_once \TYPO3\CMS\Core\Extension\ExtensionManager::extPath('extbase') . 'Tests/Functional/Domain/Model/Fixture/FileContext.php';
+require_once \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('extbase') . 'Tests/Functional/Domain/Model/Fixture/FileContext.php';
 
 /**
  * Test case to check functionality type converters on FAL domain objects.
index 1475436..46eb339 100644 (file)
@@ -23,7 +23,7 @@ namespace TYPO3\CMS\Extbase\Tests\Unit\Object\Container;
  *
  *  This copyright notice MUST APPEAR in all copies of the script!
  ***************************************************************/
-require_once \TYPO3\CMS\Core\Extension\ExtensionManager::extPath('extbase') . 'Tests/Unit/Object/Container/Fixtures/Testclasses.php';
+require_once \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('extbase') . 'Tests/Unit/Object/Container/Fixtures/Testclasses.php';
 
 /**
  * Testcase for class t3lib_object_ClassInfoFactory.
index 8d40312..ffe7bda 100644 (file)
@@ -23,8 +23,8 @@ namespace TYPO3\CMS\Extbase\Tests\Unit\Object\Container;
  *
  *  This copyright notice MUST APPEAR in all copies of the script!
  ***************************************************************/
-require_once \TYPO3\CMS\Core\Extension\ExtensionManager::extPath('extbase') . 'Tests/Unit/Object/Container/Fixtures/Testclasses.php';
-require_once \TYPO3\CMS\Core\Extension\ExtensionManager::extPath('extbase') . 'Tests/Unit/Object/Container/Fixtures/NamespaceTestclasses.php';
+require_once \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('extbase') . 'Tests/Unit/Object/Container/Fixtures/Testclasses.php';
+require_once \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('extbase') . 'Tests/Unit/Object/Container/Fixtures/NamespaceTestclasses.php';
 
 /**
  * Testcase for class t3lib_object_Container.
index 38f1ae6..e14db9e 100644 (file)
@@ -2,8 +2,8 @@
 if (!defined('TYPO3_MODE')) {
        die('Access denied.');
 }
-require_once \TYPO3\CMS\Core\Extension\ExtensionManager::extPath('extbase') . 'Classes/Mvc/Dispatcher.php';
-require_once \TYPO3\CMS\Core\Extension\ExtensionManager::extPath('extbase') . 'Classes/Utility/ExtensionUtility.php';
+require_once \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('extbase') . 'Classes/Mvc/Dispatcher.php';
+require_once \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('extbase') . 'Classes/Utility/ExtensionUtility.php';
 // Register caches if not already done in localconf.php or a previously loaded extension.
 // We do not set frontend and backend: The cache manager uses t3lib_Cache\Frontend\VariableFrontend
 // and t3lib_cache_backend_DbBackend by default if not set otherwise.
index e8f737b..b7c1efb 100644 (file)
@@ -25,8 +25,8 @@ if (!isset($TCA['fe_users']['ctrl']['type'])) {
                        )
                )
        );
-       \TYPO3\CMS\Core\Extension\ExtensionManager::addTCAcolumns('fe_users', $tempColumns, 1);
-       \TYPO3\CMS\Core\Extension\ExtensionManager::addToAllTCAtypes('fe_users', 'tx_extbase_type');
+       \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addTCAcolumns('fe_users', $tempColumns, 1);
+       \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addToAllTCAtypes('fe_users', 'tx_extbase_type');
        $TCA['fe_users']['ctrl']['type'] = 'tx_extbase_type';
 }
 $TCA['fe_users']['types']['Tx_Extbase_Domain_Model_FrontendUser'] = $TCA['fe_users']['types']['0'];
@@ -48,8 +48,8 @@ if (!isset($TCA['fe_groups']['ctrl']['type'])) {
                        )
                )
        );
-       \TYPO3\CMS\Core\Extension\ExtensionManager::addTCAcolumns('fe_groups', $tempColumns, 1);
-       \TYPO3\CMS\Core\Extension\ExtensionManager::addToAllTCAtypes('fe_groups', 'tx_extbase_type');
+       \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addTCAcolumns('fe_groups', $tempColumns, 1);
+       \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addToAllTCAtypes('fe_groups', 'tx_extbase_type');
        $TCA['fe_groups']['ctrl']['type'] = 'tx_extbase_type';
 }
 $TCA['fe_groups']['types']['Tx_Extbase_Domain_Model_FrontendUserGroup'] = $TCA['fe_groups']['types']['0'];