diff --git a/Build/phpstan10.neon b/Build/phpstan10.neon index 80cf7ab3..36264bc6 100644 --- a/Build/phpstan10.neon +++ b/Build/phpstan10.neon @@ -39,3 +39,6 @@ parameters: - message: '#Call to protected method getTypoScriptFrontendController\(\) of class TYPO3\\CMS\\Frontend\\ContentObject\\ContentObjectRenderer.#' path: %currentWorkingDirectory%/Classes/DataProcessing/ContainerProcessor.php + - + message: '#Static method TYPO3\\CMS\\Core\\Core\\Bootstrap::initializeBackendUser\(\) invoked with 2 parameters.*#' + path: %currentWorkingDirectory%/* \ No newline at end of file diff --git a/Classes/Updates/ContainerDeleteChildrenWithWrongPid.php b/Classes/Updates/ContainerDeleteChildrenWithWrongPid.php index fd0cda77..a7a87067 100644 --- a/Classes/Updates/ContainerDeleteChildrenWithWrongPid.php +++ b/Classes/Updates/ContainerDeleteChildrenWithWrongPid.php @@ -15,8 +15,12 @@ use B13\Container\Integrity\Error\WrongPidError; use B13\Container\Integrity\Integrity; use B13\Container\Integrity\IntegrityFix; +use TYPO3\CMS\Core\Authentication\BackendUserAuthentication; use TYPO3\CMS\Core\Core\Bootstrap; use TYPO3\CMS\Core\Core\Environment; +use TYPO3\CMS\Core\Http\ServerRequestFactory; +use TYPO3\CMS\Core\Information\Typo3Version; +use TYPO3\CMS\Core\Utility\GeneralUtility; use TYPO3\CMS\Install\Updates\DatabaseUpdatedPrerequisite; use TYPO3\CMS\Install\Updates\RepeatableInterface; use TYPO3\CMS\Install\Updates\UpgradeWizardInterface; @@ -76,7 +80,13 @@ public function updateNecessary(): bool public function executeUpdate(): bool { if (Environment::isCli() === false) { - Bootstrap::initializeBackendUser(); + if ((GeneralUtility::makeInstance(Typo3Version::class))->getMajorVersion() > 11) { + $requestFactory = GeneralUtility::makeInstance(ServerRequestFactory::class); + $request = $requestFactory::fromGlobals(); + Bootstrap::initializeBackendUser(BackendUserAuthentication::class, $request); + } else { + Bootstrap::initializeBackendUser(); + } Bootstrap::initializeBackendAuthentication(); Bootstrap::initializeLanguageObject(); } diff --git a/Classes/Updates/ContainerMigrateSorting.php b/Classes/Updates/ContainerMigrateSorting.php index a355c9c6..2212c070 100644 --- a/Classes/Updates/ContainerMigrateSorting.php +++ b/Classes/Updates/ContainerMigrateSorting.php @@ -13,8 +13,12 @@ */ use B13\Container\Integrity\Sorting; +use TYPO3\CMS\Core\Authentication\BackendUserAuthentication; use TYPO3\CMS\Core\Core\Bootstrap; use TYPO3\CMS\Core\Core\Environment; +use TYPO3\CMS\Core\Http\ServerRequestFactory; +use TYPO3\CMS\Core\Information\Typo3Version; +use TYPO3\CMS\Core\Utility\GeneralUtility; use TYPO3\CMS\Install\Updates\DatabaseUpdatedPrerequisite; use TYPO3\CMS\Install\Updates\RepeatableInterface; use TYPO3\CMS\Install\Updates\UpgradeWizardInterface; @@ -63,7 +67,13 @@ public function updateNecessary(): bool public function executeUpdate(): bool { if (Environment::isCli() === false) { - Bootstrap::initializeBackendUser(); + if ((GeneralUtility::makeInstance(Typo3Version::class))->getMajorVersion() > 11) { + $requestFactory = GeneralUtility::makeInstance(ServerRequestFactory::class); + $request = $requestFactory::fromGlobals(); + Bootstrap::initializeBackendUser(BackendUserAuthentication::class, $request); + } else { + Bootstrap::initializeBackendUser(); + } Bootstrap::initializeBackendAuthentication(); Bootstrap::initializeLanguageObject(); }