[TASK] Cleanup Bootstrap Classes
authorHelmut Hummel <helmut.hummel@typo3.org>
Wed, 12 Sep 2012 20:10:29 +0000 (22:10 +0200)
committerHelmut Hummel <helmut.hummel@typo3.org>
Wed, 12 Sep 2012 20:50:48 +0000 (22:50 +0200)
The namespace switch removed some linefeeds that
were there to improve readability of the bootstrap.

Add these again and also remove the compatibility
files as these files are new to 6.0 anyway.

Resolves: #40877
Releases: 6.0

Change-Id: I1ed4e7d8710f4feb97a0331b5526336075aa7932
Reviewed-on: http://review.typo3.org/14561
Reviewed-by: Wouter Wolters
Tested-by: Wouter Wolters
Reviewed-by: Helmut Hummel
Tested-by: Helmut Hummel
index.php
typo3/classes/Bootstrap.php [deleted file]
typo3/classes/Bootstrap/BaseSetup.php [deleted file]
typo3/classes/Bootstrap/Cli.php [deleted file]
typo3/classes/Bootstrap/Install.php [deleted file]
typo3/cli_dispatch.phpsh
typo3/init.php
typo3/install/index.php
typo3/sysext/cms/tslib/index_ts.php
typo3/sysext/core/Classes/Core/Bootstrap.php
typo3/sysext/core/Migrations/Code/ClassAliasMap201208221700.php

index 9bd449f..fdf42ab 100644 (file)
--- a/index.php
+++ b/index.php
@@ -36,7 +36,7 @@
 
        // We use require instead of require_once here so we get a fatal error if classes/Bootstrap.php is accidentally included twice
        // (which would indicate a clear bug).
-require('typo3/classes/Bootstrap.php');
+require 'typo3/sysext/core/Classes/Core/Bootstrap.php';
 \TYPO3\CMS\Core\Core\Bootstrap::getInstance()->baseSetup('');
 
 require(PATH_tslib . 'index_ts.php');
diff --git a/typo3/classes/Bootstrap.php b/typo3/classes/Bootstrap.php
deleted file mode 100644 (file)
index 696349f..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-/***************************************************************
- *  Copyright notice
- *
- *  (c) 2012 Christian Kuhn <lolli@schwarzbu.ch>
- *  All rights reserved
- *
- *  This script is part of the TYPO3 project. The TYPO3 project is
- *  free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  The GNU General Public License can be found at
- *  http://www.gnu.org/copyleft/gpl.html.
- *  A copy is found in the textfile GPL.txt and important notices to the license
- *  from the author is found in LICENSE.txt distributed with these scripts.
- *
- *
- *  This script is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  This copyright notice MUST APPEAR in all copies of the script!
- ***************************************************************/
-require ('Bootstrap' . DIRECTORY_SEPARATOR) . 'BaseSetup.php';
-/*
- * @deprecated since 6.0, the classname Typo3_Bootstrap and this file is obsolete
- * and will be removed by 7.0. The class was renamed and is now located at:
- * typo3/sysext/core/Classes/Core/Bootstrap.php
- */
-require_once __DIR__ . '/../sysext/core/Classes/Core/Bootstrap.php';
-?>
\ No newline at end of file
diff --git a/typo3/classes/Bootstrap/BaseSetup.php b/typo3/classes/Bootstrap/BaseSetup.php
deleted file mode 100644 (file)
index 38df4c4..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-/*
- * @deprecated since 6.0, the classname Typo3_Bootstrap_BaseSetup and this file is obsolete
- * and will be removed by 7.0. The class was renamed and is now located at:
- * typo3/sysext/core/Classes/Core/SystemEnvironmentBuilder.php
- */
-require_once __DIR__ . '/../../sysext/core/Classes/Core/SystemEnvironmentBuilder.php';
-?>
\ No newline at end of file
diff --git a/typo3/classes/Bootstrap/Cli.php b/typo3/classes/Bootstrap/Cli.php
deleted file mode 100644 (file)
index 0d199bb..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-/*
- * @deprecated since 6.0, the classname Typo3_Bootstrap_Cli and this file is obsolete
- * and will be removed by 7.0. The class was renamed and is now located at:
- * typo3/sysext/cli/Classes/CliBootstrap.php
- */
-require_once __DIR__ . '/../../sysext/cli/Classes/CliBootstrap.php';
-?>
\ No newline at end of file
diff --git a/typo3/classes/Bootstrap/Install.php b/typo3/classes/Bootstrap/Install.php
deleted file mode 100644 (file)
index 8180ef9..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-/*
- * @deprecated since 6.0, the classname Typo3_Bootstrap_Install and this file is obsolete
- * and will be removed by 7.0. The class was renamed and is now located at:
- * typo3/sysext/install/Classes/InstallBootstrap.php
- */
-require_once \TYPO3\CMS\Core\Extension\ExtensionManager::extPath('install') . 'Classes/InstallBootstrap.php';
-?>
\ No newline at end of file
index 50a7c4f..d564df5 100755 (executable)
@@ -45,7 +45,6 @@ define('TYPO3_cliMode', TRUE);
 require __DIR__ . '/sysext/cli/Classes/CliBootstrap.php';
 \TYPO3\CMS\Cli\CliBootstrap::checkEnvironmentOrDie();
 
-require __DIR__ . '/sysext/core/Classes/Core/SystemEnvironmentBuilder.php';
 require __DIR__ . '/sysext/core/Classes/Core/Bootstrap.php';
 \TYPO3\CMS\Core\Core\Bootstrap::getInstance()
        ->baseSetup('typo3/')
index e120a8f..2f26d1e 100644 (file)
  * @subpackage core
  */
 define('TYPO3_MODE', 'BE');
-// We use require instead of require_once here so we get a fatal error if
-// classes/Bootstrap.php is accidentally included twice (which would indicate a clear bug).
-require 'classes/Bootstrap.php';
-\TYPO3\CMS\Core\Core\Bootstrap::getInstance()->startOutputBuffering()->baseSetup('typo3/')->registerExtDirectComponents()->populateLocalConfiguration()->initializeCachingFramework()->registerAutoloader()->checkUtf8DatabaseSettingsOrDie()->transferDeprecatedCurlSettings()->setCacheHashOptions()->enforceCorrectProxyAuthScheme()->setDefaultTimezone()->initializeL10nLocales()->configureImageProcessingOptions()->convertPageNotFoundHandlingToBoolean()->registerGlobalDebugFunctions()->registerSwiftMailer()->configureExceptionHandling()->setMemoryLimit()->defineTypo3RequestTypes()->populateTypo3LoadedExtGlobal(TRUE)->loadAdditionalConfigurationFromExtensions(TRUE)->deprecationLogForOldExtCacheSetting()->initializeExceptionHandling()->requireAdditionalExtensionFiles()->setFinalCachingFrameworkCacheConfiguration()->defineLoggingAndExceptionConstants()->unsetReservedGlobalVariables()->initializeTypo3DbGlobal(FALSE)->checkLockedBackendAndRedirectOrDie()->checkBackendIpOrDie()->checkSslBackendAndRedirectIfNeeded()->redirectToInstallToolIfDatabaseCredentialsAreMissing()->checkValidBrowserOrDie()->establishDatabaseConnection()->loadExtensionTables(TRUE)->initializeSpriteManager()->initializeBackendUser()->initializeBackendUserMounts()->initializeLanguageObject()->initializeModuleMenuObject()->initializeBackendTemplate()->endOutputBufferingAndCleanPreviousOutput()->initializeOutputCompression();
+
+       // We use require instead of require_once here so we get a fatal error if
+       // Bootstrap.php is accidentally included twice (which would indicate a clear bug).
+require 'sysext/core/Classes/Core/Bootstrap.php';
+
+\TYPO3\CMS\Core\Core\Bootstrap::getInstance()
+       ->startOutputBuffering()
+       ->baseSetup('typo3/')
+       ->registerExtDirectComponents()
+       ->populateLocalConfiguration()
+       ->initializeCachingFramework()
+       ->registerAutoloader()
+       ->checkUtf8DatabaseSettingsOrDie()
+       ->transferDeprecatedCurlSettings()
+       ->setCacheHashOptions()
+       ->enforceCorrectProxyAuthScheme()
+       ->setDefaultTimezone()
+       ->initializeL10nLocales()
+       ->configureImageProcessingOptions()
+       ->convertPageNotFoundHandlingToBoolean()
+       ->registerGlobalDebugFunctions()
+       ->registerSwiftMailer()
+       ->configureExceptionHandling()
+       ->setMemoryLimit()
+       ->defineTypo3RequestTypes()
+       ->populateTypo3LoadedExtGlobal(TRUE)
+       ->loadAdditionalConfigurationFromExtensions(TRUE)
+       ->deprecationLogForOldExtCacheSetting()
+       ->initializeExceptionHandling()
+       ->requireAdditionalExtensionFiles()
+       ->setFinalCachingFrameworkCacheConfiguration()
+       ->defineLoggingAndExceptionConstants()
+       ->unsetReservedGlobalVariables()
+       ->initializeTypo3DbGlobal(FALSE)
+       ->checkLockedBackendAndRedirectOrDie()
+       ->checkBackendIpOrDie()
+       ->checkSslBackendAndRedirectIfNeeded()
+       ->redirectToInstallToolIfDatabaseCredentialsAreMissing()
+       ->checkValidBrowserOrDie()
+       ->establishDatabaseConnection()
+       ->loadExtensionTables(TRUE)
+       ->initializeSpriteManager()
+       ->initializeBackendUser()
+       ->initializeBackendUserMounts()
+       ->initializeLanguageObject()
+       ->initializeModuleMenuObject()
+       ->initializeBackendTemplate()
+       ->endOutputBufferingAndCleanPreviousOutput()
+       ->initializeOutputCompression();
 ?>
