diff --git a/typo3/sysext/backend/Classes/Template/ModuleTemplate.php b/typo3/sysext/backend/Classes/Template/ModuleTemplate.php index 20f855ff05c25814d7b3a3b0f068bf61e299be10..439f47d41711d73e3cb9ced7b395f4285a097fcb 100644 --- a/typo3/sysext/backend/Classes/Template/ModuleTemplate.php +++ b/typo3/sysext/backend/Classes/Template/ModuleTemplate.php @@ -216,18 +216,6 @@ class ModuleTemplate return $this; } - /** - * @deprecated since v11, will be removed in v12 - */ - public function getIconFactory(): IconFactory - { - trigger_error( - 'Method ' . __METHOD__ . ' is deprecated and will be removed in TYPO3 12.0. Inject the service directly instead.', - E_USER_DEPRECATED - ); - return $this->iconFactory; - } - /** * Class constructor * Sets up view and property objects @@ -427,18 +415,6 @@ class ModuleTemplate return $this->pageRenderer->render(); } - /** - * @deprecated since v11, will be removed in v12 - */ - public function getPageRenderer(): PageRenderer - { - trigger_error( - 'Method ' . __METHOD__ . ' is deprecated and will be removed in TYPO3 12.0. Inject the service directly instead.', - E_USER_DEPRECATED - ); - return $this->pageRenderer; - } - /** * Set form tag * 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 50797ba0cece33c2cc9aedfaa756fa5e78343c1e..4e0e6d29ac77cc1e5ee9fa2f0e8238469496db9e 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 @@ -38,6 +38,8 @@ The following PHP class methods that have previously been marked as deprecated f - :php:`\TYPO3\CMS\Core\Domain\Repository\PageRepository->fixVersioningPid()` - :php:`\TYPO3\CMS\Backend\Form\FormDataProvider\AbstractItemProvider->addItemsFromSpecial()` +- :php:`\TYPO3\CMS\Backend\Template\ModuleTemplate->getIconFactory()` +- :php:`\TYPO3\CMS\Backend\Template\ModuleTemplate->getPageRenderer()` The following PHP static class methods that have previously been marked as deprecated for v11 and were now removed: diff --git a/typo3/sysext/install/Configuration/ExtensionScanner/Php/MethodCallMatcher.php b/typo3/sysext/install/Configuration/ExtensionScanner/Php/MethodCallMatcher.php index 2171678b74b9a92164c15c5a734b665879bf7716..9402f19306512810ddc0908ae6ae89cf86e1424b 100644 --- a/typo3/sysext/install/Configuration/ExtensionScanner/Php/MethodCallMatcher.php +++ b/typo3/sysext/install/Configuration/ExtensionScanner/Php/MethodCallMatcher.php @@ -4977,6 +4977,7 @@ return [ 'maximumNumberOfArguments' => 0, 'restFiles' => [ 'Deprecation-95235-PublicGetterOfServicesInModuleTemplate.rst', + 'Breaking-96107-DeprecatedFunctionalityRemoved.rst', ], ], 'TYPO3\CMS\Backend\Template\ModuleTemplate->getPageRenderer' => [ @@ -4984,6 +4985,7 @@ return [ 'maximumNumberOfArguments' => 0, 'restFiles' => [ 'Deprecation-95235-PublicGetterOfServicesInModuleTemplate.rst', + 'Breaking-96107-DeprecatedFunctionalityRemoved.rst', ], ], 'TYPO3\CMS\Core\Configuration\FlexForm\FlexFormTools->getArrayValueByPath' => [