diff --git a/typo3/sysext/core/Classes/Resource/Index/ExtractorRegistry.php b/typo3/sysext/core/Classes/Resource/Index/ExtractorRegistry.php
index 8a4af7f7cf2e19f0a677f543c361a3312f553dd8..62209f18f0d91953653548497da61a8aecc14008 100644
--- a/typo3/sysext/core/Classes/Resource/Index/ExtractorRegistry.php
+++ b/typo3/sysext/core/Classes/Resource/Index/ExtractorRegistry.php
@@ -36,18 +36,6 @@ class ExtractorRegistry implements SingletonInterface
*/
protected $instances;
- /**
- * Returns an instance of this class
- *
- * @return ExtractorRegistry
- * @deprecated will be removed in TYPO3 v12.0. Use Dependency Injection or GeneralUtility::makeInstance() if DI is not possible.
- */
- public static function getInstance()
- {
- trigger_error(__CLASS__ . '::getInstance() will be removed in TYPO3 v12.0. Use Dependency Injection or GeneralUtility::makeInstance() if DI is not possible.', E_USER_DEPRECATED);
- return GeneralUtility::makeInstance(self::class);
- }
-
/**
* Allows to register MetaData extraction to the FAL Indexer
*
diff --git a/typo3/sysext/core/Classes/Resource/Index/FileIndexRepository.php b/typo3/sysext/core/Classes/Resource/Index/FileIndexRepository.php
index 99170c39498285c432e564be02d4c19f6c542d3b..b5506bd21c79bad3915220796e9efcc016df440b 100644
--- a/typo3/sysext/core/Classes/Resource/Index/FileIndexRepository.php
+++ b/typo3/sysext/core/Classes/Resource/Index/FileIndexRepository.php
@@ -60,18 +60,6 @@ class FileIndexRepository implements SingletonInterface
'mime_type', 'name', 'sha1', 'size', 'creation_date', 'modification_date', 'folder_hash',
];
- /**
- * Returns an Instance of the Repository
- *
- * @return FileIndexRepository
- * @deprecated will be removed in TYPO3 v12.0. Use Dependency Injection or GeneralUtility::makeInstance() if DI is not possible.
- */
- public static function getInstance()
- {
- trigger_error(__CLASS__ . '::getInstance() will be removed in TYPO3 v12.0. Use Dependency Injection or GeneralUtility::makeInstance() if DI is not possible.', E_USER_DEPRECATED);
- return GeneralUtility::makeInstance(self::class);
- }
-
public function __construct(EventDispatcherInterface $eventDispatcher)
{
$this->eventDispatcher = $eventDispatcher;
diff --git a/typo3/sysext/core/Classes/Resource/Index/MetaDataRepository.php b/typo3/sysext/core/Classes/Resource/Index/MetaDataRepository.php
index 7a74a61a295955a45f7a8fac9dfc7cc97a07e76e..a811e3bbaeebce10b23c58d63f04c1f68e8d56e1 100644
--- a/typo3/sysext/core/Classes/Resource/Index/MetaDataRepository.php
+++ b/typo3/sysext/core/Classes/Resource/Index/MetaDataRepository.php
@@ -236,14 +236,4 @@ class MetaDataRepository implements SingletonInterface
return $this->tableFields;
}
-
- /**
- * @return MetaDataRepository
- * @deprecated will be removed in TYPO3 v12.0. Use Dependency Injection or GeneralUtility::makeInstance() if DI is not possible.
- */
- public static function getInstance()
- {
- trigger_error(__CLASS__ . '::getInstance() will be removed in TYPO3 v12.0. Use Dependency Injection or GeneralUtility::makeInstance() if DI is not possible.', E_USER_DEPRECATED);
- return GeneralUtility::makeInstance(self::class);
- }
}
diff --git a/typo3/sysext/core/Classes/Resource/OnlineMedia/Helpers/OnlineMediaHelperRegistry.php b/typo3/sysext/core/Classes/Resource/OnlineMedia/Helpers/OnlineMediaHelperRegistry.php
index 6fb0ade507b273eebbc601d3f60c0a039bef2422..28f9b41a0928e8717a97a1f1ff7e7186e486cb1e 100644
--- a/typo3/sysext/core/Classes/Resource/OnlineMedia/Helpers/OnlineMediaHelperRegistry.php
+++ b/typo3/sysext/core/Classes/Resource/OnlineMedia/Helpers/OnlineMediaHelperRegistry.php
@@ -25,18 +25,6 @@ use TYPO3\CMS\Core\Utility\GeneralUtility;
*/
class OnlineMediaHelperRegistry implements SingletonInterface
{
- /**
- * Returns an instance of this class
- *
- * @return OnlineMediaHelperRegistry
- * @deprecated will be removed in TYPO3 v12.0. Use Dependency Injection or GeneralUtility::makeInstance() if DI is not possible.
- */
- public static function getInstance()
- {
- trigger_error(__CLASS__ . '::getInstance() will be removed in TYPO3 v12.0. Use Dependency Injection or GeneralUtility::makeInstance() if DI is not possible.', E_USER_DEPRECATED);
- return GeneralUtility::makeInstance(self::class);
- }
-
/**
* Checks if there is a helper for this file extension
*
diff --git a/typo3/sysext/core/Classes/Resource/Rendering/RendererRegistry.php b/typo3/sysext/core/Classes/Resource/Rendering/RendererRegistry.php
index bd396042e94acd4ebfdab84a21ca224b954a03aa..2521b65a842325f137d754eb9d661fe1cfa24bc6 100644
--- a/typo3/sysext/core/Classes/Resource/Rendering/RendererRegistry.php
+++ b/typo3/sysext/core/Classes/Resource/Rendering/RendererRegistry.php
@@ -38,18 +38,6 @@ class RendererRegistry implements SingletonInterface
*/
protected $instances;
- /**
- * Returns an instance of this class
- *
- * @return RendererRegistry
- * @deprecated will be removed in TYPO3 v12.0. Use Dependency Injection or GeneralUtility::makeInstance() if DI is not possible.
- */
- public static function getInstance()
- {
- trigger_error(__CLASS__ . '::getInstance() will be removed in TYPO3 v12.0. Use Dependency Injection or GeneralUtility::makeInstance() if DI is not possible.', E_USER_DEPRECATED);
- return GeneralUtility::makeInstance(self::class);
- }
-
/**
* Allows to register a Renderer class
*
diff --git a/typo3/sysext/core/Classes/Resource/TextExtraction/TextExtractorRegistry.php b/typo3/sysext/core/Classes/Resource/TextExtraction/TextExtractorRegistry.php
index 55a2b1281847ee262e02b18a9cfa5146fa8ef424..66013e72f0e975693d518f4dbf08ce93cd06c86b 100644
--- a/typo3/sysext/core/Classes/Resource/TextExtraction/TextExtractorRegistry.php
+++ b/typo3/sysext/core/Classes/Resource/TextExtraction/TextExtractorRegistry.php
@@ -38,18 +38,6 @@ class TextExtractorRegistry implements SingletonInterface
*/
protected $instances = [];
- /**
- * Returns an instance of this class
- *
- * @return TextExtractorRegistry
- * @deprecated will be removed in TYPO3 v12.0. Use Dependency Injection or GeneralUtility::makeInstance() if DI is not possible.
- */
- public static function getInstance()
- {
- trigger_error(__CLASS__ . '::getInstance() will be removed in TYPO3 v12.0. Use Dependency Injection or GeneralUtility::makeInstance() if DI is not possible.', E_USER_DEPRECATED);
- return GeneralUtility::makeInstance(__CLASS__);
- }
-
/**
* Allows to register a text extractor class
*
diff --git a/typo3/sysext/core/Documentation/Changelog/12.0/Breaking-96107-DeprecatedFunctionalityRemoved.rst b/typo3/sysext/core/Documentation/Changelog/12.0/Breaking-96107-DeprecatedFunctionalityRemoved.rst
index 80ef8b2e8277b6f3d04aa73fbc79427a55d2f6af..ac032dc0db7a2ce6b4a33d50882b9927d0142dcd 100644
--- a/typo3/sysext/core/Documentation/Changelog/12.0/Breaking-96107-DeprecatedFunctionalityRemoved.rst
+++ b/typo3/sysext/core/Documentation/Changelog/12.0/Breaking-96107-DeprecatedFunctionalityRemoved.rst
@@ -49,12 +49,21 @@ The following PHP static class methods that have previously been marked as depre
- :php:`\TYPO3\CMS\Backend\Utility\BackendUtility::fixVersioningPid()`
- :php:`\TYPO3\CMS\Backend\Utility\BackendUtility::softRefParserObj()`
- :php:`\TYPO3\CMS\Backend\Utility\BackendUtility::viewOnClick`
+- :php:`\TYPO3\CMS\Core\Resource\Index\ExtractorRegistry::getInstance()`
+- :php:`\TYPO3\CMS\Core\Resource\Index\FileIndexRepository::getInstance()`
+- :php:`\TYPO3\CMS\Core\Resource\Index\MetaDataRepository::getInstance()`
+- :php:`\TYPO3\CMS\Core\Resource\OnlineMedia\Helpers\OnlineMediaHelperRegistry::getInstance()`
+- :php:`\TYPO3\CMS\Core\Resource\Rendering\RendererRegistry::getInstance()`
+- :php:`\TYPO3\CMS\Core\Resource\TextExtraction\TextExtractorRegistry::getInstance()`
- :php:`\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::makeCategorizable()`
- :php:`\TYPO3\CMS\Core\Utility\GeneralUtility::rmFromList()`
- :php:`\TYPO3\CMS\Core\Utility\GeneralUtility::stdAuthCode()`
- :php:`\TYPO3\CMS\Core\Utility\HttpUtility::redirect()`
- :php:`\TYPO3\CMS\Core\Utility\HttpUtility::setResponseCode()`
- :php:`\TYPO3\CMS\Core\Utility\HttpUtility::setResponseCodeAndExit()`
+- :php:`\TYPO3\CMS\Form\Service\TranslationService::getInstance()`
+- :php:`\TYPO3\CMS\T3editor\Registry\AddonRegistry::getInstance()`
+- :php:`\TYPO3\CMS\T3editor\Registry\ModeRegistry::getInstance()`
The following methods changed signature according to previous deprecations in v11 at the end of the argument list:
@@ -62,7 +71,7 @@ The following methods changed signature according to previous deprecations in v1
The following methods changed signature according to previous deprecations in v11 and are now type hinted:
-- :php:`\TYPO3\CMS\Backend\Tree\View\AbstractTreeView->getIcon` (first argument is now type hinted `array`)
+- :php:`\TYPO3\CMS\Backend\Tree\View\AbstractTreeView->getIcon()` (first argument is now type hinted `array`)
The following public class properties have been dropped:
diff --git a/typo3/sysext/form/Classes/Service/TranslationService.php b/typo3/sysext/form/Classes/Service/TranslationService.php
index 46d4f40e3f62d49612966556310821702c817788..3ce7bcd55aaf0cedfc146716b801ba79f1f66bd9 100644
--- a/typo3/sysext/form/Classes/Service/TranslationService.php
+++ b/typo3/sysext/form/Classes/Service/TranslationService.php
@@ -82,21 +82,6 @@ class TranslationService implements SingletonInterface
$this->configurationManager = $configurationManager;
}
- /**
- * Return TranslationService as singleton
- *
- * @return self
- * @internal
- * @deprecated will be removed in TYPO3 v12.0. Use Dependency Injection or GeneralUtility::makeInstance() if DI is not possible.
- */
- public static function getInstance(): self
- {
- trigger_error(__CLASS__ . '::getInstance() will be removed in TYPO3 v12.0. Use Dependency Injection or GeneralUtility::makeInstance() if DI is not possible.', E_USER_DEPRECATED);
- /** @var self $instance */
- $instance = GeneralUtility::makeInstance(self::class);
- return $instance;
- }
-
/**
* Returns the localized label of the LOCAL_LANG key, $key.
*
diff --git a/typo3/sysext/install/Configuration/ExtensionScanner/Php/MethodCallStaticMatcher.php b/typo3/sysext/install/Configuration/ExtensionScanner/Php/MethodCallStaticMatcher.php
index 8bad6edc0832ec10924651e17adfc40ab5527c7b..b412952056624bf368e37a38f5f14a2891a474c8 100644
--- a/typo3/sysext/install/Configuration/ExtensionScanner/Php/MethodCallStaticMatcher.php
+++ b/typo3/sysext/install/Configuration/ExtensionScanner/Php/MethodCallStaticMatcher.php
@@ -1206,6 +1206,7 @@ return [
'maximumNumberOfArguments' => 0,
'restFiles' => [
'Deprecation-95326-VariousGetInstanceStaticMethodsOnSingletonInterfaces.rst',
+ 'Breaking-96107-DeprecatedFunctionalityRemoved.rst',
],
],
'TYPO3\CMS\Core\Resource\Index\FileIndexRepository::getInstance' => [
@@ -1213,6 +1214,7 @@ return [
'maximumNumberOfArguments' => 0,
'restFiles' => [
'Deprecation-95326-VariousGetInstanceStaticMethodsOnSingletonInterfaces.rst',
+ 'Breaking-96107-DeprecatedFunctionalityRemoved.rst',
],
],
'TYPO3\CMS\Core\Resource\Index\MetaDataRepository::getInstance' => [
@@ -1220,6 +1222,7 @@ return [
'maximumNumberOfArguments' => 0,
'restFiles' => [
'Deprecation-95326-VariousGetInstanceStaticMethodsOnSingletonInterfaces.rst',
+ 'Breaking-96107-DeprecatedFunctionalityRemoved.rst',
],
],
'TYPO3\CMS\Core\Resource\OnlineMedia\Helpers\OnlineMediaHelperRegistry::getInstance' => [
@@ -1227,6 +1230,7 @@ return [
'maximumNumberOfArguments' => 0,
'restFiles' => [
'Deprecation-95326-VariousGetInstanceStaticMethodsOnSingletonInterfaces.rst',
+ 'Breaking-96107-DeprecatedFunctionalityRemoved.rst',
],
],
'TYPO3\CMS\Core\Resource\Rendering\RendererRegistry::getInstance' => [
@@ -1234,6 +1238,7 @@ return [
'maximumNumberOfArguments' => 0,
'restFiles' => [
'Deprecation-95326-VariousGetInstanceStaticMethodsOnSingletonInterfaces.rst',
+ 'Breaking-96107-DeprecatedFunctionalityRemoved.rst',
],
],
'TYPO3\CMS\Core\Resource\TextExtraction\TextExtractorRegistry::getInstance' => [
@@ -1241,6 +1246,7 @@ return [
'maximumNumberOfArguments' => 0,
'restFiles' => [
'Deprecation-95326-VariousGetInstanceStaticMethodsOnSingletonInterfaces.rst',
+ 'Breaking-96107-DeprecatedFunctionalityRemoved.rst',
],
],
'TYPO3\CMS\Form\Service\TranslationService::getInstance' => [
@@ -1248,6 +1254,7 @@ return [
'maximumNumberOfArguments' => 0,
'restFiles' => [
'Deprecation-95326-VariousGetInstanceStaticMethodsOnSingletonInterfaces.rst',
+ 'Breaking-96107-DeprecatedFunctionalityRemoved.rst',
],
],
'TYPO3\CMS\T3editor\Registry\AddonRegistry::getInstance' => [
@@ -1255,6 +1262,7 @@ return [
'maximumNumberOfArguments' => 0,
'restFiles' => [
'Deprecation-95326-VariousGetInstanceStaticMethodsOnSingletonInterfaces.rst',
+ 'Breaking-96107-DeprecatedFunctionalityRemoved.rst',
],
],
'TYPO3\CMS\T3editor\Registry\ModeRegistry::getInstance' => [
@@ -1262,6 +1270,7 @@ return [
'maximumNumberOfArguments' => 0,
'restFiles' => [
'Deprecation-95326-VariousGetInstanceStaticMethodsOnSingletonInterfaces.rst',
+ 'Breaking-96107-DeprecatedFunctionalityRemoved.rst',
],
],
'TYPO3\CMS\Core\Utility\GeneralUtility::isAbsPath' => [
diff --git a/typo3/sysext/t3editor/Classes/Registry/AddonRegistry.php b/typo3/sysext/t3editor/Classes/Registry/AddonRegistry.php
index 94330202c1a8b8ac765921dcba7302c975d1359b..330076a5daf4b47ffecaa084e2dec81f1eb419fd 100644
--- a/typo3/sysext/t3editor/Classes/Registry/AddonRegistry.php
+++ b/typo3/sysext/t3editor/Classes/Registry/AddonRegistry.php
@@ -18,7 +18,6 @@ declare(strict_types=1);
namespace TYPO3\CMS\T3editor\Registry;
use TYPO3\CMS\Core\SingletonInterface;
-use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\T3editor\Addon;
/**
@@ -32,17 +31,6 @@ class AddonRegistry implements SingletonInterface
*/
protected $registeredAddons = [];
- /**
- * @return self
- * @throws \InvalidArgumentException
- * @deprecated will be removed in TYPO3 v12.0. Use Dependency Injection or GeneralUtility::makeInstance() if DI is not possible.
- */
- public static function getInstance(): AddonRegistry
- {
- trigger_error(__CLASS__ . '::getInstance() will be removed in TYPO3 v12.0. Use Dependency Injection or GeneralUtility::makeInstance() if DI is not possible.', E_USER_DEPRECATED);
- return GeneralUtility::makeInstance(static::class);
- }
-
/**
* Registers addons for global use in t3editor
*
diff --git a/typo3/sysext/t3editor/Classes/Registry/ModeRegistry.php b/typo3/sysext/t3editor/Classes/Registry/ModeRegistry.php
index 4cf368bad3c3b8b59f332eacc031110a2c021d78..08705e47d47ff71d5299a3f026646202ad744bb2 100644
--- a/typo3/sysext/t3editor/Classes/Registry/ModeRegistry.php
+++ b/typo3/sysext/t3editor/Classes/Registry/ModeRegistry.php
@@ -18,7 +18,6 @@ declare(strict_types=1);
namespace TYPO3\CMS\T3editor\Registry;
use TYPO3\CMS\Core\SingletonInterface;
-use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\T3editor\Exception\InvalidModeException;
use TYPO3\CMS\T3editor\Mode;
@@ -38,17 +37,6 @@ class ModeRegistry implements SingletonInterface
*/
protected $defaultMode;
- /**
- * @return self
- * @throws \InvalidArgumentException
- * @deprecated will be removed in TYPO3 v12.0. Use Dependency Injection or GeneralUtility::makeInstance() if DI is not possible.
- */
- public static function getInstance(): ModeRegistry
- {
- trigger_error(__CLASS__ . '::getInstance() will be removed in TYPO3 v12.0. Use Dependency Injection or GeneralUtility::makeInstance() if DI is not possible.', E_USER_DEPRECATED);
- return GeneralUtility::makeInstance(static::class);
- }
-
/**
* Registers modes for t3editor
*