\ No newline at end of file
index 76e3033..0faa4cf 100755 (executable)
 ob_start();
 define('TYPO3_MODE', 'BE');
 define('TYPO3_enterInstallScript', '1');
-// We use require instead of require_once here so we get a fatal error if classes/Bootstrap.php is accidentally included twice
-// (which would indicate a clear bug).
-require '../classes/Bootstrap.php';
+
+       // We use require instead of require_once here so we get a fatal error if classes/Bootstrap.php is accidentally included twice
+       // (which would indicate a clear bug).
+require '../sysext/core/Classes/Core/Bootstrap.php';
 \TYPO3\CMS\Core\Core\Bootstrap::getInstance()->baseSetup('typo3/install/');
-require '../classes/Bootstrap/Install.php';
+
+require '../sysext/install/Classes/InstallBootstrap.php';
 \TYPO3\CMS\Install\InstallBootstrap::checkEnabledInstallToolOrDie();
-\TYPO3\CMS\Core\Core\Bootstrap::getInstance()->registerExtDirectComponents()->populateLocalConfiguration()->initializeCachingFramework()->registerAutoloader()->checkUtf8DatabaseSettingsOrDie()->transferDeprecatedCurlSettings()->setCacheHashOptions()->enforceCorrectProxyAuthScheme()->setDefaultTimezone()->initializeL10nLocales()->configureImageProcessingOptions()->convertPageNotFoundHandlingToBoolean()->registerGlobalDebugFunctions()->registerSwiftMailer()->configureExceptionHandling()->setMemoryLimit()->defineTypo3RequestTypes()->populateTypo3LoadedExtGlobal(FALSE)->loadAdditionalConfigurationFromExtensions(FALSE)->deprecationLogForOldExtCacheSetting()->initializeExceptionHandling()->requireAdditionalExtensionFiles()->setFinalCachingFrameworkCacheConfiguration()->defineLoggingAndExceptionConstants()->unsetReservedGlobalVariables()->initializeTypo3DbGlobal(FALSE)->checkLockedBackendAndRedirectOrDie()->checkBackendIpOrDie()->checkSslBackendAndRedirectIfNeeded();
-// Run install script
+\TYPO3\CMS\Core\Core\Bootstrap::getInstance()
+       ->registerExtDirectComponents()
+       ->populateLocalConfiguration()
+       ->initializeCachingFramework()
+       ->registerAutoloader()
+       ->checkUtf8DatabaseSettingsOrDie()
+       ->transferDeprecatedCurlSettings()
+       ->setCacheHashOptions()
+       ->enforceCorrectProxyAuthScheme()
+       ->setDefaultTimezone()
+       ->initializeL10nLocales()
+       ->configureImageProcessingOptions()
+       ->convertPageNotFoundHandlingToBoolean()
+       ->registerGlobalDebugFunctions()
+       ->registerSwiftMailer()
+       ->configureExceptionHandling()
+       ->setMemoryLimit()
+       ->defineTypo3RequestTypes()
+       ->populateTypo3LoadedExtGlobal(FALSE)
+       ->loadAdditionalConfigurationFromExtensions(FALSE)
+       ->deprecationLogForOldExtCacheSetting()
+       ->initializeExceptionHandling()
+       ->requireAdditionalExtensionFiles()
+       ->setFinalCachingFrameworkCacheConfiguration()
+       ->defineLoggingAndExceptionConstants()
+       ->unsetReservedGlobalVariables()
+       ->initializeTypo3DbGlobal(FALSE)
+       ->checkLockedBackendAndRedirectOrDie()
+       ->checkBackendIpOrDie()
+       ->checkSslBackendAndRedirectIfNeeded();
+
+       // Run install script
 if (!\TYPO3\CMS\Core\Extension\ExtensionManager::isLoaded('install')) {
        die('Install Tool is not loaded as an extension.<br />You must add the key "install" to the list of installed extensions in typo3conf/localconf.php, $TYPO3_CONF_VARS[\'EXT\'][\'extList\'].');
 }
