Skip to content
Snippets Groups Projects
Commit dba3996b authored by Georg Ringer's avatar Georg Ringer Committed by Daniel Goerz
Browse files

[TASK] Remove usage of ObjectManager::get in EXT:belog ViewHelpers

With #90803 the ObjectManager::get has been deprecated. Remove its
usages from the ViewHelpers of EXT:belog.

Resolves: #92484
Releases: master
Change-Id: I1970d38a7ff0b9d777656e9af83ecc6012333e5b
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/66017


Reviewed-by: default avatarOliver Klee <typo3-coding@oliverklee.de>
Reviewed-by: default avatarBenni Mack <benni@typo3.org>
Reviewed-by: default avatarDaniel Goerz <daniel.goerz@posteo.de>
Tested-by: default avatarTYPO3com <noreply@typo3.com>
Tested-by: default avatarBenni Mack <benni@typo3.org>
Tested-by: default avatarDaniel Goerz <daniel.goerz@posteo.de>
parent 43fc56a6
Branches
Tags
No related merge requests found
......@@ -15,9 +15,7 @@
namespace TYPO3\CMS\Belog\ViewHelpers;
use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Extbase\Domain\Repository\BackendUserRepository;
use TYPO3\CMS\Extbase\Object\ObjectManager;
use TYPO3\CMS\Backend\Utility\BackendUtility;
use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithRenderStatic;
......@@ -61,12 +59,8 @@ class UsernameViewHelper extends AbstractViewHelper
return static::$usernameRuntimeCache[$uid];
}
$objectManager = GeneralUtility::makeInstance(ObjectManager::class);
$backendUserRepository = $objectManager->get(BackendUserRepository::class);
/** @var \TYPO3\CMS\Extbase\Domain\Model\BackendUser $user */
$user = $backendUserRepository->findByUid($uid);
// $user may be NULL if user was deleted from DB, set it to empty string to always return a string
static::$usernameRuntimeCache[$uid] = $user === null ? '' : $user->getUserName();
$user = BackendUtility::getRecord('be_users', $uid);
static::$usernameRuntimeCache[$uid] = $user['username'] ?? '';
return static::$usernameRuntimeCache[$uid];
}
}
......@@ -15,10 +15,8 @@
namespace TYPO3\CMS\Belog\ViewHelpers;
use TYPO3\CMS\Belog\Domain\Repository\WorkspaceRepository;
use TYPO3\CMS\Backend\Utility\BackendUtility;
use TYPO3\CMS\Core\Utility\ExtensionManagementUtility;
use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Extbase\Object\ObjectManager;
use TYPO3\CMS\Extbase\Utility\LocalizationUtility;
use TYPO3\CMS\Fluid\Core\Rendering\RenderingContext;
use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
......@@ -77,12 +75,8 @@ class WorkspaceTitleViewHelper extends AbstractViewHelper
} elseif (!ExtensionManagementUtility::isLoaded('workspaces')) {
static::$workspaceTitleRuntimeCache[$uid] = '';
} else {
$objectManager = GeneralUtility::makeInstance(ObjectManager::class);
$workspaceRepository = $objectManager->get(WorkspaceRepository::class);
/** @var \TYPO3\CMS\Belog\Domain\Model\Workspace $workspace */
$workspace = $workspaceRepository->findByUid($uid);
// $workspace may be null, force empty string in this case
static::$workspaceTitleRuntimeCache[$uid] = $workspace === null ? '' : $workspace->getTitle();
$workspace = BackendUtility::getRecord('sys_workspace', $uid);
static::$workspaceTitleRuntimeCache[$uid] = $workspace['title'] ?? '';
}
return static::$workspaceTitleRuntimeCache[$uid];
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment