Skip to content

Commit b16c024

Browse files
committed
[TASK] Use DI for LoadTcaService in UpgradeController
Resolves: #106714 Releases: main, 13.4 Change-Id: I2d0e18f631c9bd37f60b1d305b69ae9f44168f60 Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/89433 Tested-by: Oli Bartsch <bo@cedev.de> Reviewed-by: Oli Bartsch <bo@cedev.de> Tested-by: core-ci <typo3@b13.com>
1 parent 51971fe commit b16c024

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

typo3/sysext/install/Classes/Controller/UpgradeController.php

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -852,8 +852,7 @@ public function tcaExtTablesCheckAction(ServerRequestInterface $request): Respon
852852
{
853853
$view = $this->initializeView($request);
854854
$messageQueue = new FlashMessageQueue('install');
855-
$loadTcaService = GeneralUtility::makeInstance(LoadTcaService::class);
856-
$loadTcaService->loadExtensionTablesWithoutMigration();
855+
$this->loadTcaService->loadExtensionTablesWithoutMigration();
857856
$baseTca = $GLOBALS['TCA'];
858857
$container = $this->lateBootService->getContainer();
859858
$backup = $this->lateBootService->makeCurrent($container);
@@ -863,7 +862,7 @@ public function tcaExtTablesCheckAction(ServerRequestInterface $request): Respon
863862
$extensionKey = $package->getPackageKey();
864863
$extTablesPath = $package->getPackagePath() . 'ext_tables.php';
865864
if (@file_exists($extTablesPath)) {
866-
$loadTcaService->loadSingleExtTablesFile($extensionKey);
865+
$this->loadTcaService->loadSingleExtTablesFile($extensionKey);
867866
$newTca = $GLOBALS['TCA'];
868867
if ($newTca !== $baseTca) {
869868
$messageQueue->enqueue(new FlashMessage(
@@ -896,7 +895,7 @@ public function tcaMigrationsCheckAction(ServerRequestInterface $request): Respo
896895
{
897896
$view = $this->initializeView($request);
898897
$messageQueue = new FlashMessageQueue('install');
899-
GeneralUtility::makeInstance(LoadTcaService::class)->loadExtensionTablesWithoutMigration();
898+
$this->loadTcaService->loadExtensionTablesWithoutMigration();
900899
$tcaMigration = GeneralUtility::makeInstance(TcaMigration::class);
901900
$GLOBALS['TCA'] = $tcaMigration->migrate($GLOBALS['TCA']);
902901
$tcaMessages = $tcaMigration->getMessages();

0 commit comments

Comments
 (0)