index 732f3d0..5a7c487 100644 (file)
@@ -41,7 +41,34 @@ define('TYPO3_MODE', 'FE');
 // Prevent any output until AJAX/compression is initialized to stop
 // AJAX/compression data corruption
 ob_start();
-\TYPO3\CMS\Core\Core\Bootstrap::getInstance()->registerExtDirectComponents()->populateLocalConfiguration()->initializeCachingFramework()->registerAutoloader()->checkUtf8DatabaseSettingsOrDie()->transferDeprecatedCurlSettings()->setCacheHashOptions()->enforceCorrectProxyAuthScheme()->setDefaultTimezone()->initializeL10nLocales()->configureImageProcessingOptions()->convertPageNotFoundHandlingToBoolean()->registerGlobalDebugFunctions()->registerSwiftMailer()->configureExceptionHandling()->setMemoryLimit()->defineTypo3RequestTypes()->populateTypo3LoadedExtGlobal(TRUE)->loadAdditionalConfigurationFromExtensions(TRUE)->deprecationLogForOldExtCacheSetting()->initializeExceptionHandling()->requireAdditionalExtensionFiles()->setFinalCachingFrameworkCacheConfiguration()->defineLoggingAndExceptionConstants()->unsetReservedGlobalVariables();
+
+\TYPO3\CMS\Core\Core\Bootstrap::getInstance()
+       ->registerExtDirectComponents()
+       ->populateLocalConfiguration()
+       ->initializeCachingFramework()
+       ->registerAutoloader()
+       ->checkUtf8DatabaseSettingsOrDie()
+       ->transferDeprecatedCurlSettings()
+       ->setCacheHashOptions()
+       ->enforceCorrectProxyAuthScheme()
+       ->setDefaultTimezone()
+       ->initializeL10nLocales()
+       ->configureImageProcessingOptions()
+       ->convertPageNotFoundHandlingToBoolean()
+       ->registerGlobalDebugFunctions()
+       ->registerSwiftMailer()
+       ->configureExceptionHandling()
+       ->setMemoryLimit()
+       ->defineTypo3RequestTypes()
+       ->populateTypo3LoadedExtGlobal(TRUE)
+       ->loadAdditionalConfigurationFromExtensions(TRUE)
+       ->deprecationLogForOldExtCacheSetting()
+       ->initializeExceptionHandling()
+       ->requireAdditionalExtensionFiles()
+       ->setFinalCachingFrameworkCacheConfiguration()
+       ->defineLoggingAndExceptionConstants()
+       ->unsetReservedGlobalVariables();
+
 if (!\TYPO3\CMS\Core\Extension\ExtensionManager::isLoaded('cms')) {
        die('<strong>Error:</strong> The main frontend extension "cms" was not loaded. Enable it in the extension manager in the backend.');
 }
