From 67fc6662e20de7ea1276a1be55895fa4a3b8f164 Mon Sep 17 00:00:00 2001
From: Christian Kuhn <lolli@schwarzbu.ch>
Date: Tue, 18 Dec 2018 22:45:17 +0100
Subject: [PATCH] [TASK] Typo 'boostrap' should be 'bootstrap'
Resolves: #87205
Releases: master, 9.5
Change-Id: Idb22d2178bbd20982d4876b5dff45b06dea4100d
Reviewed-on: https://review.typo3.org/59199
Reviewed-by: Oliver Klee <typo3-coding@oliverklee.de>
Tested-by: Riccardo De Contardi <erredeco@gmail.com>
Tested-by: TYPO3com <no-reply@typo3.com>
Reviewed-by: Wouter Wolters <typo3@wouterwolters.nl>
Tested-by: Wouter Wolters <typo3@wouterwolters.nl>
---
typo3/sysext/core/Classes/Core/Bootstrap.php | 2 +-
...802-IsLocalconfWritableFunctionRemoved.rst | 2 +-
.../9.4/Deprecation-85821-BoostrapMethods.rst | 53 -------------------
.../Deprecation-85821-BootstrapMethods.rst | 53 +++++++++++++++++++
.../sysext/extbase/Classes/Core/Bootstrap.php | 2 +-
.../fluid/Classes/Core/Widget/Bootstrap.php | 2 +-
.../Php/MethodCallMatcher.php | 24 ++++-----
.../Php/MethodCallStaticMatcher.php | 32 +++++------
8 files changed, 85 insertions(+), 85 deletions(-)
delete mode 100644 typo3/sysext/core/Documentation/Changelog/9.4/Deprecation-85821-BoostrapMethods.rst
create mode 100644 typo3/sysext/core/Documentation/Changelog/9.4/Deprecation-85821-BootstrapMethods.rst
diff --git a/typo3/sysext/core/Classes/Core/Bootstrap.php b/typo3/sysext/core/Classes/Core/Bootstrap.php
index 1d40127f9518..9137ce7e5d77 100644
--- a/typo3/sysext/core/Classes/Core/Bootstrap.php
+++ b/typo3/sysext/core/Classes/Core/Bootstrap.php
@@ -448,7 +448,7 @@ class Bootstrap
*
* @param bool $allowCaching Whether to allow caching - affects cache_core (autoloader)
* @param string $packageManagerClassName Define an alternative package manager implementation (usually for the installer)
- * @param bool $isInternalCall Set to true by boostrap, not by extensions
+ * @param bool $isInternalCall Set to true by bootstrap, not by extensions
* @return Bootstrap|null
* @internal This is not a public API method, do not use in own extensions
* @deprecated will be set to removed in TYPO3 v10.0.
diff --git a/typo3/sysext/core/Documentation/Changelog/7.0/Breaking-61802-IsLocalconfWritableFunctionRemoved.rst b/typo3/sysext/core/Documentation/Changelog/7.0/Breaking-61802-IsLocalconfWritableFunctionRemoved.rst
index d5bb72a41131..e271a865a653 100644
--- a/typo3/sysext/core/Documentation/Changelog/7.0/Breaking-61802-IsLocalconfWritableFunctionRemoved.rst
+++ b/typo3/sysext/core/Documentation/Changelog/7.0/Breaking-61802-IsLocalconfWritableFunctionRemoved.rst
@@ -11,7 +11,7 @@ Description
===========
The function :code:`isLocalconfWritable()` :code:`from \TYPO3\CMS\Core\Utility\ExtensionManagementUtility` has been removed.
-The boostrap now just checks for the existence of the file and redirects to the install tool if it doesn't exist.
+The bootstrap now just checks for the existence of the file and redirects to the install tool if it doesn't exist.
Impact
======
diff --git a/typo3/sysext/core/Documentation/Changelog/9.4/Deprecation-85821-BoostrapMethods.rst b/typo3/sysext/core/Documentation/Changelog/9.4/Deprecation-85821-BoostrapMethods.rst
deleted file mode 100644
index 3adf895d298c..000000000000
--- a/typo3/sysext/core/Documentation/Changelog/9.4/Deprecation-85821-BoostrapMethods.rst
+++ /dev/null
@@ -1,53 +0,0 @@
-.. include:: ../../Includes.txt
-
-======================================
-Deprecation: #85821 - boostrap methods
-======================================
-
-See :issue:`85821`
-
-Description
-===========
-
-The following methods of :php:`TYPO3\CMS\Core\Core\Boostrap` have been marked as deprecated. Some of
-them will just change their visibility from public to protected in TYPO3 v10 and thus should not
-be called externally any longer:
-
-* :php:`TYPO3\CMS\Core\Core\Boostrap::usesComposerClassLoading()`
-* :php:`TYPO3\CMS\Core\Core\Boostrap::getInstance()`
-* :php:`TYPO3\CMS\Core\Core\Boostrap->configure()`
-* :php:`TYPO3\CMS\Core\Core\Boostrap::checkIfEssentialConfigurationExists()`
-* :php:`TYPO3\CMS\Core\Core\Boostrap->setEarlyInstance()`
-* :php:`TYPO3\CMS\Core\Core\Boostrap->getEarlyInstance()`
-* :php:`TYPO3\CMS\Core\Core\Boostrap->getEarlyInstances()`
-* :php:`TYPO3\CMS\Core\Core\Boostrap::loadConfigurationAndInitialize()`
-* :php:`TYPO3\CMS\Core\Core\Boostrap->initializePackageManagement()`
-* :php:`TYPO3\CMS\Core\Core\Boostrap::populateLocalConfiguration()`
-* :php:`TYPO3\CMS\Core\Core\Boostrap::disableCoreCache()`
-* :php:`TYPO3\CMS\Core\Core\Boostrap::initializeCachingFramework()`
-* :php:`TYPO3\CMS\Core\Core\Boostrap->setRequestType()`
-* :php:`TYPO3\CMS\Core\Core\Boostrap::setFinalCachingFrameworkCacheConfiguration()`
-
-
-Impact
-======
-
-This deprecation is only interesting for code that interferes with early core boostrap.
-Those may trigger PHP :php:`E_USER_DEPRECATED` error.
-
-
-Affected Installations
-======================
-
-Instances using early boostrap code may be affected by this. Those should strive for
-using the general entry method :php:`Bootstrap::init()` instead.
-
-
-Migration
-=========
-
-See changes on the typo3/testing-framework which formerly used early instance
-bootstrap calls for an example on how existing code can be refactored to use
-the top level :php:`Bootstrap::init()` instead.
-
-.. index:: PHP-API, FullyScanned
diff --git a/typo3/sysext/core/Documentation/Changelog/9.4/Deprecation-85821-BootstrapMethods.rst b/typo3/sysext/core/Documentation/Changelog/9.4/Deprecation-85821-BootstrapMethods.rst
new file mode 100644
index 000000000000..a30f7316f7c7
--- /dev/null
+++ b/typo3/sysext/core/Documentation/Changelog/9.4/Deprecation-85821-BootstrapMethods.rst
@@ -0,0 +1,53 @@
+.. include:: ../../Includes.txt
+
+=======================================
+Deprecation: #85821 - bootstrap methods
+=======================================
+
+See :issue:`85821`
+
+Description
+===========
+
+The following methods of :php:`TYPO3\CMS\Core\Core\Bootstrap` have been marked as deprecated. Some of
+them will just change their visibility from public to protected in TYPO3 v10 and thus should not
+be called externally any longer:
+
+* :php:`TYPO3\CMS\Core\Core\Bootstrap::usesComposerClassLoading()`
+* :php:`TYPO3\CMS\Core\Core\Bootstrap::getInstance()`
+* :php:`TYPO3\CMS\Core\Core\Bootstrap->configure()`
+* :php:`TYPO3\CMS\Core\Core\Bootstrap::checkIfEssentialConfigurationExists()`
+* :php:`TYPO3\CMS\Core\Core\Bootstrap->setEarlyInstance()`
+* :php:`TYPO3\CMS\Core\Core\Bootstrap->getEarlyInstance()`
+* :php:`TYPO3\CMS\Core\Core\Bootstrap->getEarlyInstances()`
+* :php:`TYPO3\CMS\Core\Core\Bootstrap::loadConfigurationAndInitialize()`
+* :php:`TYPO3\CMS\Core\Core\Bootstrap->initializePackageManagement()`
+* :php:`TYPO3\CMS\Core\Core\Bootstrap::populateLocalConfiguration()`
+* :php:`TYPO3\CMS\Core\Core\Bootstrap::disableCoreCache()`
+* :php:`TYPO3\CMS\Core\Core\Bootstrap::initializeCachingFramework()`
+* :php:`TYPO3\CMS\Core\Core\Bootstrap->setRequestType()`
+* :php:`TYPO3\CMS\Core\Core\Bootstrap::setFinalCachingFrameworkCacheConfiguration()`
+
+
+Impact
+======
+
+This deprecation is only interesting for code that interferes with early core bootstrap.
+Those may trigger PHP :php:`E_USER_DEPRECATED` error.
+
+
+Affected Installations
+======================
+
+Instances using early bootstrap code may be affected by this. Those should strive for
+using the general entry method :php:`Bootstrap::init()` instead.
+
+
+Migration
+=========
+
+See changes on the typo3/testing-framework which formerly used early instance
+bootstrap calls for an example on how existing code can be refactored to use
+the top level :php:`Bootstrap::init()` instead.
+
+.. index:: PHP-API, FullyScanned
diff --git a/typo3/sysext/extbase/Classes/Core/Bootstrap.php b/typo3/sysext/extbase/Classes/Core/Bootstrap.php
index 27e1d3095135..9be2f84c29e6 100644
--- a/typo3/sysext/extbase/Classes/Core/Bootstrap.php
+++ b/typo3/sysext/extbase/Classes/Core/Bootstrap.php
@@ -111,7 +111,7 @@ class Bootstrap implements \TYPO3\CMS\Extbase\Core\BootstrapInterface
* Configures the object manager object configuration from
* config.tx_extbase.objects and plugin.tx_foo.objects
*
- * @param bool $isInternalCall Set to true by Boostrap, not by extensions
+ * @param bool $isInternalCall Set to true by Bootstrap, not by extensions
* @see initialize()
* @deprecated since TYPO3 v9, will be removed in TYPO3 v10.0
*/
diff --git a/typo3/sysext/fluid/Classes/Core/Widget/Bootstrap.php b/typo3/sysext/fluid/Classes/Core/Widget/Bootstrap.php
index 934ca1ea848f..af28296c83b0 100644
--- a/typo3/sysext/fluid/Classes/Core/Widget/Bootstrap.php
+++ b/typo3/sysext/fluid/Classes/Core/Widget/Bootstrap.php
@@ -78,7 +78,7 @@ class Bootstrap
* Configures the object manager object configuration from
* config.tx_extbase.objects
*
- * @param $isInternalCall bool Set to true by Boostrap, not by extensions
+ * @param $isInternalCall bool Set to true by Bootstrap, not by extensions
* @see initialize()
* @deprecated since TYPO3 v9, will be removed in TYPO3 v10.0
*/
diff --git a/typo3/sysext/install/Configuration/ExtensionScanner/Php/MethodCallMatcher.php b/typo3/sysext/install/Configuration/ExtensionScanner/Php/MethodCallMatcher.php
index 4354720e1abb..7120e086357c 100644
--- a/typo3/sysext/install/Configuration/ExtensionScanner/Php/MethodCallMatcher.php
+++ b/typo3/sysext/install/Configuration/ExtensionScanner/Php/MethodCallMatcher.php
@@ -3054,46 +3054,46 @@ return [
'Deprecation-85804-SaltedPasswordHashClassDeprecations.rst',
],
],
- 'TYPO3\CMS\Core\Core\Boostrap->configure' => [
+ 'TYPO3\CMS\Core\Core\Bootstrap->configure' => [
'numberOfMandatoryArguments' => 0,
'maximumNumberOfArguments' => 0,
'restFiles' => [
- 'Deprecation-85821-BoostrapMethods.rst',
+ 'Deprecation-85821-BootstrapMethods.rst',
],
],
- 'TYPO3\CMS\Core\Core\Boostrap->setEarlyInstance' => [
+ 'TYPO3\CMS\Core\Core\Bootstrap->setEarlyInstance' => [
'numberOfMandatoryArguments' => 2,
'maximumNumberOfArguments' => 2,
'restFiles' => [
- 'Deprecation-85821-BoostrapMethods.rst',
+ 'Deprecation-85821-BootstrapMethods.rst',
],
],
- 'TYPO3\CMS\Core\Core\Boostrap->getEarlyInstance' => [
+ 'TYPO3\CMS\Core\Core\Bootstrap->getEarlyInstance' => [
'numberOfMandatoryArguments' => 1,
'maximumNumberOfArguments' => 1,
'restFiles' => [
- 'Deprecation-85821-BoostrapMethods.rst',
+ 'Deprecation-85821-BootstrapMethods.rst',
],
],
- 'TYPO3\CMS\Core\Core\Boostrap->getEarlyInstances' => [
+ 'TYPO3\CMS\Core\Core\Bootstrap->getEarlyInstances' => [
'numberOfMandatoryArguments' => 0,
'maximumNumberOfArguments' => 0,
'restFiles' => [
- 'Deprecation-85821-BoostrapMethods.rst',
+ 'Deprecation-85821-BootstrapMethods.rst',
],
],
- 'TYPO3\CMS\Core\Core\Boostrap->initializePackageManagement' => [
+ 'TYPO3\CMS\Core\Core\Bootstrap->initializePackageManagement' => [
'numberOfMandatoryArguments' => 1,
'maximumNumberOfArguments' => 1,
'restFiles' => [
- 'Deprecation-85821-BoostrapMethods.rst',
+ 'Deprecation-85821-BootstrapMethods.rst',
],
],
- 'TYPO3\CMS\Core\Core\Boostrap->setRequestType' => [
+ 'TYPO3\CMS\Core\Core\Bootstrap->setRequestType' => [
'numberOfMandatoryArguments' => 1,
'maximumNumberOfArguments' => 1,
'restFiles' => [
- 'Deprecation-85821-BoostrapMethods.rst',
+ 'Deprecation-85821-BootstrapMethods.rst',
],
],
'TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController->initFEuser' => [
diff --git a/typo3/sysext/install/Configuration/ExtensionScanner/Php/MethodCallStaticMatcher.php b/typo3/sysext/install/Configuration/ExtensionScanner/Php/MethodCallStaticMatcher.php
index 14e83391a14b..574f3c24dca9 100644
--- a/typo3/sysext/install/Configuration/ExtensionScanner/Php/MethodCallStaticMatcher.php
+++ b/typo3/sysext/install/Configuration/ExtensionScanner/Php/MethodCallStaticMatcher.php
@@ -661,60 +661,60 @@ return [
'Deprecation-81430-TypoScriptTemplateModuleControllerrenderList.rst',
],
],
- 'TYPO3\CMS\Core\Core\Boostrap::usesComposerClassLoading' => [
+ 'TYPO3\CMS\Core\Core\Bootstrap::usesComposerClassLoading' => [
'numberOfMandatoryArguments' => 0,
'maximumNumberOfArguments' => 0,
'restFiles' => [
- 'Deprecation-85821-BoostrapMethods.rst',
+ 'Deprecation-85821-BootstrapMethods.rst',
],
],
- 'TYPO3\CMS\Core\Core\Boostrap::getInstance' => [
+ 'TYPO3\CMS\Core\Core\Bootstrap::getInstance' => [
'numberOfMandatoryArguments' => 0,
'maximumNumberOfArguments' => 0,
'restFiles' => [
- 'Deprecation-85821-BoostrapMethods.rst',
+ 'Deprecation-85821-BootstrapMethods.rst',
],
],
- 'TYPO3\CMS\Core\Core\Boostrap::checkIfEssentialConfigurationExists' => [
+ 'TYPO3\CMS\Core\Core\Bootstrap::checkIfEssentialConfigurationExists' => [
'numberOfMandatoryArguments' => 0,
'maximumNumberOfArguments' => 1,
'restFiles' => [
- 'Deprecation-85821-BoostrapMethods.rst',
+ 'Deprecation-85821-BootstrapMethods.rst',
],
],
- 'TYPO3\CMS\Core\Core\Boostrap::loadConfigurationAndInitialize' => [
+ 'TYPO3\CMS\Core\Core\Bootstrap::loadConfigurationAndInitialize' => [
'numberOfMandatoryArguments' => 0,
'maximumNumberOfArguments' => 3,
'restFiles' => [
- 'Deprecation-85821-BoostrapMethods.rst',
+ 'Deprecation-85821-BootstrapMethods.rst',
],
],
- 'TYPO3\CMS\Core\Core\Boostrap::populateLocalConfiguration' => [
+ 'TYPO3\CMS\Core\Core\Bootstrap::populateLocalConfiguration' => [
'numberOfMandatoryArguments' => 0,
'maximumNumberOfArguments' => 1,
'restFiles' => [
- 'Deprecation-85821-BoostrapMethods.rst',
+ 'Deprecation-85821-BootstrapMethods.rst',
],
],
- 'TYPO3\CMS\Core\Core\Boostrap::disableCoreCache' => [
+ 'TYPO3\CMS\Core\Core\Bootstrap::disableCoreCache' => [
'numberOfMandatoryArguments' => 0,
'maximumNumberOfArguments' => 0,
'restFiles' => [
- 'Deprecation-85821-BoostrapMethods.rst',
+ 'Deprecation-85821-BootstrapMethods.rst',
],
],
- 'TYPO3\CMS\Core\Core\Boostrap::initializeCachingFramework' => [
+ 'TYPO3\CMS\Core\Core\Bootstrap::initializeCachingFramework' => [
'numberOfMandatoryArguments' => 0,
'maximumNumberOfArguments' => 1,
'restFiles' => [
- 'Deprecation-85821-BoostrapMethods.rst',
+ 'Deprecation-85821-BootstrapMethods.rst',
],
],
- 'TYPO3\CMS\Core\Core\Boostrap::setFinalCachingFrameworkCacheConfiguration' => [
+ 'TYPO3\CMS\Core\Core\Bootstrap::setFinalCachingFrameworkCacheConfiguration' => [
'numberOfMandatoryArguments' => 0,
'maximumNumberOfArguments' => 1,
'restFiles' => [
- 'Deprecation-85821-BoostrapMethods.rst',
+ 'Deprecation-85821-BootstrapMethods.rst',
],
],
'TYPO3\CMS\Frontend\Page\PageGenerator::renderContent' => [
--
GitLab