index 33cd0e9..e0a594e 100644 (file)
@@ -1,6 +1,8 @@
 <?php
 namespace TYPO3\CMS\Core\Core;
 
+require 'SystemEnvironmentBuilder.php';
+
 /**
  * This class encapsulates bootstrap related methods.
  * It is required directly as the very first thing in entry scripts and
index cfb3fa6..a1d7b96 100644 (file)
@@ -188,7 +188,6 @@ return array(
        'Tx_Beuser_ViewHelpers_SpriteIconForRecordViewHelper' => 'TYPO3\\CMS\\Beuser\\ViewHelpers\\SpriteIconForRecordViewHelper',
        'Tx_Beuser_ViewHelpers_SpriteManagerIconViewHelper' => 'TYPO3\\CMS\\Beuser\\ViewHelpers\\SpriteManagerIconViewHelper',
        'Tx_Beuser_ViewHelpers_SUViewHelper' => 'TYPO3\\CMS\\Beuser\\ViewHelpers\\SuViewHelper',
-       'Typo3_Bootstrap_Cli' => 'TYPO3\\CMS\\Cli\\CliBootstrap',
        't3lib_cli' => 'TYPO3\\CMS\\Cli\\Controller\\CommandLineController',
        'extDirect_DataProvider_ContextHelp' => 'TYPO3\\CMS\\ContextHelp\\ExtDirect\\ContextHelpDataProvider',
        't3lib_userAuth' => 'TYPO3\\CMS\\Core\\Authentication\\AbstractUserAuthentication',
@@ -232,8 +231,6 @@ return array(
        't3lib_collection_StaticRecordCollection' => 'TYPO3\\CMS\\Core\\Collection\\StaticRecordCollection',
        't3lib_flexformtools' => 'TYPO3\\CMS\\Core\\Configuration\\FlexForm\\FlexFormTools',
        't3lib_matchCondition_abstract' => 'TYPO3\\CMS\\Core\\Configuration\\TypoScript\\ConditionMatching\\AbstractConditionMatcher',
-       'Typo3_Bootstrap' => 'TYPO3\\CMS\\Core\\Core\\Bootstrap',
-       'Typo3_Bootstrap_BaseSetup' => 'TYPO3\\CMS\\Core\\Core\\SystemEnvironmentBuilder',
        't3lib_DB' => 'TYPO3\\CMS\\Core\\Database\\DatabaseConnection',
        't3lib_PdoHelper' => 'TYPO3\\CMS\\Core\\Database\\PdoHelper',
        't3lib_DB_postProcessQueryHook' => 'TYPO3\\CMS\\Core\\Database\\PostProcessQueryHookInterface',
@@ -1435,7 +1432,6 @@ return array(
        'tx_coreupdates_t3skin' => 'TYPO3\\CMS\\Install\\CoreUpdates\\T3skinUpdate',
        'tx_install_ajax' => 'TYPO3\\CMS\\Install\\EidHandler',
        'Tx_Install_Service_BasicService' => 'TYPO3\\CMS\\Install\\EnableFileService',
-       'Typo3_Bootstrap_Install' => 'TYPO3\\CMS\\Install\\InstallBootstrap',
        'tx_install' => 'TYPO3\\CMS\\Install\\Installer',
        'tx_install_report_InstallStatus' => 'TYPO3\\CMS\\Install\\Report\\InstallStatusReport',
        'tx_install_session' => 'TYPO3\\CMS\\Install\\Session',