diff --git a/typo3/sysext/belog/Classes/Controller/BackendLogController.php b/typo3/sysext/belog/Classes/Controller/BackendLogController.php
index 8326969ef7ef2f65cac1c53123e9bd96c2b14787..b2774b19377461421a9348f48ce9647cbcafc78a 100644
--- a/typo3/sysext/belog/Classes/Controller/BackendLogController.php
+++ b/typo3/sysext/belog/Classes/Controller/BackendLogController.php
@@ -15,10 +15,14 @@
namespace TYPO3\CMS\Belog\Controller;
+use TYPO3\CMS\Backend\Utility\BackendUtility;
use TYPO3\CMS\Belog\Domain\Model\Constraint;
use TYPO3\CMS\Belog\Domain\Model\LogEntry;
+use TYPO3\CMS\Belog\Domain\Repository\LogEntryRepository;
+use TYPO3\CMS\Belog\Domain\Repository\WorkspaceRepository;
use TYPO3\CMS\Core\Messaging\AbstractMessage;
use TYPO3\CMS\Core\Page\PageRenderer;
+use TYPO3\CMS\Core\Utility\ExtensionManagementUtility;
use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Extbase\Mvc\Controller\ActionController;
use TYPO3\CMS\Extbase\Persistence\QueryResultInterface;
@@ -73,7 +77,7 @@ class BackendLogController extends ActionController
/**
* @param \TYPO3\CMS\Belog\Domain\Repository\LogEntryRepository $logEntryRepository
*/
- public function injectLogEntryRepository(\TYPO3\CMS\Belog\Domain\Repository\LogEntryRepository $logEntryRepository)
+ public function injectLogEntryRepository(LogEntryRepository $logEntryRepository)
{
$this->logEntryRepository = $logEntryRepository;
}
@@ -242,17 +246,17 @@ class BackendLogController extends ActionController
{
$userGroupArray = [];
// Two meta entries: 'all' and 'self'
- $userGroupArray[0] = \TYPO3\CMS\Extbase\Utility\LocalizationUtility::translate('allUsers', 'Belog');
- $userGroupArray[-1] = \TYPO3\CMS\Extbase\Utility\LocalizationUtility::translate('self', 'Belog');
+ $userGroupArray[0] = LocalizationUtility::translate('allUsers', 'Belog');
+ $userGroupArray[-1] = LocalizationUtility::translate('self', 'Belog');
// List of groups, key is gr-'uid'
- $groups = \TYPO3\CMS\Backend\Utility\BackendUtility::getGroupNames();
+ $groups = BackendUtility::getGroupNames();
foreach ($groups as $group) {
- $userGroupArray['gr-' . $group['uid']] = \TYPO3\CMS\Extbase\Utility\LocalizationUtility::translate('group', 'Belog') . ' ' . $group['title'];
+ $userGroupArray['gr-' . $group['uid']] = LocalizationUtility::translate('group', 'Belog') . ' ' . $group['title'];
}
// List of users, key is us-'uid'
- $users = \TYPO3\CMS\Backend\Utility\BackendUtility::getUserNames();
+ $users = BackendUtility::getUserNames();
foreach ($users as $user) {
- $userGroupArray['us-' . $user['uid']] = \TYPO3\CMS\Extbase\Utility\LocalizationUtility::translate('user', 'Belog') . ' ' . $user['username'];
+ $userGroupArray['us-' . $user['uid']] = LocalizationUtility::translate('user', 'Belog') . ' ' . $user['username'];
}
return $userGroupArray;
}
@@ -264,14 +268,14 @@ class BackendLogController extends ActionController
*/
protected function createWorkspaceListForSelectOptions()
{
- if (!\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::isLoaded('workspaces')) {
+ if (!ExtensionManagementUtility::isLoaded('workspaces')) {
return [];
}
$workspaceArray = [];
// Two meta entries: 'all' and 'live'
- $workspaceArray[-99] = \TYPO3\CMS\Extbase\Utility\LocalizationUtility::translate('any', 'Belog');
- $workspaceArray[0] = \TYPO3\CMS\Extbase\Utility\LocalizationUtility::translate('live', 'Belog');
- $workspaces = $this->objectManager->get(\TYPO3\CMS\Belog\Domain\Repository\WorkspaceRepository::class)->findAll();
+ $workspaceArray[-99] = LocalizationUtility::translate('any', 'Belog');
+ $workspaceArray[0] = LocalizationUtility::translate('live', 'Belog');
+ $workspaces = $this->objectManager->get(WorkspaceRepository::class)->findAll();
/** @var \TYPO3\CMS\Belog\Domain\Model\Workspace $workspace */
foreach ($workspaces as $workspace) {
$workspaceArray[$workspace->getUid()] = $workspace->getUid() . ': ' . $workspace->getTitle();
@@ -305,12 +309,12 @@ class BackendLogController extends ActionController
protected function createPageDepthOptions()
{
$options = [
- 0 => \TYPO3\CMS\Extbase\Utility\LocalizationUtility::translate('LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:labels.depth_0', 'lang'),
- 1 => \TYPO3\CMS\Extbase\Utility\LocalizationUtility::translate('LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:labels.depth_1', 'lang'),
- 2 => \TYPO3\CMS\Extbase\Utility\LocalizationUtility::translate('LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:labels.depth_2', 'lang'),
- 3 => \TYPO3\CMS\Extbase\Utility\LocalizationUtility::translate('LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:labels.depth_3', 'lang'),
- 4 => \TYPO3\CMS\Extbase\Utility\LocalizationUtility::translate('LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:labels.depth_4', 'lang'),
- 999 => \TYPO3\CMS\Extbase\Utility\LocalizationUtility::translate('LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:labels.depth_infi', 'lang')
+ 0 => LocalizationUtility::translate('LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:labels.depth_0', 'lang'),
+ 1 => LocalizationUtility::translate('LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:labels.depth_1', 'lang'),
+ 2 => LocalizationUtility::translate('LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:labels.depth_2', 'lang'),
+ 3 => LocalizationUtility::translate('LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:labels.depth_3', 'lang'),
+ 4 => LocalizationUtility::translate('LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:labels.depth_4', 'lang'),
+ 999 => LocalizationUtility::translate('LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:labels.depth_infi', 'lang')
];
return $options;
}
diff --git a/typo3/sysext/belog/Classes/Domain/Model/Constraint.php b/typo3/sysext/belog/Classes/Domain/Model/Constraint.php
index 1a7ad96dd523399cfbcb4c53ce7c34840122754b..49211c10dbf255e57902ab4003431a19d8bfe8eb 100644
--- a/typo3/sysext/belog/Classes/Domain/Model/Constraint.php
+++ b/typo3/sysext/belog/Classes/Domain/Model/Constraint.php
@@ -40,7 +40,7 @@ class Constraint
*
* @var int
*/
- protected $workspaceUid = \TYPO3\CMS\Belog\Domain\Model\Workspace::UID_ANY_WORKSPACE;
+ protected $workspaceUid = Workspace::UID_ANY_WORKSPACE;
/**
* Selected time frame
diff --git a/typo3/sysext/belog/Classes/Domain/Model/LogEntry.php b/typo3/sysext/belog/Classes/Domain/Model/LogEntry.php
index bad00764f2aa97e5c765e3a2befc470d55e611bc..df92d913249252d1e7a7797213394da6629a8dca 100644
--- a/typo3/sysext/belog/Classes/Domain/Model/LogEntry.php
+++ b/typo3/sysext/belog/Classes/Domain/Model/LogEntry.php
@@ -15,6 +15,8 @@
namespace TYPO3\CMS\Belog\Domain\Model;
+use TYPO3\CMS\Extbase\DomainObject\AbstractEntity;
+
/**
* A sys log entry
* This model is 'complete': All current database properties are in there.
@@ -22,7 +24,7 @@ namespace TYPO3\CMS\Belog\Domain\Model;
* @todo : This should be stuffed to some more central place
* @internal This class is a TYPO3 Backend implementation and is not considered part of the Public TYPO3 API.
*/
-class LogEntry extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
+class LogEntry extends AbstractEntity
{
/**
* Storage page ID of the log entry
diff --git a/typo3/sysext/belog/Classes/Domain/Model/Workspace.php b/typo3/sysext/belog/Classes/Domain/Model/Workspace.php
index 623a20cafa22de8445cbc4bc06c0c3c1d835d005..dcc9e63a400e36ddec70e677f83faa3ca45239ef 100644
--- a/typo3/sysext/belog/Classes/Domain/Model/Workspace.php
+++ b/typo3/sysext/belog/Classes/Domain/Model/Workspace.php
@@ -15,13 +15,15 @@
namespace TYPO3\CMS\Belog\Domain\Model;
+use TYPO3\CMS\Extbase\DomainObject\AbstractEntity;
+
/**
* Stub model for workspaces - only properties required for belog module are added currently
*
* @todo : This should be extended and put at some more central place
* @internal This class is a TYPO3 Backend implementation and is not considered part of the Public TYPO3 API.
*/
-class Workspace extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
+class Workspace extends AbstractEntity
{
/**
* @var int
diff --git a/typo3/sysext/belog/Classes/Domain/Repository/LogEntryRepository.php b/typo3/sysext/belog/Classes/Domain/Repository/LogEntryRepository.php
index 7b85e6e340627ea974d642c35b00b6864a8fbb4f..33e24ffb675596f049a33e8c8dad27b15a6601a7 100644
--- a/typo3/sysext/belog/Classes/Domain/Repository/LogEntryRepository.php
+++ b/typo3/sysext/belog/Classes/Domain/Repository/LogEntryRepository.php
@@ -15,16 +15,23 @@
namespace TYPO3\CMS\Belog\Domain\Repository;
+use TYPO3\CMS\Backend\Tree\View\PageTreeView;
+use TYPO3\CMS\Backend\Utility\BackendUtility;
+use TYPO3\CMS\Belog\Domain\Model\Constraint;
use TYPO3\CMS\Belog\Domain\Model\LogEntry;
+use TYPO3\CMS\Belog\Domain\Model\Workspace;
use TYPO3\CMS\Core\Database\ConnectionPool;
use TYPO3\CMS\Core\Type\Bitmask\Permission;
use TYPO3\CMS\Core\Utility\GeneralUtility;
+use TYPO3\CMS\Extbase\Persistence\Generic\QuerySettingsInterface;
+use TYPO3\CMS\Extbase\Persistence\QueryInterface;
+use TYPO3\CMS\Extbase\Persistence\Repository;
/**
* Sys log entry repository
* @internal This class is a TYPO3 Backend implementation and is not considered part of the Public TYPO3 API.
*/
-class LogEntryRepository extends \TYPO3\CMS\Extbase\Persistence\Repository
+class LogEntryRepository extends Repository
{
/**
* Backend users, with UID as key
@@ -40,7 +47,7 @@ class LogEntryRepository extends \TYPO3\CMS\Extbase\Persistence\Repository
{
$this->beUserList = $this->getBackendUsers();
/** @var \TYPO3\CMS\Extbase\Persistence\Generic\QuerySettingsInterface $defaultQuerySettings */
- $defaultQuerySettings = $this->objectManager->get(\TYPO3\CMS\Extbase\Persistence\Generic\QuerySettingsInterface::class);
+ $defaultQuerySettings = $this->objectManager->get(QuerySettingsInterface::class);
$defaultQuerySettings->setRespectStoragePage(false);
$this->setDefaultQuerySettings($defaultQuerySettings);
}
@@ -51,14 +58,14 @@ class LogEntryRepository extends \TYPO3\CMS\Extbase\Persistence\Repository
* @param \TYPO3\CMS\Belog\Domain\Model\Constraint $constraint
* @return \TYPO3\CMS\Extbase\Persistence\QueryResultInterface
*/
- public function findByConstraint(\TYPO3\CMS\Belog\Domain\Model\Constraint $constraint)
+ public function findByConstraint(Constraint $constraint)
{
$query = $this->createQuery();
$queryConstraints = $this->createQueryConstraints($query, $constraint);
if (!empty($queryConstraints)) {
$query->matching($query->logicalAnd($queryConstraints));
}
- $query->setOrderings(['uid' => \TYPO3\CMS\Extbase\Persistence\QueryInterface::ORDER_DESCENDING]);
+ $query->setOrderings(['uid' => QueryInterface::ORDER_DESCENDING]);
$query->setLimit($constraint->getNumber());
return $query->execute();
}
@@ -70,13 +77,13 @@ class LogEntryRepository extends \TYPO3\CMS\Extbase\Persistence\Repository
* @param \TYPO3\CMS\Belog\Domain\Model\Constraint $constraint
* @return array|\TYPO3\CMS\Extbase\Persistence\Generic\Qom\ConstraintInterface[]
*/
- protected function createQueryConstraints(\TYPO3\CMS\Extbase\Persistence\QueryInterface $query, \TYPO3\CMS\Belog\Domain\Model\Constraint $constraint)
+ protected function createQueryConstraints(QueryInterface $query, Constraint $constraint)
{
$queryConstraints = [];
// User / group handling
$this->addUsersAndGroupsToQueryConstraints($constraint, $query, $queryConstraints);
// Workspace
- if ($constraint->getWorkspaceUid() != \TYPO3\CMS\Belog\Domain\Model\Workspace::UID_ANY_WORKSPACE) {
+ if ($constraint->getWorkspaceUid() != Workspace::UID_ANY_WORKSPACE) {
$queryConstraints[] = $query->equals('workspace', $constraint->getWorkspaceUid());
}
// Action (type):
@@ -102,13 +109,13 @@ class LogEntryRepository extends \TYPO3\CMS\Extbase\Persistence\Repository
* @param \TYPO3\CMS\Extbase\Persistence\QueryInterface $query
* @param array $queryConstraints the query constraints to add to, will be modified
*/
- protected function addPageTreeConstraintsToQuery(\TYPO3\CMS\Belog\Domain\Model\Constraint $constraint, \TYPO3\CMS\Extbase\Persistence\QueryInterface $query, array &$queryConstraints)
+ protected function addPageTreeConstraintsToQuery(Constraint $constraint, QueryInterface $query, array &$queryConstraints)
{
$pageIds = [];
// Check if we should get a whole tree of pages and not only a single page
if ($constraint->getDepth() > 0) {
/** @var \TYPO3\CMS\Backend\Tree\View\PageTreeView $pageTree */
- $pageTree = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\TYPO3\CMS\Backend\Tree\View\PageTreeView::class);
+ $pageTree = GeneralUtility::makeInstance(PageTreeView::class);
$pageTree->init('AND ' . $GLOBALS['BE_USER']->getPagePermsClause(Permission::PAGE_SHOW));
$pageTree->makeHTML = 0;
$pageTree->fieldArray = ['uid'];
@@ -130,7 +137,7 @@ class LogEntryRepository extends \TYPO3\CMS\Extbase\Persistence\Repository
* @param \TYPO3\CMS\Extbase\Persistence\QueryInterface $query
* @param array $queryConstraints the query constraints to add to, will be modified
*/
- protected function addUsersAndGroupsToQueryConstraints(\TYPO3\CMS\Belog\Domain\Model\Constraint $constraint, \TYPO3\CMS\Extbase\Persistence\QueryInterface $query, array &$queryConstraints)
+ protected function addUsersAndGroupsToQueryConstraints(Constraint $constraint, QueryInterface $query, array &$queryConstraints)
{
$userOrGroup = $constraint->getUserOrGroup();
if ($userOrGroup === '') {
@@ -141,7 +148,7 @@ class LogEntryRepository extends \TYPO3\CMS\Extbase\Persistence\Repository
$groupId = (int)substr($userOrGroup, 3);
$userIds = [];
foreach ($this->beUserList as $userId => $userData) {
- if (\TYPO3\CMS\Core\Utility\GeneralUtility::inList($userData['usergroup_cached_list'], $groupId)) {
+ if (GeneralUtility::inList($userData['usergroup_cached_list'], $groupId)) {
$userIds[] = $userId;
}
}
@@ -187,6 +194,6 @@ class LogEntryRepository extends \TYPO3\CMS\Extbase\Persistence\Repository
*/
protected function getBackendUsers()
{
- return \TYPO3\CMS\Backend\Utility\BackendUtility::getUserNames();
+ return BackendUtility::getUserNames();
}
}
diff --git a/typo3/sysext/belog/Classes/Domain/Repository/WorkspaceRepository.php b/typo3/sysext/belog/Classes/Domain/Repository/WorkspaceRepository.php
index a110a2d63f31a353b576c7f43faa27135be80328..16f4e51144fd44288f62065cf6500f43d4212697 100644
--- a/typo3/sysext/belog/Classes/Domain/Repository/WorkspaceRepository.php
+++ b/typo3/sysext/belog/Classes/Domain/Repository/WorkspaceRepository.php
@@ -15,12 +15,15 @@
namespace TYPO3\CMS\Belog\Domain\Repository;
+use TYPO3\CMS\Extbase\Persistence\Generic\QuerySettingsInterface;
+use TYPO3\CMS\Extbase\Persistence\Repository;
+
/**
* Repository for workspaces
* @todo This should be moved to EXT:workspaces if EXT:belog works no matter if workspaces are installed or not
* @internal This class is a TYPO3 Backend implementation and is not considered part of the Public TYPO3 API.
*/
-class WorkspaceRepository extends \TYPO3\CMS\Extbase\Persistence\Repository
+class WorkspaceRepository extends Repository
{
/**
* Initializes the repository.
@@ -28,7 +31,7 @@ class WorkspaceRepository extends \TYPO3\CMS\Extbase\Persistence\Repository
public function initializeObject()
{
/** @var \TYPO3\CMS\Extbase\Persistence\Generic\QuerySettingsInterface $querySettings */
- $querySettings = $this->objectManager->get(\TYPO3\CMS\Extbase\Persistence\Generic\QuerySettingsInterface::class);
+ $querySettings = $this->objectManager->get(QuerySettingsInterface::class);
$querySettings->setRespectStoragePage(false);
$this->setDefaultQuerySettings($querySettings);
}
diff --git a/typo3/sysext/belog/Classes/Module/BackendLogModuleBootstrap.php b/typo3/sysext/belog/Classes/Module/BackendLogModuleBootstrap.php
index 84377523bec02aa76b868df8f2934c2da9f2c68e..a192b1c2d0782d7d865ea764c7209384d09af738 100644
--- a/typo3/sysext/belog/Classes/Module/BackendLogModuleBootstrap.php
+++ b/typo3/sysext/belog/Classes/Module/BackendLogModuleBootstrap.php
@@ -16,6 +16,7 @@
namespace TYPO3\CMS\Belog\Module;
use Psr\Http\Message\ServerRequestInterface;
+use TYPO3\CMS\Backend\Routing\Route;
use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Extbase\Core\Bootstrap;
@@ -49,7 +50,7 @@ class BackendLogModuleBootstrap
];
$options['moduleName'] = 'system_BelogLog';
- $route = GeneralUtility::makeInstance(\TYPO3\CMS\Backend\Routing\Route::class, '/system/BelogLog/', $options);
+ $route = GeneralUtility::makeInstance(Route::class, '/system/BelogLog/', $options);
$serverRequest = $serverRequest->withAttribute('route', $route);
$extbaseBootstrap = GeneralUtility::makeInstance(Bootstrap::class);
return $extbaseBootstrap->handleBackendRequest($serverRequest);
diff --git a/typo3/sysext/belog/Classes/ViewHelpers/Form/TranslateLabelSelectViewHelper.php b/typo3/sysext/belog/Classes/ViewHelpers/Form/TranslateLabelSelectViewHelper.php
index 8e68088e0a5e999185cf847fc12ff020073ca324..6b71630fa686862f56d904dfc6844ac0d7ac8d2a 100644
--- a/typo3/sysext/belog/Classes/ViewHelpers/Form/TranslateLabelSelectViewHelper.php
+++ b/typo3/sysext/belog/Classes/ViewHelpers/Form/TranslateLabelSelectViewHelper.php
@@ -15,6 +15,9 @@
namespace TYPO3\CMS\Belog\ViewHelpers\Form;
+use TYPO3\CMS\Extbase\Utility\LocalizationUtility;
+use TYPO3\CMS\Fluid\ViewHelpers\Form\SelectViewHelper;
+
/**
* Extends the usual select ViewHelper, but additionally translates
* the select option labels
@@ -25,7 +28,7 @@ namespace TYPO3\CMS\Belog\ViewHelpers\Form;
* Will lookup number.200 (or whatever optionValue is given) in locallang database
* @internal
*/
-class TranslateLabelSelectViewHelper extends \TYPO3\CMS\Fluid\ViewHelpers\Form\SelectViewHelper
+class TranslateLabelSelectViewHelper extends SelectViewHelper
{
/**
* Initialize arguments.
@@ -65,7 +68,7 @@ class TranslateLabelSelectViewHelper extends \TYPO3\CMS\Fluid\ViewHelpers\Form\S
return '';
}
$labelKey = $this->hasArgument('optionLabelPrefix') ? $this->arguments['optionLabelPrefix'] . $label : $label;
- $translatedLabel = \TYPO3\CMS\Extbase\Utility\LocalizationUtility::translate($labelKey, $this->renderingContext->getControllerContext()->getRequest()->getControllerExtensionName());
+ $translatedLabel = LocalizationUtility::translate($labelKey, $this->renderingContext->getControllerContext()->getRequest()->getControllerExtensionName());
return $translatedLabel ?: $label;
}
}
diff --git a/typo3/sysext/belog/Tests/Unit/Domain/Model/ConstraintTest.php b/typo3/sysext/belog/Tests/Unit/Domain/Model/ConstraintTest.php
index a23defd124b58fb5d5e7b534b5b7a72c26ad52e7..b531c4cc76d974fd11d9844ce481ab86532da71b 100644
--- a/typo3/sysext/belog/Tests/Unit/Domain/Model/ConstraintTest.php
+++ b/typo3/sysext/belog/Tests/Unit/Domain/Model/ConstraintTest.php
@@ -15,6 +15,7 @@
namespace TYPO3\CMS\Belog\Tests\Unit\Domain\Model;
+use TYPO3\CMS\Belog\Domain\Model\Constraint;
use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
/**
@@ -30,7 +31,7 @@ class ConstraintTest extends UnitTestCase
protected function setUp(): void
{
parent::setUp();
- $this->subject = new \TYPO3\CMS\Belog\Domain\Model\Constraint();
+ $this->subject = new Constraint();
}
/**
diff --git a/typo3/sysext/belog/Tests/Unit/Domain/Model/LogEntryTest.php b/typo3/sysext/belog/Tests/Unit/Domain/Model/LogEntryTest.php
index 2f8750a436f297ff087d7c8d51c77e1c36b997e4..1629f6faf29e82a105d5d0bebb2048c9cff84079 100644
--- a/typo3/sysext/belog/Tests/Unit/Domain/Model/LogEntryTest.php
+++ b/typo3/sysext/belog/Tests/Unit/Domain/Model/LogEntryTest.php
@@ -15,6 +15,7 @@
namespace TYPO3\CMS\Belog\Tests\Unit\Domain\Model;
+use TYPO3\CMS\Belog\Domain\Model\LogEntry;
use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
/**
@@ -30,7 +31,7 @@ class LogEntryTest extends UnitTestCase
protected function setUp(): void
{
parent::setUp();
- $this->subject = new \TYPO3\CMS\Belog\Domain\Model\LogEntry();
+ $this->subject = new LogEntry();
}
/**
diff --git a/typo3/sysext/belog/Tests/Unit/Domain/Repository/LogEntryRepositoryTest.php b/typo3/sysext/belog/Tests/Unit/Domain/Repository/LogEntryRepositoryTest.php
index bd5f61cec7d2bda2a7e3c19ce9695a421383a9aa..6939ff73fbd63a5a3b58661b62b6f727f521f218 100644
--- a/typo3/sysext/belog/Tests/Unit/Domain/Repository/LogEntryRepositoryTest.php
+++ b/typo3/sysext/belog/Tests/Unit/Domain/Repository/LogEntryRepositoryTest.php
@@ -15,6 +15,9 @@
namespace TYPO3\CMS\Belog\Tests\Unit\Domain\Repository;
+use TYPO3\CMS\Belog\Domain\Repository\LogEntryRepository;
+use TYPO3\CMS\Extbase\Object\ObjectManagerInterface;
+use TYPO3\CMS\Extbase\Persistence\Generic\QuerySettingsInterface;
use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
/**
@@ -28,12 +31,12 @@ class LogEntryRepositoryTest extends UnitTestCase
public function initializeObjectSetsRespectStoragePidToFalse()
{
/** @var \TYPO3\CMS\Extbase\Persistence\Generic\Typo3QuerySettings $querySettings */
- $querySettings = $this->getMockBuilder(\TYPO3\CMS\Extbase\Persistence\Generic\QuerySettingsInterface::class)->getMock();
- $objectManager = $this->getMockBuilder(\TYPO3\CMS\Extbase\Object\ObjectManagerInterface::class)->getMock();
- $objectManager->expects(self::any())->method('get')->with(\TYPO3\CMS\Extbase\Persistence\Generic\QuerySettingsInterface::class)->willReturn($querySettings);
+ $querySettings = $this->getMockBuilder(QuerySettingsInterface::class)->getMock();
+ $objectManager = $this->getMockBuilder(ObjectManagerInterface::class)->getMock();
+ $objectManager->expects(self::any())->method('get')->with(QuerySettingsInterface::class)->willReturn($querySettings);
$querySettings->expects(self::atLeastOnce())->method('setRespectStoragePage')->with(false);
/** @var \TYPO3\CMS\Belog\Domain\Repository\LogEntryRepository|\PHPUnit\Framework\MockObject\MockObject $subject */
- $subject = $this->getMockBuilder(\TYPO3\CMS\Belog\Domain\Repository\LogEntryRepository::class)
+ $subject = $this->getMockBuilder(LogEntryRepository::class)
->setMethods(['setDefaultQuerySettings', 'getBackendUsers'])
->setConstructorArgs([$objectManager])
->getMock();
diff --git a/typo3/sysext/belog/Tests/Unit/Domain/Repository/WorkspaceRepositoryTest.php b/typo3/sysext/belog/Tests/Unit/Domain/Repository/WorkspaceRepositoryTest.php
index aedbbb0e8248099df520369baf3bde1037c59d68..0782f4fbc1d05d0b1ad7aaabc6b382f2e470cea5 100644
--- a/typo3/sysext/belog/Tests/Unit/Domain/Repository/WorkspaceRepositoryTest.php
+++ b/typo3/sysext/belog/Tests/Unit/Domain/Repository/WorkspaceRepositoryTest.php
@@ -15,6 +15,9 @@
namespace TYPO3\CMS\Belog\Tests\Unit\Domain\Repository;
+use TYPO3\CMS\Belog\Domain\Repository\WorkspaceRepository;
+use TYPO3\CMS\Extbase\Object\ObjectManagerInterface;
+use TYPO3\CMS\Extbase\Persistence\Generic\QuerySettingsInterface;
use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
/**
@@ -27,11 +30,11 @@ class WorkspaceRepositoryTest extends UnitTestCase
*/
public function initializeObjectSetsRespectStoragePidToFalse()
{
- $querySettings = $this->getMockBuilder(\TYPO3\CMS\Extbase\Persistence\Generic\QuerySettingsInterface::class)->getMock();
- $objectManager = $this->getMockBuilder(\TYPO3\CMS\Extbase\Object\ObjectManagerInterface::class)->getMock();
- $objectManager->expects(self::any())->method('get')->with(\TYPO3\CMS\Extbase\Persistence\Generic\QuerySettingsInterface::class)->willReturn($querySettings);
+ $querySettings = $this->getMockBuilder(QuerySettingsInterface::class)->getMock();
+ $objectManager = $this->getMockBuilder(ObjectManagerInterface::class)->getMock();
+ $objectManager->expects(self::any())->method('get')->with(QuerySettingsInterface::class)->willReturn($querySettings);
$querySettings->expects(self::atLeastOnce())->method('setRespectStoragePage')->with(false);
- $subject = $this->getMockBuilder(\TYPO3\CMS\Belog\Domain\Repository\WorkspaceRepository::class)
+ $subject = $this->getMockBuilder(WorkspaceRepository::class)
->setMethods(['setDefaultQuerySettings'])
->setConstructorArgs([$objectManager])
->getMock();
diff --git a/typo3/sysext/beuser/Classes/Controller/BackendUserController.php b/typo3/sysext/beuser/Classes/Controller/BackendUserController.php
index 9e0a259fe54214aa0077433912d9a4be13847548..6c74981964dafec52ac92f4d514d963f87e68429 100644
--- a/typo3/sysext/beuser/Classes/Controller/BackendUserController.php
+++ b/typo3/sysext/beuser/Classes/Controller/BackendUserController.php
@@ -17,7 +17,9 @@ namespace TYPO3\CMS\Beuser\Controller;
use TYPO3\CMS\Backend\Authentication\Event\SwitchUserEvent;
use TYPO3\CMS\Backend\Authentication\PasswordReset;
+use TYPO3\CMS\Backend\Utility\BackendUtility;
use TYPO3\CMS\Beuser\Domain\Model\BackendUser;
+use TYPO3\CMS\Beuser\Domain\Model\Demand;
use TYPO3\CMS\Beuser\Domain\Repository\BackendUserGroupRepository;
use TYPO3\CMS\Beuser\Domain\Repository\BackendUserRepository;
use TYPO3\CMS\Beuser\Domain\Repository\BackendUserSessionRepository;
@@ -31,6 +33,9 @@ use TYPO3\CMS\Core\Session\SessionManager;
use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Core\Utility\HttpUtility;
use TYPO3\CMS\Extbase\Mvc\Controller\ActionController;
+use TYPO3\CMS\Extbase\Mvc\Exception\StopActionException;
+use TYPO3\CMS\Extbase\Mvc\RequestInterface;
+use TYPO3\CMS\Extbase\Mvc\ResponseInterface;
use TYPO3\CMS\Extbase\Mvc\View\ViewInterface;
use TYPO3\CMS\Extbase\Utility\LocalizationUtility;
@@ -96,14 +101,14 @@ class BackendUserController extends ActionController
* @param \TYPO3\CMS\Extbase\Mvc\ResponseInterface $response
* @throws \TYPO3\CMS\Extbase\Mvc\Exception\StopActionException
*/
- public function processRequest(\TYPO3\CMS\Extbase\Mvc\RequestInterface $request, \TYPO3\CMS\Extbase\Mvc\ResponseInterface $response)
+ public function processRequest(RequestInterface $request, ResponseInterface $response)
{
$this->moduleData = $this->moduleDataStorageService->loadModuleData();
// We "finally" persist the module data.
try {
parent::processRequest($request, $response);
$this->moduleDataStorageService->persistModuleData($this->moduleData);
- } catch (\TYPO3\CMS\Extbase\Mvc\Exception\StopActionException $e) {
+ } catch (StopActionException $e) {
$this->moduleDataStorageService->persistModuleData($this->moduleData);
throw $e;
}
@@ -128,7 +133,7 @@ class BackendUserController extends ActionController
*
* @param \TYPO3\CMS\Beuser\Domain\Model\Demand $demand
*/
- public function indexAction(\TYPO3\CMS\Beuser\Domain\Model\Demand $demand = null)
+ public function indexAction(Demand $demand = null)
{
if ($demand === null) {
$demand = $this->moduleData->getDemand();
@@ -290,7 +295,7 @@ class BackendUserController extends ActionController
* @param \TYPO3\CMS\Beuser\Domain\Model\BackendUser $backendUser
* @param string $sessionId
*/
- protected function terminateBackendUserSessionAction(\TYPO3\CMS\Beuser\Domain\Model\BackendUser $backendUser, $sessionId)
+ protected function terminateBackendUserSessionAction(BackendUser $backendUser, $sessionId)
{
$sessionBackend = $this->getSessionBackend();
$success = $sessionBackend->remove($sessionId);
@@ -308,7 +313,7 @@ class BackendUserController extends ActionController
*/
protected function switchUser($switchUser)
{
- $targetUser = \TYPO3\CMS\Backend\Utility\BackendUtility::getRecord('be_users', $switchUser);
+ $targetUser = BackendUtility::getRecord('be_users', $switchUser);
if (is_array($targetUser) && $this->getBackendUserAuthentication()->isAdmin()) {
// Set backend user listing module as starting module for switchback
$this->getBackendUserAuthentication()->uc['startModuleOnFirstLogin'] = 'system_BeuserTxBeuser';
diff --git a/typo3/sysext/beuser/Classes/Controller/BackendUserGroupController.php b/typo3/sysext/beuser/Classes/Controller/BackendUserGroupController.php
index 56141d1f13c1e08f24dd9f001f89d6da69702acf..d404155037e04a749256a6260703df8629de62c8 100644
--- a/typo3/sysext/beuser/Classes/Controller/BackendUserGroupController.php
+++ b/typo3/sysext/beuser/Classes/Controller/BackendUserGroupController.php
@@ -15,6 +15,7 @@
namespace TYPO3\CMS\Beuser\Controller;
+use TYPO3\CMS\Beuser\Domain\Repository\BackendUserGroupRepository;
use TYPO3\CMS\Beuser\Service\UserInformationService;
use TYPO3\CMS\Core\Authentication\BackendUserAuthentication;
use TYPO3\CMS\Extbase\Mvc\Controller\ActionController;
@@ -33,7 +34,7 @@ class BackendUserGroupController extends ActionController
/**
* @param \TYPO3\CMS\Beuser\Domain\Repository\BackendUserGroupRepository $backendUserGroupRepository
*/
- public function injectBackendUserGroupRepository(\TYPO3\CMS\Beuser\Domain\Repository\BackendUserGroupRepository $backendUserGroupRepository)
+ public function injectBackendUserGroupRepository(BackendUserGroupRepository $backendUserGroupRepository)
{
$this->backendUserGroupRepository = $backendUserGroupRepository;
}
diff --git a/typo3/sysext/beuser/Classes/Domain/Model/BackendUserGroup.php b/typo3/sysext/beuser/Classes/Domain/Model/BackendUserGroup.php
index d1779a780bc42f79224a1038bff40b6659c69c9c..7d6d9b8cc5093a06e30ca97621eadba5e8df47b8 100644
--- a/typo3/sysext/beuser/Classes/Domain/Model/BackendUserGroup.php
+++ b/typo3/sysext/beuser/Classes/Domain/Model/BackendUserGroup.php
@@ -16,12 +16,13 @@
namespace TYPO3\CMS\Beuser\Domain\Model;
use TYPO3\CMS\Extbase\Annotation as Extbase;
+use TYPO3\CMS\Extbase\DomainObject\AbstractEntity;
/**
* Model for backend user group
* @internal This class is a TYPO3 Backend implementation and is not considered part of the Public TYPO3 API.
*/
-class BackendUserGroup extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
+class BackendUserGroup extends AbstractEntity
{
/**
* @var string
diff --git a/typo3/sysext/beuser/Classes/Domain/Model/Demand.php b/typo3/sysext/beuser/Classes/Domain/Model/Demand.php
index 72a5b5c06d0357d1627f3d716760c2377b1dbe77..ee0756b8a6086f801892209eea1e55d8dd346b44 100644
--- a/typo3/sysext/beuser/Classes/Domain/Model/Demand.php
+++ b/typo3/sysext/beuser/Classes/Domain/Model/Demand.php
@@ -15,11 +15,13 @@
namespace TYPO3\CMS\Beuser\Domain\Model;
+use TYPO3\CMS\Extbase\DomainObject\AbstractEntity;
+
/**
* Demand filter for listings
* @internal This class is a TYPO3 Backend implementation and is not considered part of the Public TYPO3 API.
*/
-class Demand extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
+class Demand extends AbstractEntity
{
/**
* @var int
diff --git a/typo3/sysext/beuser/Classes/Domain/Model/ModuleData.php b/typo3/sysext/beuser/Classes/Domain/Model/ModuleData.php
index 415aad33b25873497999d5b62a949a03bf625822..ebfd6db8e29fc8576b14e3a114a217c7d61a2215 100644
--- a/typo3/sysext/beuser/Classes/Domain/Model/ModuleData.php
+++ b/typo3/sysext/beuser/Classes/Domain/Model/ModuleData.php
@@ -34,7 +34,7 @@ class ModuleData
/**
* @param \TYPO3\CMS\Beuser\Domain\Model\Demand $demand
*/
- public function injectDemand(\TYPO3\CMS\Beuser\Domain\Model\Demand $demand)
+ public function injectDemand(Demand $demand)
{
$this->demand = $demand;
}
@@ -50,7 +50,7 @@ class ModuleData
/**
* @param \TYPO3\CMS\Beuser\Domain\Model\Demand $demand
*/
- public function setDemand(\TYPO3\CMS\Beuser\Domain\Model\Demand $demand)
+ public function setDemand(Demand $demand)
{
$this->demand = $demand;
}
diff --git a/typo3/sysext/beuser/Classes/Domain/Repository/BackendUserGroupRepository.php b/typo3/sysext/beuser/Classes/Domain/Repository/BackendUserGroupRepository.php
index 35c2596f2ae7d4b86326cdb0ab7e36a4dde808a7..2ddd93d9c5b44026347b468c407a59916ce865c5 100644
--- a/typo3/sysext/beuser/Classes/Domain/Repository/BackendUserGroupRepository.php
+++ b/typo3/sysext/beuser/Classes/Domain/Repository/BackendUserGroupRepository.php
@@ -15,17 +15,20 @@
namespace TYPO3\CMS\Beuser\Domain\Repository;
+use TYPO3\CMS\Extbase\Persistence\QueryInterface;
+use TYPO3\CMS\Extbase\Persistence\Repository;
+
/**
* Repository for \TYPO3\CMS\Beuser\Domain\Model\BackendUserGroup
* @internal This class is a TYPO3 Backend implementation and is not considered part of the Public TYPO3 API.
*/
-class BackendUserGroupRepository extends \TYPO3\CMS\Extbase\Persistence\Repository
+class BackendUserGroupRepository extends Repository
{
/**
* @var array Default order is by title ascending
*/
protected $defaultOrderings = [
- 'title' => \TYPO3\CMS\Extbase\Persistence\QueryInterface::ORDER_ASCENDING
+ 'title' => QueryInterface::ORDER_ASCENDING
];
/**
diff --git a/typo3/sysext/beuser/Classes/Hook/BackendControllerHook.php b/typo3/sysext/beuser/Classes/Hook/BackendControllerHook.php
index 59829050ac52f1f88fa4872fc97f6bc12f5392bf..53e4599d806adb300f9b9b8c1f97d517a7abf7a6 100644
--- a/typo3/sysext/beuser/Classes/Hook/BackendControllerHook.php
+++ b/typo3/sysext/beuser/Classes/Hook/BackendControllerHook.php
@@ -16,6 +16,7 @@
namespace TYPO3\CMS\Beuser\Hook;
use TYPO3\CMS\Backend\Controller\BackendController;
+use TYPO3\CMS\Backend\Routing\UriBuilder;
use TYPO3\CMS\Core\Page\PageRenderer;
use TYPO3\CMS\Core\Utility\GeneralUtility;
@@ -34,7 +35,7 @@ class BackendControllerHook
public function addJavaScript(array $configuration, BackendController $backendController)
{
/** @var \TYPO3\CMS\Backend\Routing\UriBuilder $uriBuilder */
- $uriBuilder = GeneralUtility::makeInstance(\TYPO3\CMS\Backend\Routing\UriBuilder::class);
+ $uriBuilder = GeneralUtility::makeInstance(UriBuilder::class);
$this->getPageRenderer()->addInlineSetting('AccessPermissions', 'moduleUrl', (string)$uriBuilder->buildUriFromRoute('system_BeuserTxPermission'));
}
diff --git a/typo3/sysext/beuser/Classes/Hook/SwitchBackUserHook.php b/typo3/sysext/beuser/Classes/Hook/SwitchBackUserHook.php
index 6433b57acfa4a91d8cc14c176d0dd15074dd6f64..7d1c55a4bea6f72c8abca985c787644a622ee744 100644
--- a/typo3/sysext/beuser/Classes/Hook/SwitchBackUserHook.php
+++ b/typo3/sysext/beuser/Classes/Hook/SwitchBackUserHook.php
@@ -15,10 +15,13 @@
namespace TYPO3\CMS\Beuser\Hook;
+use TYPO3\CMS\Backend\Routing\UriBuilder;
+use TYPO3\CMS\Beuser\Domain\Repository\BackendUserSessionRepository;
use TYPO3\CMS\Core\Authentication\AbstractUserAuthentication;
use TYPO3\CMS\Core\Authentication\BackendUserAuthentication;
use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Core\Utility\HttpUtility;
+use TYPO3\CMS\Extbase\Object\ObjectManager;
/**
* Backend user switchback, for logoff_pre_processing hook within
@@ -37,11 +40,11 @@ class SwitchBackUserHook
public function switchBack($params, AbstractUserAuthentication $authentication)
{
if ($this->isAHandledBackendSession($authentication)) {
- $objectManager = GeneralUtility::makeInstance(\TYPO3\CMS\Extbase\Object\ObjectManager::class);
- $backendUserSessionRepository = $objectManager->get(\TYPO3\CMS\Beuser\Domain\Repository\BackendUserSessionRepository::class);
+ $objectManager = GeneralUtility::makeInstance(ObjectManager::class);
+ $backendUserSessionRepository = $objectManager->get(BackendUserSessionRepository::class);
$backendUserSessionRepository->switchBackToOriginalUser($authentication);
/** @var \TYPO3\CMS\Backend\Routing\UriBuilder $uriBuilder */
- $uriBuilder = GeneralUtility::makeInstance(\TYPO3\CMS\Backend\Routing\UriBuilder::class);
+ $uriBuilder = GeneralUtility::makeInstance(UriBuilder::class);
HttpUtility::redirect((string)$uriBuilder->buildUriFromRoute('main'));
}
}
diff --git a/typo3/sysext/beuser/Classes/Service/ModuleDataStorageService.php b/typo3/sysext/beuser/Classes/Service/ModuleDataStorageService.php
index d8539dc93da89f03a4f1dbb9451306482dcfb9ee..3463a3d1288a5b83f56760bcf8c7470ec114a967 100644
--- a/typo3/sysext/beuser/Classes/Service/ModuleDataStorageService.php
+++ b/typo3/sysext/beuser/Classes/Service/ModuleDataStorageService.php
@@ -17,13 +17,15 @@ namespace TYPO3\CMS\Beuser\Service;
use TYPO3\CMS\Beuser\Domain\Model\Demand;
use TYPO3\CMS\Beuser\Domain\Model\ModuleData;
+use TYPO3\CMS\Core\SingletonInterface;
+use TYPO3\CMS\Extbase\Object\ObjectManagerInterface;
/**
* Module data storage service.
* Used to store and retrieve module state (eg. checkboxes, selections).
* @internal This class is a TYPO3 Backend implementation and is not considered part of the Public TYPO3 API.
*/
-class ModuleDataStorageService implements \TYPO3\CMS\Core\SingletonInterface
+class ModuleDataStorageService implements SingletonInterface
{
/**
* @var string
@@ -38,7 +40,7 @@ class ModuleDataStorageService implements \TYPO3\CMS\Core\SingletonInterface
/**
* @param \TYPO3\CMS\Extbase\Object\ObjectManagerInterface $objectManager
*/
- public function injectObjectManager(\TYPO3\CMS\Extbase\Object\ObjectManagerInterface $objectManager)
+ public function injectObjectManager(ObjectManagerInterface $objectManager)
{
$this->objectManager = $objectManager;
}
@@ -66,7 +68,7 @@ class ModuleDataStorageService implements \TYPO3\CMS\Core\SingletonInterface
*
* @param \TYPO3\CMS\Beuser\Domain\Model\ModuleData $moduleData
*/
- public function persistModuleData(\TYPO3\CMS\Beuser\Domain\Model\ModuleData $moduleData)
+ public function persistModuleData(ModuleData $moduleData)
{
$GLOBALS['BE_USER']->pushModuleData(self::KEY, serialize($moduleData));
}
diff --git a/typo3/sysext/beuser/Tests/Unit/Domain/Model/BackendUserTest.php b/typo3/sysext/beuser/Tests/Unit/Domain/Model/BackendUserTest.php
index a2035f5c807b5e5064dca758f6c4cda1be1fb231..302c91d2cac692d37047757f068f96d2d5f3c333 100644
--- a/typo3/sysext/beuser/Tests/Unit/Domain/Model/BackendUserTest.php
+++ b/typo3/sysext/beuser/Tests/Unit/Domain/Model/BackendUserTest.php
@@ -15,6 +15,7 @@
namespace TYPO3\CMS\Beuser\Tests\Unit\Domain\Model;
+use TYPO3\CMS\Beuser\Domain\Model\BackendUser;
use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
/**
@@ -30,7 +31,7 @@ class BackendUserTest extends UnitTestCase
protected function setUp(): void
{
parent::setUp();
- $this->subject = new \TYPO3\CMS\Beuser\Domain\Model\BackendUser();
+ $this->subject = new BackendUser();
}
/**
diff --git a/typo3/sysext/beuser/Tests/Unit/Domain/Model/DemandTest.php b/typo3/sysext/beuser/Tests/Unit/Domain/Model/DemandTest.php
index b3f94e7d453def0cee83182d6920d6c3d4b6c41e..7316c9a164a16eaa2235bb2b16f7b193796346fc 100644
--- a/typo3/sysext/beuser/Tests/Unit/Domain/Model/DemandTest.php
+++ b/typo3/sysext/beuser/Tests/Unit/Domain/Model/DemandTest.php
@@ -15,6 +15,7 @@
namespace TYPO3\CMS\Beuser\Tests\Unit\Domain\Model;
+use TYPO3\CMS\Beuser\Domain\Model\Demand;
use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
/**
@@ -30,7 +31,7 @@ class DemandTest extends UnitTestCase
protected function setUp(): void
{
parent::setUp();
- $this->subject = new \TYPO3\CMS\Beuser\Domain\Model\Demand();
+ $this->subject = new Demand();
}
/**
@@ -38,7 +39,7 @@ class DemandTest extends UnitTestCase
*/
public function setUserTypeAllExpectedValueForInt()
{
- $userType = \TYPO3\CMS\Beuser\Domain\Model\Demand::ALL;
+ $userType = Demand::ALL;
$this->subject->setUserType($userType);
self::assertSame($this->subject->getUserType(), $userType);
}
@@ -48,7 +49,7 @@ class DemandTest extends UnitTestCase
*/
public function setUserTypeAdminOnlyExpectedValueForInt()
{
- $userType = \TYPO3\CMS\Beuser\Domain\Model\Demand::USERTYPE_ADMINONLY;
+ $userType = Demand::USERTYPE_ADMINONLY;
$this->subject->setUserType($userType);
self::assertSame($this->subject->getUserType(), $userType);
}
@@ -58,7 +59,7 @@ class DemandTest extends UnitTestCase
*/
public function setUserTypeUserOnlyExpectedValueForInt()
{
- $userType = \TYPO3\CMS\Beuser\Domain\Model\Demand::USERTYPE_USERONLY;
+ $userType = Demand::USERTYPE_USERONLY;
$this->subject->setUserType($userType);
self::assertSame($this->subject->getUserType(), $userType);
}
@@ -68,7 +69,7 @@ class DemandTest extends UnitTestCase
*/
public function setStatusAllExpectedValueForInt()
{
- $status = \TYPO3\CMS\Beuser\Domain\Model\Demand::ALL;
+ $status = Demand::ALL;
$this->subject->setStatus($status);
self::assertSame($this->subject->getStatus(), $status);
}
@@ -78,7 +79,7 @@ class DemandTest extends UnitTestCase
*/
public function setStatusActiveExpectedValueForInt()
{
- $status = \TYPO3\CMS\Beuser\Domain\Model\Demand::STATUS_ACTIVE;
+ $status = Demand::STATUS_ACTIVE;
$this->subject->setStatus($status);
self::assertSame($this->subject->getStatus(), $status);
}
@@ -88,7 +89,7 @@ class DemandTest extends UnitTestCase
*/
public function setStatusInactiveExpectedValueForInt()
{
- $status = \TYPO3\CMS\Beuser\Domain\Model\Demand::STATUS_INACTIVE;
+ $status = Demand::STATUS_INACTIVE;
$this->subject->setStatus($status);
self::assertSame($this->subject->getStatus(), $status);
}
@@ -98,7 +99,7 @@ class DemandTest extends UnitTestCase
*/
public function setLoginAllExpectedValueForInt()
{
- $login = \TYPO3\CMS\Beuser\Domain\Model\Demand::ALL;
+ $login = Demand::ALL;
$this->subject->setLogins($login);
self::assertSame($this->subject->getLogins(), $login);
}
@@ -108,7 +109,7 @@ class DemandTest extends UnitTestCase
*/
public function setLoginNoneExpectedValueForInt()
{
- $login = \TYPO3\CMS\Beuser\Domain\Model\Demand::LOGIN_NONE;
+ $login = Demand::LOGIN_NONE;
$this->subject->setLogins($login);
self::assertSame($this->subject->getLogins(), $login);
}
@@ -118,7 +119,7 @@ class DemandTest extends UnitTestCase
*/
public function setLoginxSameExpectedValueForInt()
{
- $login = \TYPO3\CMS\Beuser\Domain\Model\Demand::LOGIN_SOME;
+ $login = Demand::LOGIN_SOME;
$this->subject->setLogins($login);
self::assertSame($this->subject->getLogins(), $login);
}
diff --git a/typo3/sysext/beuser/Tests/Unit/Domain/Repository/BackendUserRepositoryTest.php b/typo3/sysext/beuser/Tests/Unit/Domain/Repository/BackendUserRepositoryTest.php
index 8ee2ec2ba9fe7cad577a48e630ee86f9d46e24f4..f5d28ddd3e029205f9731aa715135da8cadf3894 100644
--- a/typo3/sysext/beuser/Tests/Unit/Domain/Repository/BackendUserRepositoryTest.php
+++ b/typo3/sysext/beuser/Tests/Unit/Domain/Repository/BackendUserRepositoryTest.php
@@ -15,6 +15,8 @@
namespace TYPO3\CMS\Beuser\Tests\Unit\Domain\Repository;
+use TYPO3\CMS\Beuser\Domain\Repository\BackendUserRepository;
+use TYPO3\CMS\Extbase\Object\ObjectManagerInterface;
use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
/**
@@ -27,7 +29,7 @@ class BackendUserRepositoryTest extends UnitTestCase
*/
public function classCanBeInstantiated()
{
- $objectManager = $this->createMock(\TYPO3\CMS\Extbase\Object\ObjectManagerInterface::class);
- new \TYPO3\CMS\Beuser\Domain\Repository\BackendUserRepository($objectManager);
+ $objectManager = $this->createMock(ObjectManagerInterface::class);
+ new BackendUserRepository($objectManager);
}
}
diff --git a/typo3/sysext/beuser/Tests/Unit/Domain/Repository/BackendUserSessionRepositoryTest.php b/typo3/sysext/beuser/Tests/Unit/Domain/Repository/BackendUserSessionRepositoryTest.php
index b24b011d193027db142c5f45ad6b4ba40c9e71bf..808c29b4d012d970c25875245af7d5ab1cd3aab0 100644
--- a/typo3/sysext/beuser/Tests/Unit/Domain/Repository/BackendUserSessionRepositoryTest.php
+++ b/typo3/sysext/beuser/Tests/Unit/Domain/Repository/BackendUserSessionRepositoryTest.php
@@ -15,6 +15,8 @@
namespace TYPO3\CMS\Beuser\Tests\Unit\Domain\Repository;
+use TYPO3\CMS\Beuser\Domain\Repository\BackendUserSessionRepository;
+use TYPO3\CMS\Extbase\Object\ObjectManagerInterface;
use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
/**
@@ -27,7 +29,7 @@ class BackendUserSessionRepositoryTest extends UnitTestCase
*/
public function classCanBeInstantiated()
{
- $objectManager = $this->getMockBuilder(\TYPO3\CMS\Extbase\Object\ObjectManagerInterface::class)->getMock();
- new \TYPO3\CMS\Beuser\Domain\Repository\BackendUserSessionRepository($objectManager);
+ $objectManager = $this->getMockBuilder(ObjectManagerInterface::class)->getMock();
+ new BackendUserSessionRepository($objectManager);
}
}
diff --git a/typo3/sysext/beuser/Tests/Unit/Service/ModuleDataStorageServiceTest.php b/typo3/sysext/beuser/Tests/Unit/Service/ModuleDataStorageServiceTest.php
index a42a400637cb18289b40cd298e6f35419783e3ae..e599eeefd84b00e4d9c8d239d36ba680e123fc3f 100644
--- a/typo3/sysext/beuser/Tests/Unit/Service/ModuleDataStorageServiceTest.php
+++ b/typo3/sysext/beuser/Tests/Unit/Service/ModuleDataStorageServiceTest.php
@@ -15,7 +15,10 @@
namespace TYPO3\CMS\Beuser\Tests\Unit\Service;
+use TYPO3\CMS\Beuser\Domain\Model\ModuleData;
use TYPO3\CMS\Beuser\Service\ModuleDataStorageService;
+use TYPO3\CMS\Core\Authentication\BackendUserAuthentication;
+use TYPO3\CMS\Extbase\Object\ObjectManager;
use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
/**
@@ -29,17 +32,17 @@ class ModuleDataStorageServiceTest extends UnitTestCase
public function loadModuleDataReturnsModuleDataObjectForEmptyModuleData()
{
// Simulate empty module data
- $GLOBALS['BE_USER'] = $this->createMock(\TYPO3\CMS\Core\Authentication\BackendUserAuthentication::class);
+ $GLOBALS['BE_USER'] = $this->createMock(BackendUserAuthentication::class);
$GLOBALS['BE_USER']->uc = [];
$GLOBALS['BE_USER']->uc['moduleData'] = [];
$subject = new ModuleDataStorageService();
- $objectManagerMock = $this->createMock(\TYPO3\CMS\Extbase\Object\ObjectManager::class);
- $moduleDataMock = $this->createMock(\TYPO3\CMS\Beuser\Domain\Model\ModuleData::class);
+ $objectManagerMock = $this->createMock(ObjectManager::class);
+ $moduleDataMock = $this->createMock(ModuleData::class);
$objectManagerMock
->expects(self::once())
->method('get')
- ->with(\TYPO3\CMS\Beuser\Domain\Model\ModuleData::class)
+ ->with(ModuleData::class)
->willReturn($moduleDataMock);
$subject->injectObjectManager($objectManagerMock);
diff --git a/typo3/sysext/extbase/Tests/Functional/Mvc/Controller/ActionControllerArgumentTest.php b/typo3/sysext/extbase/Tests/Functional/Mvc/Controller/ActionControllerArgumentTest.php
index cc949140a13170fd630ebcb6e0254942848f3bfb..8b15a7d8287c2d70d089ee7ee63a26500066b3e2 100644
--- a/typo3/sysext/extbase/Tests/Functional/Mvc/Controller/ActionControllerArgumentTest.php
+++ b/typo3/sysext/extbase/Tests/Functional/Mvc/Controller/ActionControllerArgumentTest.php
@@ -27,6 +27,8 @@ use TYPO3\CMS\Extbase\Mvc\Web\Response;
use TYPO3\CMS\Extbase\Object\Container\Container;
use TYPO3\CMS\Extbase\Object\ObjectManager;
use TYPO3\CMS\Extbase\Tests\Functional\Mvc\Controller\Fixture\Controller\ArgumentTestController;
+use TYPO3\CMS\Extbase\Tests\Functional\Mvc\Controller\Fixture\Domain\Model\Model;
+use TYPO3\CMS\Extbase\Tests\Functional\Mvc\Controller\Fixture\Domain\Model\ModelDto;
use TYPO3\TestingFramework\Core\Functional\FunctionalTestCase;
/**
@@ -76,7 +78,7 @@ class ActionControllerArgumentTest extends FunctionalTestCase
// regular models
'preset model' => [
'inputPresetModel',
- ['preset' => (new Fixture\Domain\Model\Model())->setValue('preset')],
+ ['preset' => (new Model())->setValue('preset')],
'validateModel',
[
'form/model/value' => 'preset',
@@ -85,7 +87,7 @@ class ActionControllerArgumentTest extends FunctionalTestCase
],
'preset DTO' => [
'inputPresetDto',
- ['preset' => (new Fixture\Domain\Model\ModelDto())->setValue('preset')],
+ ['preset' => (new ModelDto())->setValue('preset')],
'validateDto',
[
'form/dto/value' => 'preset',
diff --git a/typo3/sysext/extensionmanager/Classes/Controller/AbstractController.php b/typo3/sysext/extensionmanager/Classes/Controller/AbstractController.php
index 547f5a510bc15af8f50f7b69163c1bc5ba84d785..051f76c2509c30a3a9d1fa4b74036a0ab0f229a2 100644
--- a/typo3/sysext/extensionmanager/Classes/Controller/AbstractController.php
+++ b/typo3/sysext/extensionmanager/Classes/Controller/AbstractController.php
@@ -15,13 +15,14 @@
namespace TYPO3\CMS\Extensionmanager\Controller;
+use TYPO3\CMS\Extbase\Mvc\Controller\ActionController;
use TYPO3\CMS\Extbase\Utility\LocalizationUtility;
/**
* Abstract action controller.
* @internal This class is a specific controller implementation and is not considered part of the Public TYPO3 API.
*/
-class AbstractController extends \TYPO3\CMS\Extbase\Mvc\Controller\ActionController
+class AbstractController extends ActionController
{
const TRIGGER_RefreshModuleMenu = 'refreshModuleMenu';
const TRIGGER_RefreshTopbar = 'refreshTopbar';
diff --git a/typo3/sysext/extensionmanager/Classes/Controller/ActionController.php b/typo3/sysext/extensionmanager/Classes/Controller/ActionController.php
index 92cfd2ec9b4b66d44416260c6204a574fc86ba50..a4b87cf79140d5afe4dca2d33d89c50eaa7ddfbe 100644
--- a/typo3/sysext/extensionmanager/Classes/Controller/ActionController.php
+++ b/typo3/sysext/extensionmanager/Classes/Controller/ActionController.php
@@ -15,10 +15,15 @@
namespace TYPO3\CMS\Extensionmanager\Controller;
+use TYPO3\CMS\Core\Messaging\FlashMessage;
+use TYPO3\CMS\Core\Package\Exception;
+use TYPO3\CMS\Core\Package\Exception\PackageStatesFileNotWritableException;
use TYPO3\CMS\Core\Registry;
use TYPO3\CMS\Core\Utility\ExtensionManagementUtility;
use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Core\Utility\PathUtility;
+use TYPO3\CMS\Extbase\Utility\LocalizationUtility;
+use TYPO3\CMS\Extensionmanager\Exception\ExtensionManagerException;
use TYPO3\CMS\Extensionmanager\Service\ExtensionManagementService;
use TYPO3\CMS\Extensionmanager\Utility\ExtensionModelUtility;
use TYPO3\CMS\Extensionmanager\Utility\FileHandlingUtility;
@@ -104,8 +109,8 @@ class ActionController extends AbstractController
$this->redirect('unresolvedDependencies', 'List', null, ['extensionKey' => $extensionKey]);
}
}
- } catch (\TYPO3\CMS\Extensionmanager\Exception\ExtensionManagerException|\TYPO3\CMS\Core\Package\Exception\PackageStatesFileNotWritableException $e) {
- $this->addFlashMessage($e->getMessage(), '', \TYPO3\CMS\Core\Messaging\FlashMessage::ERROR);
+ } catch (ExtensionManagerException|PackageStatesFileNotWritableException $e) {
+ $this->addFlashMessage($e->getMessage(), '', FlashMessage::ERROR);
}
$this->redirect('index', 'List', null, [
self::TRIGGER_RefreshModuleMenu => true,
@@ -135,7 +140,7 @@ class ActionController extends AbstractController
try {
$this->installUtility->removeExtension($extension);
$this->addFlashMessage(
- \TYPO3\CMS\Extbase\Utility\LocalizationUtility::translate(
+ LocalizationUtility::translate(
'extensionList.remove.message',
'extensionmanager',
[
@@ -143,8 +148,8 @@ class ActionController extends AbstractController
]
)
);
- } catch (\TYPO3\CMS\Extensionmanager\Exception\ExtensionManagerException|\TYPO3\CMS\Core\Package\Exception $e) {
- $this->addFlashMessage($e->getMessage(), '', \TYPO3\CMS\Core\Messaging\FlashMessage::ERROR);
+ } catch (ExtensionManagerException|Exception $e) {
+ $this->addFlashMessage($e->getMessage(), '', FlashMessage::ERROR);
}
return '';
diff --git a/typo3/sysext/extensionmanager/Classes/Controller/DownloadController.php b/typo3/sysext/extensionmanager/Classes/Controller/DownloadController.php
index 65a8ae4d950454a4326cc24ded71a42ba119b874..c6bb3816b3a7986484e142ecab8f01cdecf52e46 100644
--- a/typo3/sysext/extensionmanager/Classes/Controller/DownloadController.php
+++ b/typo3/sysext/extensionmanager/Classes/Controller/DownloadController.php
@@ -16,12 +16,15 @@
namespace TYPO3\CMS\Extensionmanager\Controller;
use TYPO3\CMS\Core\Configuration\ExtensionConfiguration;
+use TYPO3\CMS\Core\Messaging\AbstractMessage;
use TYPO3\CMS\Core\Messaging\FlashMessage;
+use TYPO3\CMS\Core\Utility\ExtensionManagementUtility;
use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Extbase\Mvc\View\JsonView;
use TYPO3\CMS\Extbase\Utility\LocalizationUtility;
use TYPO3\CMS\Extensionmanager\Domain\Model\Extension;
use TYPO3\CMS\Extensionmanager\Domain\Repository\ExtensionRepository;
+use TYPO3\CMS\Extensionmanager\Exception\ExtensionManagerException;
use TYPO3\CMS\Extensionmanager\Service\ExtensionManagementService;
use TYPO3\CMS\Extensionmanager\Utility\DownloadUtility;
use TYPO3\CMS\Fluid\View\TemplateView;
@@ -206,7 +209,7 @@ class DownloadController extends AbstractController
*/
public function installDistributionAction(Extension $extension)
{
- if (!\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::isLoaded('impexp')) {
+ if (!ExtensionManagementUtility::isLoaded('impexp')) {
$this->forward('distributions', 'List');
}
[$result, $errorMessages] = $this->installFromTer($extension);
@@ -220,7 +223,7 @@ class DownloadController extends AbstractController
'extensionmanager',
[$extensionKey]
),
- \TYPO3\CMS\Core\Messaging\AbstractMessage::ERROR
+ AbstractMessage::ERROR
);
}
}
@@ -267,7 +270,7 @@ class DownloadController extends AbstractController
if (!$extension instanceof Extension) {
$extension = $this->extensionRepository->findHighestAvailableVersion($extensionKey);
}
- $installedExtensions = \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::getLoadedExtensionListArray();
+ $installedExtensions = ExtensionManagementUtility::getLoadedExtensionListArray();
try {
if (in_array($extensionKey, $installedExtensions, true)) {
// To resolve new dependencies the extension is installed again
@@ -341,7 +344,7 @@ class DownloadController extends AbstractController
if (($result = $this->managementService->installExtension($extension)) === false) {
$errorMessages = $this->managementService->getDependencyErrors();
}
- } catch (\TYPO3\CMS\Extensionmanager\Exception\ExtensionManagerException $e) {
+ } catch (ExtensionManagerException $e) {
$errorMessages = [
$extension->getExtensionKey() => [
[
diff --git a/typo3/sysext/extensionmanager/Classes/Controller/UpdateFromTerController.php b/typo3/sysext/extensionmanager/Classes/Controller/UpdateFromTerController.php
index 6e14edfd15d03b4d7cbfccb33083c8738c59af47..21cd15250311156f549cce66c814ad2804b04c4d 100644
--- a/typo3/sysext/extensionmanager/Classes/Controller/UpdateFromTerController.php
+++ b/typo3/sysext/extensionmanager/Classes/Controller/UpdateFromTerController.php
@@ -15,10 +15,12 @@
namespace TYPO3\CMS\Extensionmanager\Controller;
+use TYPO3\CMS\Backend\Utility\BackendUtility;
use TYPO3\CMS\Core\Localization\LanguageService;
use TYPO3\CMS\Extbase\Mvc\View\JsonView;
use TYPO3\CMS\Extensionmanager\Domain\Repository\ExtensionRepository;
use TYPO3\CMS\Extensionmanager\Domain\Repository\RepositoryRepository;
+use TYPO3\CMS\Extensionmanager\Exception\ExtensionManagerException;
use TYPO3\CMS\Extensionmanager\Utility\ListUtility;
use TYPO3\CMS\Extensionmanager\Utility\Repository\Helper;
@@ -98,7 +100,7 @@ class UpdateFromTerController extends AbstractController
if ($this->extensionRepository->countAll() === 0 || $forceUpdateCheck) {
try {
$updated = $this->repositoryHelper->updateExtList();
- } catch (\TYPO3\CMS\Extensionmanager\Exception\ExtensionManagerException $e) {
+ } catch (ExtensionManagerException $e) {
$errorMessage = $e->getMessage();
}
}
@@ -110,7 +112,7 @@ class UpdateFromTerController extends AbstractController
$lastUpdatedSince = $this->getLanguageService()->sL('LLL:EXT:extensionmanager/Resources/Private/Language/locallang.xlf:extensionList.updateFromTer.never');
$lastUpdateTime = date($timeFormat);
} else {
- $lastUpdatedSince = \TYPO3\CMS\Backend\Utility\BackendUtility::calcAge(
+ $lastUpdatedSince = BackendUtility::calcAge(
time() - $lastUpdateTime->format('U'),
$this->getLanguageService()->sL('LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:labels.minutesHoursDaysYears')
);
diff --git a/typo3/sysext/extensionmanager/Classes/Controller/UploadExtensionFileController.php b/typo3/sysext/extensionmanager/Classes/Controller/UploadExtensionFileController.php
index ad751f30ab835dddf614ad68678c85a6390c7831..5792d0f00be076665cccd974aef05b70d98ad57f 100644
--- a/typo3/sysext/extensionmanager/Classes/Controller/UploadExtensionFileController.php
+++ b/typo3/sysext/extensionmanager/Classes/Controller/UploadExtensionFileController.php
@@ -19,6 +19,7 @@ use TYPO3\CMS\Core\Configuration\ExtensionConfiguration;
use TYPO3\CMS\Core\Core\Environment;
use TYPO3\CMS\Core\Messaging\FlashMessage;
use TYPO3\CMS\Core\Utility\GeneralUtility;
+use TYPO3\CMS\Extbase\Mvc\Exception\StopActionException;
use TYPO3\CMS\Extensionmanager\Domain\Repository\ExtensionRepository;
use TYPO3\CMS\Extensionmanager\Exception\DependencyConfigurationNotFoundException;
use TYPO3\CMS\Extensionmanager\Exception\ExtensionManagerException;
@@ -162,7 +163,7 @@ class UploadExtensionFileController extends AbstractController
$this->redirect('unresolvedDependencies', 'List', null, ['extensionKey' => $extensionData['extKey']]);
}
}
- } catch (\TYPO3\CMS\Extbase\Mvc\Exception\StopActionException $exception) {
+ } catch (StopActionException $exception) {
throw $exception;
} catch (DependencyConfigurationNotFoundException $exception) {
$this->addFlashMessage($exception->getMessage(), '', FlashMessage::ERROR);
diff --git a/typo3/sysext/extensionmanager/Classes/Domain/Model/Extension.php b/typo3/sysext/extensionmanager/Classes/Domain/Model/Extension.php
index d11fd89d657c17aaa58454ba7f187480e0cbad7f..aece83771e8d294eba157877f6dfe71d05a38ec9 100644
--- a/typo3/sysext/extensionmanager/Classes/Domain/Model/Extension.php
+++ b/typo3/sysext/extensionmanager/Classes/Domain/Model/Extension.php
@@ -16,6 +16,7 @@
namespace TYPO3\CMS\Extensionmanager\Domain\Model;
use TYPO3\CMS\Core\Core\Environment;
+use TYPO3\CMS\Core\Utility\MathUtility;
use TYPO3\CMS\Extbase\DomainObject\AbstractEntity;
use TYPO3\CMS\Extbase\Object\ObjectManager;
use TYPO3\CMS\Extensionmanager\Utility\ExtensionModelUtility;
@@ -247,7 +248,7 @@ class Extension extends AbstractEntity
public function getCategoryIndexFromStringOrNumber($category)
{
$categoryIndex = 4;
- if (\TYPO3\CMS\Core\Utility\MathUtility::canBeInterpretedAsInteger($category)) {
+ if (MathUtility::canBeInterpretedAsInteger($category)) {
$categoryIndex = (int)$category;
if ($categoryIndex < 0 || $categoryIndex > 10) {
$categoryIndex = 4;
diff --git a/typo3/sysext/extensionmanager/Classes/Domain/Repository/ExtensionRepository.php b/typo3/sysext/extensionmanager/Classes/Domain/Repository/ExtensionRepository.php
index 913a83c7f150b0d1802ca056794cedb0836cd0d9..3b8f11c24eb2bd387ba31503d00b5d0cda8796d5 100644
--- a/typo3/sysext/extensionmanager/Classes/Domain/Repository/ExtensionRepository.php
+++ b/typo3/sysext/extensionmanager/Classes/Domain/Repository/ExtensionRepository.php
@@ -19,6 +19,7 @@ use TYPO3\CMS\Core\Database\Connection;
use TYPO3\CMS\Core\Database\ConnectionPool;
use TYPO3\CMS\Core\Database\Platform\PlatformInformation;
use TYPO3\CMS\Core\Utility\GeneralUtility;
+use TYPO3\CMS\Extbase\Persistence\Generic\Mapper\DataMapper;
use TYPO3\CMS\Extbase\Persistence\Generic\Query;
use TYPO3\CMS\Extbase\Persistence\Generic\QuerySettingsInterface;
use TYPO3\CMS\Extbase\Persistence\QueryInterface;
@@ -194,7 +195,7 @@ class ExtensionRepository extends Repository
->execute()
->fetchAll();
- $dataMapper = $this->objectManager->get(\TYPO3\CMS\Extbase\Persistence\Generic\Mapper\DataMapper::class);
+ $dataMapper = $this->objectManager->get(DataMapper::class);
return $dataMapper->map(Extension::class, $result);
}
diff --git a/typo3/sysext/extensionmanager/Classes/Report/ExtensionStatus.php b/typo3/sysext/extensionmanager/Classes/Report/ExtensionStatus.php
index 09a8baeb9710fa3dc82813a2586c5d163467d274..c3b648d762c31b61304c03b52cb6e00d4fad04b2 100644
--- a/typo3/sysext/extensionmanager/Classes/Report/ExtensionStatus.php
+++ b/typo3/sysext/extensionmanager/Classes/Report/ExtensionStatus.php
@@ -18,6 +18,7 @@ namespace TYPO3\CMS\Extensionmanager\Report;
use TYPO3\CMS\Core\Localization\LanguageService;
use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Extbase\Object\ObjectManager;
+use TYPO3\CMS\Extensionmanager\Domain\Model\Extension;
use TYPO3\CMS\Extensionmanager\Domain\Repository\RepositoryRepository;
use TYPO3\CMS\Extensionmanager\Utility\ListUtility;
use TYPO3\CMS\Reports\Status;
@@ -146,7 +147,7 @@ class ExtensionStatus implements StatusProviderInterface
foreach ($extensionInformation as $extensionKey => $information) {
if (
array_key_exists('terObject', $information)
- && $information['terObject'] instanceof \TYPO3\CMS\Extensionmanager\Domain\Model\Extension
+ && $information['terObject'] instanceof Extension
) {
/** @var \TYPO3\CMS\Extensionmanager\Domain\Model\Extension $terObject */
$terObject = $information['terObject'];
diff --git a/typo3/sysext/extensionmanager/Classes/Utility/Connection/TerUtility.php b/typo3/sysext/extensionmanager/Classes/Utility/Connection/TerUtility.php
index 9f3d54c53c885c7f0681b343e2233b295e69cde3..bc85d8d530ee229eae025d6f1a1b355a34808df6 100644
--- a/typo3/sysext/extensionmanager/Classes/Utility/Connection/TerUtility.php
+++ b/typo3/sysext/extensionmanager/Classes/Utility/Connection/TerUtility.php
@@ -48,7 +48,7 @@ class TerUtility
}
$extensionPath = strtolower($extensionKey);
$mirrorUrl .= $extensionPath[0] . '/' . $extensionPath[1] . '/' . $extensionPath . '_' . $version . '.t3x';
- $t3x = \TYPO3\CMS\Core\Utility\GeneralUtility::getUrl($mirrorUrl);
+ $t3x = GeneralUtility::getUrl($mirrorUrl);
$md5 = md5($t3x);
if ($t3x === false) {
throw new ExtensionManagerException(sprintf('The T3X file "%s" could not be fetched. Possible reasons: network problems, allow_url_fopen is off, cURL is not enabled in Install Tool.', $mirrorUrl), 1334426097);
diff --git a/typo3/sysext/extensionmanager/Classes/Utility/DependencyUtility.php b/typo3/sysext/extensionmanager/Classes/Utility/DependencyUtility.php
index 0e8384c5ffa66d6bde4f30e832b519d75e5b2755..a805c950a1630f8a9bab31b8d9e8b40065625181 100644
--- a/typo3/sysext/extensionmanager/Classes/Utility/DependencyUtility.php
+++ b/typo3/sysext/extensionmanager/Classes/Utility/DependencyUtility.php
@@ -23,6 +23,11 @@ use TYPO3\CMS\Extensionmanager\Domain\Model\Dependency;
use TYPO3\CMS\Extensionmanager\Domain\Model\Extension;
use TYPO3\CMS\Extensionmanager\Domain\Repository\ExtensionRepository;
use TYPO3\CMS\Extensionmanager\Exception;
+use TYPO3\CMS\Extensionmanager\Exception\MissingExtensionDependencyException;
+use TYPO3\CMS\Extensionmanager\Exception\MissingVersionDependencyException;
+use TYPO3\CMS\Extensionmanager\Exception\UnresolvedDependencyException;
+use TYPO3\CMS\Extensionmanager\Exception\UnresolvedPhpDependencyException;
+use TYPO3\CMS\Extensionmanager\Exception\UnresolvedTypo3DependencyException;
use TYPO3\CMS\Extensionmanager\Service\ExtensionManagementService;
/**
@@ -151,7 +156,7 @@ class DependencyUtility implements SingletonInterface
$this->checkExtensionDependency($dependency);
}
}
- } catch (Exception\UnresolvedDependencyException $e) {
+ } catch (UnresolvedDependencyException $e) {
if (in_array($identifier, Dependency::$specialDependencies)) {
$extensionKey = $extension->getExtensionKey();
} else {
@@ -200,19 +205,19 @@ class DependencyUtility implements SingletonInterface
$lowerCaseIdentifier = strtolower($dependency->getIdentifier());
if ($lowerCaseIdentifier === 'typo3') {
if (!($dependency->getLowestVersion() === '') && version_compare(VersionNumberUtility::getNumericTypo3Version(), $dependency->getLowestVersion()) === -1) {
- throw new Exception\UnresolvedTypo3DependencyException(
+ throw new UnresolvedTypo3DependencyException(
'Your TYPO3 version is lower than this extension requires. It requires TYPO3 versions ' . $dependency->getLowestVersion() . ' - ' . $dependency->getHighestVersion(),
1399144499
);
}
if (!($dependency->getHighestVersion() === '') && version_compare($dependency->getHighestVersion(), VersionNumberUtility::getNumericTypo3Version()) === -1) {
- throw new Exception\UnresolvedTypo3DependencyException(
+ throw new UnresolvedTypo3DependencyException(
'Your TYPO3 version is higher than this extension requires. It requires TYPO3 versions ' . $dependency->getLowestVersion() . ' - ' . $dependency->getHighestVersion(),
1399144521
);
}
} else {
- throw new Exception\UnresolvedTypo3DependencyException(
+ throw new UnresolvedTypo3DependencyException(
'checkTypo3Dependency can only check TYPO3 dependencies. Found dependency with identifier "' . $dependency->getIdentifier() . '"',
1399144551
);
@@ -232,19 +237,19 @@ class DependencyUtility implements SingletonInterface
$lowerCaseIdentifier = strtolower($dependency->getIdentifier());
if ($lowerCaseIdentifier === 'php') {
if (!($dependency->getLowestVersion() === '') && version_compare(PHP_VERSION, $dependency->getLowestVersion()) === -1) {
- throw new Exception\UnresolvedPhpDependencyException(
+ throw new UnresolvedPhpDependencyException(
'Your PHP version is lower than necessary. You need at least PHP version ' . $dependency->getLowestVersion(),
1377977857
);
}
if (!($dependency->getHighestVersion() === '') && version_compare($dependency->getHighestVersion(), PHP_VERSION) === -1) {
- throw new Exception\UnresolvedPhpDependencyException(
+ throw new UnresolvedPhpDependencyException(
'Your PHP version is higher than allowed. You can use PHP versions ' . $dependency->getLowestVersion() . ' - ' . $dependency->getHighestVersion(),
1377977856
);
}
} else {
- throw new Exception\UnresolvedPhpDependencyException(
+ throw new UnresolvedPhpDependencyException(
'checkPhpDependency can only check PHP dependencies. Found dependency with identifier "' . $dependency->getIdentifier() . '"',
1377977858
);
@@ -278,15 +283,15 @@ class DependencyUtility implements SingletonInterface
if (version_compare($loadedVersion, $dependency->getHighestVersion()) === -1) {
try {
$this->getExtensionFromRepository($extensionKey, $dependency);
- } catch (Exception\UnresolvedDependencyException $e) {
- throw new Exception\MissingVersionDependencyException(
+ } catch (UnresolvedDependencyException $e) {
+ throw new MissingVersionDependencyException(
'The extension ' . $extensionKey . ' is installed in version ' . $loadedVersion
. ' but needed in version ' . $dependency->getLowestVersion() . ' - ' . $dependency->getHighestVersion() . ' and could not be fetched from TER',
1396302624
);
}
} else {
- throw new Exception\MissingVersionDependencyException(
+ throw new MissingVersionDependencyException(
'The extension ' . $extensionKey . ' is installed in version ' . $loadedVersion .
' but needed in version ' . $dependency->getLowestVersion() . ' - ' . $dependency->getHighestVersion(),
1430561927
@@ -306,9 +311,9 @@ class DependencyUtility implements SingletonInterface
if (version_compare($availableVersion, $dependency->getHighestVersion()) === -1) {
try {
$this->getExtensionFromRepository($extensionKey, $dependency);
- } catch (Exception\MissingExtensionDependencyException $e) {
+ } catch (MissingExtensionDependencyException $e) {
if (!$this->skipDependencyCheck) {
- throw new Exception\MissingVersionDependencyException(
+ throw new MissingVersionDependencyException(
'The extension ' . $extensionKey . ' is available in version ' . $availableVersion
. ' but is needed in version ' . $dependency->getLowestVersion() . ' - ' . $dependency->getHighestVersion() . ' and could not be fetched from TER',
1430560390
@@ -317,7 +322,7 @@ class DependencyUtility implements SingletonInterface
}
} else {
if (!$this->skipDependencyCheck) {
- throw new Exception\MissingVersionDependencyException(
+ throw new MissingVersionDependencyException(
'The extension ' . $extensionKey . ' is available in version ' . $availableVersion
. ' but is needed in version ' . $dependency->getLowestVersion() . ' - ' . $dependency->getHighestVersion(),
1430562374
@@ -385,12 +390,12 @@ class DependencyUtility implements SingletonInterface
if (!$isExtensionDownloadableFromTer) {
if (!$this->skipDependencyCheck) {
if ($this->extensionRepository->countAll() > 0) {
- throw new Exception\MissingExtensionDependencyException(
+ throw new MissingExtensionDependencyException(
'The extension ' . $extensionKey . ' is not available from TER.',
1399161266
);
}
- throw new Exception\MissingExtensionDependencyException(
+ throw new MissingExtensionDependencyException(
'The extension ' . $extensionKey . ' could not be checked. Please update your Extension-List from TYPO3 Extension Repository (TER).',
1430580308
);
@@ -401,7 +406,7 @@ class DependencyUtility implements SingletonInterface
$isDownloadableVersionCompatible = $this->isDownloadableVersionCompatible($dependency);
if (!$isDownloadableVersionCompatible) {
if (!$this->skipDependencyCheck) {
- throw new Exception\MissingVersionDependencyException(
+ throw new MissingVersionDependencyException(
'No compatible version found for extension ' . $extensionKey,
1399161284
);
@@ -412,7 +417,7 @@ class DependencyUtility implements SingletonInterface
$latestCompatibleExtensionByIntegerVersionDependency = $this->getLatestCompatibleExtensionByIntegerVersionDependency($dependency);
if (!$latestCompatibleExtensionByIntegerVersionDependency instanceof Extension) {
if (!$this->skipDependencyCheck) {
- throw new Exception\MissingExtensionDependencyException(
+ throw new MissingExtensionDependencyException(
'Could not resolve dependency for "' . $dependency->getIdentifier() . '"',
1399161302
);
@@ -591,7 +596,7 @@ class DependencyUtility implements SingletonInterface
if ($this->checkTypo3Dependency($dependency)) {
$suitableExtensions[] = $extension;
}
- } catch (Exception\UnresolvedTypo3DependencyException $e) {
+ } catch (UnresolvedTypo3DependencyException $e) {
}
break;
}
diff --git a/typo3/sysext/extensionmanager/Classes/Utility/Importer/ExtensionListUtility.php b/typo3/sysext/extensionmanager/Classes/Utility/Importer/ExtensionListUtility.php
index fb867e29831bee65659bda523bc9246720fa629f..0431a10e6fb24458e1afb9a6d464c741a42017ef 100644
--- a/typo3/sysext/extensionmanager/Classes/Utility/Importer/ExtensionListUtility.php
+++ b/typo3/sysext/extensionmanager/Classes/Utility/Importer/ExtensionListUtility.php
@@ -19,7 +19,13 @@ use TYPO3\CMS\Core\Database\ConnectionPool;
use TYPO3\CMS\Core\Database\Platform\PlatformInformation;
use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Core\Utility\VersionNumberUtility;
+use TYPO3\CMS\Extbase\Object\ObjectManager;
+use TYPO3\CMS\Extensionmanager\Domain\Model\Extension;
+use TYPO3\CMS\Extensionmanager\Domain\Repository\ExtensionRepository;
+use TYPO3\CMS\Extensionmanager\Domain\Repository\RepositoryRepository;
+use TYPO3\CMS\Extensionmanager\Exception\ExtensionManagerException;
use TYPO3\CMS\Extensionmanager\Utility\Parser\AbstractExtensionXmlParser;
+use TYPO3\CMS\Extensionmanager\Utility\Parser\XmlParserFactory;
/**
* Importer object for extension list
@@ -139,16 +145,16 @@ class ExtensionListUtility implements \SplObserver
public function __construct()
{
/** @var \TYPO3\CMS\Extbase\Object\ObjectManager $objectManager */
- $this->objectManager = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\TYPO3\CMS\Extbase\Object\ObjectManager::class);
- $this->repositoryRepository = $this->objectManager->get(\TYPO3\CMS\Extensionmanager\Domain\Repository\RepositoryRepository::class);
- $this->extensionRepository = $this->objectManager->get(\TYPO3\CMS\Extensionmanager\Domain\Repository\ExtensionRepository::class);
- $this->extensionModel = $this->objectManager->get(\TYPO3\CMS\Extensionmanager\Domain\Model\Extension::class);
+ $this->objectManager = GeneralUtility::makeInstance(ObjectManager::class);
+ $this->repositoryRepository = $this->objectManager->get(RepositoryRepository::class);
+ $this->extensionRepository = $this->objectManager->get(ExtensionRepository::class);
+ $this->extensionModel = $this->objectManager->get(Extension::class);
// @todo catch parser exception
- $this->parser = \TYPO3\CMS\Extensionmanager\Utility\Parser\XmlParserFactory::getParserInstance('extension');
+ $this->parser = XmlParserFactory::getParserInstance('extension');
if (is_object($this->parser)) {
$this->parser->attach($this);
} else {
- throw new \TYPO3\CMS\Extensionmanager\Exception\ExtensionManagerException(
+ throw new ExtensionManagerException(
static::class . ': No XML parser available.',
1476108717
);
diff --git a/typo3/sysext/extensionmanager/Classes/Utility/InstallUtility.php b/typo3/sysext/extensionmanager/Classes/Utility/InstallUtility.php
index f0bb5203a25e8ce72c9fb7e8076cee26652552ce..8609def641bffa1a33ca56ce716d085f465beed6 100644
--- a/typo3/sysext/extensionmanager/Classes/Utility/InstallUtility.php
+++ b/typo3/sysext/extensionmanager/Classes/Utility/InstallUtility.php
@@ -19,6 +19,7 @@ use Psr\EventDispatcher\EventDispatcherInterface;
use Psr\Log\LoggerAwareInterface;
use Psr\Log\LoggerAwareTrait;
use Symfony\Component\Finder\Finder;
+use TYPO3\CMS\Core\Cache\CacheManager;
use TYPO3\CMS\Core\Configuration\ExtensionConfiguration;
use TYPO3\CMS\Core\Configuration\SiteConfiguration;
use TYPO3\CMS\Core\Core\Bootstrap;
@@ -27,12 +28,16 @@ use TYPO3\CMS\Core\Database\Schema\SchemaMigrator;
use TYPO3\CMS\Core\Database\Schema\SqlReader;
use TYPO3\CMS\Core\Package\Event\AfterPackageActivationEvent;
use TYPO3\CMS\Core\Package\Event\AfterPackageDeactivationEvent;
+use TYPO3\CMS\Core\Package\PackageManager;
+use TYPO3\CMS\Core\Registry;
use TYPO3\CMS\Core\Service\OpcodeCacheService;
use TYPO3\CMS\Core\SingletonInterface;
use TYPO3\CMS\Core\Site\Entity\Site;
use TYPO3\CMS\Core\Utility\ExtensionManagementUtility;
use TYPO3\CMS\Core\Utility\GeneralUtility;
+use TYPO3\CMS\Extbase\Utility\LocalizationUtility;
use TYPO3\CMS\Extensionmanager\Domain\Model\Extension;
+use TYPO3\CMS\Extensionmanager\Domain\Repository\ExtensionRepository;
use TYPO3\CMS\Extensionmanager\Event\AfterExtensionDatabaseContentHasBeenImportedEvent;
use TYPO3\CMS\Extensionmanager\Event\AfterExtensionFilesHaveBeenImportedEvent;
use TYPO3\CMS\Extensionmanager\Event\AfterExtensionStaticDatabaseContentHasBeenImportedEvent;
@@ -96,7 +101,7 @@ class InstallUtility implements SingletonInterface, LoggerAwareInterface
/**
* @param \TYPO3\CMS\Extensionmanager\Utility\DependencyUtility $dependencyUtility
*/
- public function injectDependencyUtility(\TYPO3\CMS\Extensionmanager\Utility\DependencyUtility $dependencyUtility)
+ public function injectDependencyUtility(DependencyUtility $dependencyUtility)
{
$this->dependencyUtility = $dependencyUtility;
}
@@ -104,7 +109,7 @@ class InstallUtility implements SingletonInterface, LoggerAwareInterface
/**
* @param \TYPO3\CMS\Extensionmanager\Utility\FileHandlingUtility $fileHandlingUtility
*/
- public function injectFileHandlingUtility(\TYPO3\CMS\Extensionmanager\Utility\FileHandlingUtility $fileHandlingUtility)
+ public function injectFileHandlingUtility(FileHandlingUtility $fileHandlingUtility)
{
$this->fileHandlingUtility = $fileHandlingUtility;
}
@@ -112,7 +117,7 @@ class InstallUtility implements SingletonInterface, LoggerAwareInterface
/**
* @param \TYPO3\CMS\Extensionmanager\Utility\ListUtility $listUtility
*/
- public function injectListUtility(\TYPO3\CMS\Extensionmanager\Utility\ListUtility $listUtility)
+ public function injectListUtility(ListUtility $listUtility)
{
$this->listUtility = $listUtility;
}
@@ -120,7 +125,7 @@ class InstallUtility implements SingletonInterface, LoggerAwareInterface
/**
* @param \TYPO3\CMS\Extensionmanager\Domain\Repository\ExtensionRepository $extensionRepository
*/
- public function injectExtensionRepository(\TYPO3\CMS\Extensionmanager\Domain\Repository\ExtensionRepository $extensionRepository)
+ public function injectExtensionRepository(ExtensionRepository $extensionRepository)
{
$this->extensionRepository = $extensionRepository;
}
@@ -128,7 +133,7 @@ class InstallUtility implements SingletonInterface, LoggerAwareInterface
/**
* @param \TYPO3\CMS\Core\Package\PackageManager $packageManager
*/
- public function injectPackageManager(\TYPO3\CMS\Core\Package\PackageManager $packageManager)
+ public function injectPackageManager(PackageManager $packageManager)
{
$this->packageManager = $packageManager;
}
@@ -136,7 +141,7 @@ class InstallUtility implements SingletonInterface, LoggerAwareInterface
/**
* @param \TYPO3\CMS\Core\Cache\CacheManager $cacheManager
*/
- public function injectCacheManager(\TYPO3\CMS\Core\Cache\CacheManager $cacheManager)
+ public function injectCacheManager(CacheManager $cacheManager)
{
$this->cacheManager = $cacheManager;
}
@@ -144,7 +149,7 @@ class InstallUtility implements SingletonInterface, LoggerAwareInterface
/**
* @param \TYPO3\CMS\Core\Registry $registry
*/
- public function injectRegistry(\TYPO3\CMS\Core\Registry $registry)
+ public function injectRegistry(Registry $registry)
{
$this->registry = $registry;
}
@@ -205,7 +210,7 @@ class InstallUtility implements SingletonInterface, LoggerAwareInterface
$dependentExtensions = $this->dependencyUtility->findInstalledExtensionsThatDependOnMe($extensionKey);
if (is_array($dependentExtensions) && !empty($dependentExtensions)) {
throw new ExtensionManagerException(
- \TYPO3\CMS\Extbase\Utility\LocalizationUtility::translate(
+ LocalizationUtility::translate(
'extensionList.uninstall.dependencyError',
'extensionmanager',
[$extensionKey, implode(',', $dependentExtensions)]
diff --git a/typo3/sysext/extensionmanager/Classes/Utility/ListUtility.php b/typo3/sysext/extensionmanager/Classes/Utility/ListUtility.php
index 3cf8b94787288fcc84aca64bc9b07f76632ce748..72aa2252880d9d1deb77d7790001980d10399f47 100644
--- a/typo3/sysext/extensionmanager/Classes/Utility/ListUtility.php
+++ b/typo3/sysext/extensionmanager/Classes/Utility/ListUtility.php
@@ -20,6 +20,7 @@ use TYPO3\CMS\Core\Core\Environment;
use TYPO3\CMS\Core\Package\Event\PackagesMayHaveChangedEvent;
use TYPO3\CMS\Core\Package\PackageInterface;
use TYPO3\CMS\Core\Package\PackageManager;
+use TYPO3\CMS\Core\SingletonInterface;
use TYPO3\CMS\Core\Utility\ExtensionManagementUtility;
use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Core\Utility\PathUtility;
@@ -36,7 +37,7 @@ use TYPO3\CMS\Extensionmanager\Domain\Repository\ExtensionRepository;
* - The name 'listUtility' is not good, the methods could be moved to some 'extensionInformationUtility', or a repository?
* @internal This class is a specific ExtensionManager implementation and is not part of the Public TYPO3 API.
*/
-class ListUtility implements \TYPO3\CMS\Core\SingletonInterface
+class ListUtility implements SingletonInterface
{
/**
* @var EmConfUtility
diff --git a/typo3/sysext/extensionmanager/Classes/Utility/Parser/ExtensionXmlPullParser.php b/typo3/sysext/extensionmanager/Classes/Utility/Parser/ExtensionXmlPullParser.php
index c5f65d2a2009c46b9fed326c1c6a0ff1b49a42ea..395aaf019858a2646ef97d7796ede0704da9e4d1 100644
--- a/typo3/sysext/extensionmanager/Classes/Utility/Parser/ExtensionXmlPullParser.php
+++ b/typo3/sysext/extensionmanager/Classes/Utility/Parser/ExtensionXmlPullParser.php
@@ -15,6 +15,8 @@
namespace TYPO3\CMS\Extensionmanager\Utility\Parser;
+use TYPO3\CMS\Extensionmanager\Exception\ExtensionManagerException;
+
/**
* Parser for TYPO3's extension.xml file.
*
@@ -50,10 +52,10 @@ class ExtensionXmlPullParser extends AbstractExtensionXmlParser
{
$this->createParser();
if (!(is_object($this->objXml) && get_class($this->objXml) === \XMLReader::class)) {
- throw new \TYPO3\CMS\Extensionmanager\Exception\ExtensionManagerException('Unable to create XML parser.', 1342640540);
+ throw new ExtensionManagerException('Unable to create XML parser.', 1342640540);
}
if ($this->objXml->open($file, 'utf-8') === false) {
- throw new \TYPO3\CMS\Extensionmanager\Exception\ExtensionManagerException(
+ throw new ExtensionManagerException(
sprintf('Unable to open file resource %s.', $file),
1476108651
);
diff --git a/typo3/sysext/extensionmanager/Classes/Utility/Parser/ExtensionXmlPushParser.php b/typo3/sysext/extensionmanager/Classes/Utility/Parser/ExtensionXmlPushParser.php
index c9eab4b94428460f62d8d2541052db653c5255f6..bc3d28aa644664753b39da8724d3c3f2c8e62820 100644
--- a/typo3/sysext/extensionmanager/Classes/Utility/Parser/ExtensionXmlPushParser.php
+++ b/typo3/sysext/extensionmanager/Classes/Utility/Parser/ExtensionXmlPushParser.php
@@ -15,6 +15,8 @@
namespace TYPO3\CMS\Extensionmanager\Utility\Parser;
+use TYPO3\CMS\Extensionmanager\Exception\ExtensionManagerException;
+
/**
* Parser for TYPO3's extension.xml file.
*
@@ -62,7 +64,7 @@ class ExtensionXmlPushParser extends AbstractExtensionXmlParser
{
$this->createParser();
if (!is_resource($this->objXml)) {
- throw new \TYPO3\CMS\Extensionmanager\Exception\ExtensionManagerException('Unable to create XML parser.', 1342640663);
+ throw new ExtensionManagerException('Unable to create XML parser.', 1342640663);
}
// Disables the functionality to allow external entities to be loaded when parsing the XML, must be kept
$previousValueOfEntityLoader = libxml_disable_entity_loader(true);
@@ -73,11 +75,11 @@ class ExtensionXmlPushParser extends AbstractExtensionXmlParser
xml_set_element_handler($this->objXml, 'startElement', 'endElement');
xml_set_character_data_handler($this->objXml, 'characterData');
if (!($fp = fopen($file, 'r'))) {
- throw new \TYPO3\CMS\Extensionmanager\Exception\ExtensionManagerException(sprintf('Unable to open file resource %s.', $file), 1342640689);
+ throw new ExtensionManagerException(sprintf('Unable to open file resource %s.', $file), 1342640689);
}
while ($data = fread($fp, 4096)) {
if (!xml_parse($this->objXml, $data, feof($fp))) {
- throw new \TYPO3\CMS\Extensionmanager\Exception\ExtensionManagerException(sprintf('XML error %s in line %u of file resource %s.', xml_error_string(xml_get_error_code($this->objXml)), xml_get_current_line_number($this->objXml), $file), 1342640703);
+ throw new ExtensionManagerException(sprintf('XML error %s in line %u of file resource %s.', xml_error_string(xml_get_error_code($this->objXml)), xml_get_current_line_number($this->objXml), $file), 1342640703);
}
}
libxml_disable_entity_loader($previousValueOfEntityLoader);
diff --git a/typo3/sysext/extensionmanager/Classes/Utility/Parser/MirrorXmlPullParser.php b/typo3/sysext/extensionmanager/Classes/Utility/Parser/MirrorXmlPullParser.php
index 9d24a35f6c1543afee5134d0fc4840ab8d44e25a..ddc71a3cff05f83841ece6f3ae22058e51377250 100644
--- a/typo3/sysext/extensionmanager/Classes/Utility/Parser/MirrorXmlPullParser.php
+++ b/typo3/sysext/extensionmanager/Classes/Utility/Parser/MirrorXmlPullParser.php
@@ -15,6 +15,8 @@
namespace TYPO3\CMS\Extensionmanager\Utility\Parser;
+use TYPO3\CMS\Extensionmanager\Exception\ExtensionManagerException;
+
/**
* Parser for TYPO3's mirrors.xml file.
*
@@ -47,10 +49,10 @@ class MirrorXmlPullParser extends AbstractMirrorXmlParser
{
$this->createParser();
if (!(is_object($this->objXml) && get_class($this->objXml) === \XMLReader::class)) {
- throw new \TYPO3\CMS\Extensionmanager\Exception\ExtensionManagerException('Unable to create XML parser.', 1342640820);
+ throw new ExtensionManagerException('Unable to create XML parser.', 1342640820);
}
if ($this->objXml->open($file, 'utf-8') === false) {
- throw new \TYPO3\CMS\Extensionmanager\Exception\ExtensionManagerException(sprintf('Unable to open file resource %s.', $file), 1342640893);
+ throw new ExtensionManagerException(sprintf('Unable to open file resource %s.', $file), 1342640893);
}
while ($this->objXml->read()) {
if ($this->objXml->nodeType == \XMLReader::ELEMENT) {
diff --git a/typo3/sysext/extensionmanager/Classes/Utility/Parser/MirrorXmlPushParser.php b/typo3/sysext/extensionmanager/Classes/Utility/Parser/MirrorXmlPushParser.php
index 30e5cefa359789d253e0d7e83a8f9fd258a743ab..6cd5fdd5bac483a93c69b9da4c2eaf2431db51fe 100644
--- a/typo3/sysext/extensionmanager/Classes/Utility/Parser/MirrorXmlPushParser.php
+++ b/typo3/sysext/extensionmanager/Classes/Utility/Parser/MirrorXmlPushParser.php
@@ -15,6 +15,8 @@
namespace TYPO3\CMS\Extensionmanager\Utility\Parser;
+use TYPO3\CMS\Extensionmanager\Exception\ExtensionManagerException;
+
/**
* Parser for TYPO3's mirrors.xml file.
*
@@ -60,7 +62,7 @@ class MirrorXmlPushParser extends AbstractMirrorXmlParser
{
$this->createParser();
if (!is_resource($this->objXml)) {
- throw new \TYPO3\CMS\Extensionmanager\Exception\ExtensionManagerException('Unable to create XML parser.', 1342641009);
+ throw new ExtensionManagerException('Unable to create XML parser.', 1342641009);
}
// Disables the functionality to allow external entities to be loaded when parsing the XML, must be kept
$previousValueOfEntityLoader = libxml_disable_entity_loader(true);
@@ -71,11 +73,11 @@ class MirrorXmlPushParser extends AbstractMirrorXmlParser
xml_set_element_handler($this->objXml, 'startElement', 'endElement');
xml_set_character_data_handler($this->objXml, 'characterData');
if (!($fp = fopen($file, 'r'))) {
- throw new \TYPO3\CMS\Extensionmanager\Exception\ExtensionManagerException(sprintf('Unable to open file resource %s.', $file), 1342641010);
+ throw new ExtensionManagerException(sprintf('Unable to open file resource %s.', $file), 1342641010);
}
while ($data = fread($fp, 4096)) {
if (!xml_parse($this->objXml, $data, feof($fp))) {
- throw new \TYPO3\CMS\Extensionmanager\Exception\ExtensionManagerException(sprintf('XML error %s in line %u of file resource %s.', xml_error_string(xml_get_error_code($this->objXml)), xml_get_current_line_number($this->objXml), $file), 1342641011);
+ throw new ExtensionManagerException(sprintf('XML error %s in line %u of file resource %s.', xml_error_string(xml_get_error_code($this->objXml)), xml_get_current_line_number($this->objXml), $file), 1342641011);
}
}
libxml_disable_entity_loader($previousValueOfEntityLoader);
diff --git a/typo3/sysext/extensionmanager/Classes/Utility/Parser/XmlParserFactory.php b/typo3/sysext/extensionmanager/Classes/Utility/Parser/XmlParserFactory.php
index 76a337160b8c60f5114c3914b8dcb4c159244972..f5f452d110ecf234babb77b32ac8d6cf5657dcc4 100644
--- a/typo3/sysext/extensionmanager/Classes/Utility/Parser/XmlParserFactory.php
+++ b/typo3/sysext/extensionmanager/Classes/Utility/Parser/XmlParserFactory.php
@@ -15,6 +15,8 @@
namespace TYPO3\CMS\Extensionmanager\Utility\Parser;
+use TYPO3\CMS\Core\Utility\GeneralUtility;
+
/**
* Factory for XML parsers.
* @internal This class is a specific ExtensionManager implementation and is not part of the Public TYPO3 API.
@@ -64,8 +66,8 @@ class XmlParserFactory
// reset instance
self::$instance[$parserType] = ($objParser = null);
foreach (self::$parsers[$parserType] as $className => $file) {
- if (!\TYPO3\CMS\Core\Utility\GeneralUtility::inList($excludeClassNames, $className)) {
- $objParser = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance($className);
+ if (!GeneralUtility::inList($excludeClassNames, $className)) {
+ $objParser = GeneralUtility::makeInstance($className);
if ($objParser->isAvailable()) {
self::$instance[$parserType] = &$objParser;
break;
diff --git a/typo3/sysext/extensionmanager/Classes/ViewHelpers/Be/TriggerViewHelper.php b/typo3/sysext/extensionmanager/Classes/ViewHelpers/Be/TriggerViewHelper.php
index 0927bf4d2dcef4e1be0e5427d00ee089e777082b..008a892207eb7120efcca60577b93728ab367671 100644
--- a/typo3/sysext/extensionmanager/Classes/ViewHelpers/Be/TriggerViewHelper.php
+++ b/typo3/sysext/extensionmanager/Classes/ViewHelpers/Be/TriggerViewHelper.php
@@ -16,6 +16,7 @@
namespace TYPO3\CMS\Extensionmanager\ViewHelpers\Be;
use TYPO3\CMS\Extensionmanager\Controller\AbstractController;
+use TYPO3\CMS\Fluid\ViewHelpers\Be\AbstractBackendViewHelper;
/**
* Special ViewHelper for the BE module of the Extension Manager. Loads JS code for triggering
@@ -32,7 +33,7 @@ use TYPO3\CMS\Extensionmanager\Controller\AbstractController;
*
* @internal
*/
-class TriggerViewHelper extends \TYPO3\CMS\Fluid\ViewHelpers\Be\AbstractBackendViewHelper
+class TriggerViewHelper extends AbstractBackendViewHelper
{
/**
* Initializes the arguments
diff --git a/typo3/sysext/extensionmanager/Classes/ViewHelpers/DownloadExtensionViewHelper.php b/typo3/sysext/extensionmanager/Classes/ViewHelpers/DownloadExtensionViewHelper.php
index e16f99211f54cf3d113cd063b8a4664f9d1da3ee..85cf917349bf3ce382658198fa581648b87f9942 100644
--- a/typo3/sysext/extensionmanager/Classes/ViewHelpers/DownloadExtensionViewHelper.php
+++ b/typo3/sysext/extensionmanager/Classes/ViewHelpers/DownloadExtensionViewHelper.php
@@ -18,14 +18,16 @@ namespace TYPO3\CMS\Extensionmanager\ViewHelpers;
use TYPO3\CMS\Core\Configuration\ExtensionConfiguration;
use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Extbase\Mvc\Web\Routing\UriBuilder;
+use TYPO3\CMS\Extbase\Service\ExtensionService;
use TYPO3\CMS\Extbase\Utility\LocalizationUtility;
use TYPO3\CMS\Extensionmanager\Domain\Model\Extension;
+use TYPO3\CMS\Fluid\ViewHelpers\Form\AbstractFormViewHelper;
/**
* ViewHelper
* @internal
*/
-class DownloadExtensionViewHelper extends \TYPO3\CMS\Fluid\ViewHelpers\Form\AbstractFormViewHelper
+class DownloadExtensionViewHelper extends AbstractFormViewHelper
{
/**
* @var string
@@ -40,7 +42,7 @@ class DownloadExtensionViewHelper extends \TYPO3\CMS\Fluid\ViewHelpers\Form\Abst
/**
* @param \TYPO3\CMS\Extbase\Service\ExtensionService $extensionService
*/
- public function injectExtensionService(\TYPO3\CMS\Extbase\Service\ExtensionService $extensionService)
+ public function injectExtensionService(ExtensionService $extensionService)
{
$this->extensionService = $extensionService;
}
diff --git a/typo3/sysext/extensionmanager/Classes/ViewHelpers/RemoveExtensionViewHelper.php b/typo3/sysext/extensionmanager/Classes/ViewHelpers/RemoveExtensionViewHelper.php
index 5094d5b5da22db9cf0f9329f748f9ddb5f5af63b..64f64b7742e9aee81dddbe6a7a37a362c030c945 100644
--- a/typo3/sysext/extensionmanager/Classes/ViewHelpers/RemoveExtensionViewHelper.php
+++ b/typo3/sysext/extensionmanager/Classes/ViewHelpers/RemoveExtensionViewHelper.php
@@ -17,8 +17,11 @@ namespace TYPO3\CMS\Extensionmanager\ViewHelpers;
use TYPO3\CMS\Core\Imaging\Icon;
use TYPO3\CMS\Core\Imaging\IconFactory;
+use TYPO3\CMS\Core\Utility\ExtensionManagementUtility;
use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Extbase\Mvc\Web\Routing\UriBuilder;
+use TYPO3\CMS\Extbase\Utility\LocalizationUtility;
+use TYPO3\CMS\Extensionmanager\Domain\Model\Extension;
use TYPO3\CMS\Fluid\ViewHelpers\Link\ActionViewHelper;
/**
@@ -47,11 +50,11 @@ class RemoveExtensionViewHelper extends ActionViewHelper
{
$extension = $this->arguments['extension'];
$iconFactory = GeneralUtility::makeInstance(IconFactory::class);
- if (\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::isLoaded($extension['key'])) {
+ if (ExtensionManagementUtility::isLoaded($extension['key'])) {
return '<span class="btn btn-default disabled">' . $iconFactory->getIcon('empty-empty', Icon::SIZE_SMALL)->render() . '</span>';
}
if (
- !in_array($extension['type'], \TYPO3\CMS\Extensionmanager\Domain\Model\Extension::returnAllowedInstallTypes()) ||
+ !in_array($extension['type'], Extension::returnAllowedInstallTypes()) ||
$extension['type'] === 'System'
) {
return '<span class="btn btn-default disabled">' . $iconFactory->getIcon('empty-empty', Icon::SIZE_SMALL)->render() . '</span>';
@@ -67,7 +70,7 @@ class RemoveExtensionViewHelper extends ActionViewHelper
$this->tag->addAttribute('href', $uri);
$cssClass = 'removeExtension btn btn-default';
$this->tag->addAttribute('class', $cssClass);
- $this->tag->addAttribute('title', \TYPO3\CMS\Extbase\Utility\LocalizationUtility::translate('extensionList.remove', 'extensionmanager'));
+ $this->tag->addAttribute('title', LocalizationUtility::translate('extensionList.remove', 'extensionmanager'));
$this->tag->setContent($iconFactory->getIcon('actions-edit-delete', Icon::SIZE_SMALL)->render());
return $this->tag->render();
}
diff --git a/typo3/sysext/extensionmanager/Classes/ViewHelpers/ToggleExtensionInstallationStateViewHelper.php b/typo3/sysext/extensionmanager/Classes/ViewHelpers/ToggleExtensionInstallationStateViewHelper.php
index a1af8cdcb5b5e8e360f3402de137a633f8dc8b0c..bceeadcc4b836640732490617a9cf210838b81a0 100644
--- a/typo3/sysext/extensionmanager/Classes/ViewHelpers/ToggleExtensionInstallationStateViewHelper.php
+++ b/typo3/sysext/extensionmanager/Classes/ViewHelpers/ToggleExtensionInstallationStateViewHelper.php
@@ -20,6 +20,7 @@ use TYPO3\CMS\Core\Imaging\IconFactory;
use TYPO3\CMS\Core\Package\PackageManager;
use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Extbase\Mvc\Web\Routing\UriBuilder;
+use TYPO3\CMS\Extbase\Object\ObjectManagerInterface;
use TYPO3\CMS\Extbase\Utility\LocalizationUtility;
use TYPO3\CMS\Fluid\ViewHelpers\Link\ActionViewHelper;
@@ -40,7 +41,7 @@ class ToggleExtensionInstallationStateViewHelper extends ActionViewHelper
/**
* @param \TYPO3\CMS\Extbase\Object\ObjectManagerInterface $objectManager
*/
- public function injectObjectManager(\TYPO3\CMS\Extbase\Object\ObjectManagerInterface $objectManager)
+ public function injectObjectManager(ObjectManagerInterface $objectManager)
{
$this->objectManager = $objectManager;
}
diff --git a/typo3/sysext/extensionmanager/Classes/ViewHelpers/UpdateScriptViewHelper.php b/typo3/sysext/extensionmanager/Classes/ViewHelpers/UpdateScriptViewHelper.php
index 751c6bf6808ecf7073376590948af7e7a12b9cbe..e36185958d6fc69581c6126707e152e5630276a9 100644
--- a/typo3/sysext/extensionmanager/Classes/ViewHelpers/UpdateScriptViewHelper.php
+++ b/typo3/sysext/extensionmanager/Classes/ViewHelpers/UpdateScriptViewHelper.php
@@ -19,6 +19,9 @@ use TYPO3\CMS\Core\Imaging\Icon;
use TYPO3\CMS\Core\Imaging\IconFactory;
use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Extbase\Mvc\Web\Routing\UriBuilder;
+use TYPO3\CMS\Extbase\Object\ObjectManagerInterface;
+use TYPO3\CMS\Extbase\Utility\LocalizationUtility;
+use TYPO3\CMS\Extensionmanager\Utility\UpdateScriptUtility;
use TYPO3\CMS\Fluid\ViewHelpers\Link\ActionViewHelper;
/**
@@ -34,7 +37,7 @@ class UpdateScriptViewHelper extends ActionViewHelper
/**
* @param \TYPO3\CMS\Extbase\Object\ObjectManagerInterface $objectManager
*/
- public function injectObjectManager(\TYPO3\CMS\Extbase\Object\ObjectManagerInterface $objectManager)
+ public function injectObjectManager(ObjectManagerInterface $objectManager)
{
$this->objectManager = $objectManager;
}
@@ -59,7 +62,7 @@ class UpdateScriptViewHelper extends ActionViewHelper
// If the "class.ext_update.php" file exists, build link to the update script screen
/** @var \TYPO3\CMS\Extensionmanager\Utility\UpdateScriptUtility $updateScriptUtility */
- $updateScriptUtility = $this->objectManager->get(\TYPO3\CMS\Extensionmanager\Utility\UpdateScriptUtility::class);
+ $updateScriptUtility = $this->objectManager->get(UpdateScriptUtility::class);
/** @var IconFactory $iconFactory */
$iconFactory = GeneralUtility::makeInstance(IconFactory::class);
if ($updateScriptUtility->checkUpdateScriptExists($extensionKey)) {
@@ -72,7 +75,7 @@ class UpdateScriptViewHelper extends ActionViewHelper
'UpdateScript'
);
$this->tag->addAttribute('href', $uri);
- $this->tag->addAttribute('title', \TYPO3\CMS\Extbase\Utility\LocalizationUtility::translate('extensionList.update.script', 'extensionmanager'));
+ $this->tag->addAttribute('title', LocalizationUtility::translate('extensionList.update.script', 'extensionmanager'));
$this->tag->setContent($iconFactory->getIcon('actions-refresh', Icon::SIZE_SMALL)->render());
$tag = $this->tag->render();
} else {
diff --git a/typo3/sysext/extensionmanager/Tests/Unit/Controller/DownloadControllerTest.php b/typo3/sysext/extensionmanager/Tests/Unit/Controller/DownloadControllerTest.php
index 7dc5dcc506d1056268899a61a8a530b4d9e7e1c3..c8da0dedb777d29040be24eb2c109342f5c21442 100644
--- a/typo3/sysext/extensionmanager/Tests/Unit/Controller/DownloadControllerTest.php
+++ b/typo3/sysext/extensionmanager/Tests/Unit/Controller/DownloadControllerTest.php
@@ -16,7 +16,10 @@
namespace TYPO3\CMS\Extensionmanager\Tests\Unit\Controller;
use PHPUnit\Framework\MockObject\MockObject;
+use TYPO3\CMS\Extensionmanager\Controller\DownloadController;
use TYPO3\CMS\Extensionmanager\Domain\Model\Extension;
+use TYPO3\CMS\Extensionmanager\Exception\ExtensionManagerException;
+use TYPO3\CMS\Extensionmanager\Utility\DownloadUtility;
use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
/**
@@ -30,18 +33,18 @@ class DownloadControllerTest extends UnitTestCase
public function installFromTerReturnsArrayWithBooleanResultAndErrorArrayWhenExtensionManagerExceptionIsThrown(): void
{
$dummyExceptionMessage = 'exception message';
- $dummyException = new \TYPO3\CMS\Extensionmanager\Exception\ExtensionManagerException($dummyExceptionMessage, 1476108614);
+ $dummyException = new ExtensionManagerException($dummyExceptionMessage, 1476108614);
$dummyExtensionName = 'dummy_extension';
$dummyExtension = new Extension();
$dummyExtension->setExtensionKey($dummyExtensionName);
/** @var \TYPO3\CMS\Extensionmanager\Utility\DownloadUtility|MockObject $downloadUtilityMock */
- $downloadUtilityMock = $this->getMockBuilder(\TYPO3\CMS\Extensionmanager\Utility\DownloadUtility::class)->getMock();
+ $downloadUtilityMock = $this->getMockBuilder(DownloadUtility::class)->getMock();
$downloadUtilityMock->expects(self::any())->method('setDownloadPath')->willThrowException($dummyException);
/** @var \TYPO3\CMS\Extensionmanager\Controller\DownloadController $subject */
- $subject = new \TYPO3\CMS\Extensionmanager\Controller\DownloadController();
+ $subject = new DownloadController();
$subject->injectDownloadUtility($downloadUtilityMock);
$reflectionClass = new \ReflectionClass($subject);
diff --git a/typo3/sysext/extensionmanager/Tests/Unit/Controller/UploadExtensionFileControllerTest.php b/typo3/sysext/extensionmanager/Tests/Unit/Controller/UploadExtensionFileControllerTest.php
index 91a9e1e518802dc29d1008f45c39e3137d433a8a..927221735c78929a22f633cb2a62cdf16e1b33fd 100644
--- a/typo3/sysext/extensionmanager/Tests/Unit/Controller/UploadExtensionFileControllerTest.php
+++ b/typo3/sysext/extensionmanager/Tests/Unit/Controller/UploadExtensionFileControllerTest.php
@@ -16,6 +16,9 @@
namespace TYPO3\CMS\Extensionmanager\Tests\Unit\Controller;
use PHPUnit\Framework\MockObject\MockObject;
+use TYPO3\CMS\Extensionmanager\Controller\UploadExtensionFileController;
+use TYPO3\CMS\Extensionmanager\Service\ExtensionManagementService;
+use TYPO3\CMS\Extensionmanager\Utility\FileHandlingUtility;
use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
/**
@@ -68,7 +71,7 @@ class UploadExtensionFileControllerTest extends UnitTestCase
public function getExtensionFromZipFileExtractsExtensionKey($filename, $expectedKey)
{
/** @var \TYPO3\CMS\Extensionmanager\Service\ExtensionManagementService|MockObject $managementServiceMock */
- $managementServiceMock = $this->getMockBuilder(\TYPO3\CMS\Extensionmanager\Service\ExtensionManagementService::class)
+ $managementServiceMock = $this->getMockBuilder(ExtensionManagementService::class)
->setMethods(['isAvailable'])
->disableOriginalConstructor()
->getMock();
@@ -78,10 +81,10 @@ class UploadExtensionFileControllerTest extends UnitTestCase
->willReturn(false);
/** @var \TYPO3\CMS\Extensionmanager\Utility\FileHandlingUtility|MockObject $fileHandlingUtilityMock */
- $fileHandlingUtilityMock = $this->createMock(\TYPO3\CMS\Extensionmanager\Utility\FileHandlingUtility::class);
+ $fileHandlingUtilityMock = $this->createMock(FileHandlingUtility::class);
$fileHandlingUtilityMock->expects(self::once())->method('unzipExtensionFromFile');
- $fixture = new \TYPO3\CMS\Extensionmanager\Controller\UploadExtensionFileController();
+ $fixture = new UploadExtensionFileController();
$fixture->injectManagementService($managementServiceMock);
$fixture->injectFileHandlingUtility($fileHandlingUtilityMock);
diff --git a/typo3/sysext/extensionmanager/Tests/Unit/Domain/Model/ExtensionTest.php b/typo3/sysext/extensionmanager/Tests/Unit/Domain/Model/ExtensionTest.php
index 57232b96648efe080263e242cd041519ee9faac6..0a06de53be7421d4f26c0602c70ba530cc2342e6 100644
--- a/typo3/sysext/extensionmanager/Tests/Unit/Domain/Model/ExtensionTest.php
+++ b/typo3/sysext/extensionmanager/Tests/Unit/Domain/Model/ExtensionTest.php
@@ -15,6 +15,7 @@
namespace TYPO3\CMS\Extensionmanager\Tests\Unit\Domain\Model;
+use TYPO3\CMS\Extensionmanager\Domain\Model\Extension;
use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
/**
@@ -85,7 +86,7 @@ class ExtensionTest extends UnitTestCase
*/
public function getCategoryIndexFromStringOrNumberReturnsIndex($input, $expected)
{
- $extension = new \TYPO3\CMS\Extensionmanager\Domain\Model\Extension();
+ $extension = new Extension();
self::assertEquals($expected, $extension->getCategoryIndexFromStringOrNumber($input));
}
}
diff --git a/typo3/sysext/extensionmanager/Tests/Unit/Domain/Repository/RepositoryRepositoryTest.php b/typo3/sysext/extensionmanager/Tests/Unit/Domain/Repository/RepositoryRepositoryTest.php
index 506a0f4e20468d4577ba3a9f69d4854f0ba6a018..278e2277aac6a35205ea0675c74c5f5729057a52 100644
--- a/typo3/sysext/extensionmanager/Tests/Unit/Domain/Repository/RepositoryRepositoryTest.php
+++ b/typo3/sysext/extensionmanager/Tests/Unit/Domain/Repository/RepositoryRepositoryTest.php
@@ -15,6 +15,9 @@
namespace TYPO3\CMS\Extensionmanager\Tests\Unit\Domain\Repository;
+use TYPO3\CMS\Extbase\Object\ObjectManagerInterface;
+use TYPO3\CMS\Extensionmanager\Domain\Model\Repository;
+use TYPO3\CMS\Extensionmanager\Domain\Repository\RepositoryRepository;
use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
/**
@@ -35,9 +38,9 @@ class RepositoryRepositoryTest extends UnitTestCase
protected function setUp(): void
{
parent::setUp();
- $this->mockObjectManager = $this->getMockBuilder(\TYPO3\CMS\Extbase\Object\ObjectManagerInterface::class)->getMock();
+ $this->mockObjectManager = $this->getMockBuilder(ObjectManagerInterface::class)->getMock();
/** @var $subject \TYPO3\CMS\Extensionmanager\Domain\Repository\RepositoryRepository|\PHPUnit\Framework\MockObject\MockObject */
- $this->subject = $this->getMockBuilder(\TYPO3\CMS\Extensionmanager\Domain\Repository\RepositoryRepository::class)
+ $this->subject = $this->getMockBuilder(RepositoryRepository::class)
->setMethods(['findAll'])
->setConstructorArgs([$this->mockObjectManager])
->getMock();
@@ -61,12 +64,12 @@ class RepositoryRepositoryTest extends UnitTestCase
*/
public function findOneTypo3OrgRepositoryReturnsRepositoryWithCorrectTitle()
{
- $mockModelOne = $this->getMockBuilder(\TYPO3\CMS\Extensionmanager\Domain\Model\Repository::class)->getMock();
+ $mockModelOne = $this->getMockBuilder(Repository::class)->getMock();
$mockModelOne
->expects(self::once())
->method('getTitle')
->willReturn('foo');
- $mockModelTwo = $this->getMockBuilder(\TYPO3\CMS\Extensionmanager\Domain\Model\Repository::class)->getMock();
+ $mockModelTwo = $this->getMockBuilder(Repository::class)->getMock();
$mockModelTwo
->expects(self::once())
->method('getTitle')
diff --git a/typo3/sysext/extensionmanager/Tests/Unit/Task/UpdateExtensionListTaskTest.php b/typo3/sysext/extensionmanager/Tests/Unit/Task/UpdateExtensionListTaskTest.php
index 2f939ad46061cda91f9afaafedc58ef1223d6d50..9f5ee2ce6fbf1bb997d35e4965365ee2fa272867 100644
--- a/typo3/sysext/extensionmanager/Tests/Unit/Task/UpdateExtensionListTaskTest.php
+++ b/typo3/sysext/extensionmanager/Tests/Unit/Task/UpdateExtensionListTaskTest.php
@@ -15,6 +15,9 @@
namespace TYPO3\CMS\Extensionmanager\Tests\Unit\Task;
+use TYPO3\CMS\Core\Utility\GeneralUtility;
+use TYPO3\CMS\Extbase\Object\ObjectManager;
+use TYPO3\CMS\Extbase\Persistence\Generic\PersistenceManager;
use TYPO3\CMS\Extensionmanager\Task\UpdateExtensionListTask;
use TYPO3\CMS\Extensionmanager\Utility\Repository\Helper;
use TYPO3\CMS\Scheduler\Task\AbstractTask;
@@ -49,20 +52,20 @@ class UpdateExtensionListTaskTest extends UnitTestCase
->expects(self::once())
->method('updateExtList');
- $objectManagerMock = $this->createMock(\TYPO3\CMS\Extbase\Object\ObjectManager::class);
+ $objectManagerMock = $this->createMock(ObjectManager::class);
$objectManagerMock
->expects(self::at(0))
->method('get')
->with(Helper::class)
->willReturn($repositoryHelper);
- $persistenceManagerMock = $this->getMockBuilder(\TYPO3\CMS\Extbase\Persistence\Generic\PersistenceManager::class)->disableOriginalConstructor()->getMock();
+ $persistenceManagerMock = $this->getMockBuilder(PersistenceManager::class)->disableOriginalConstructor()->getMock();
$objectManagerMock
->expects(self::at(1))
->method('get')
->willReturn($persistenceManagerMock);
- \TYPO3\CMS\Core\Utility\GeneralUtility::setSingletonInstance(\TYPO3\CMS\Extbase\Object\ObjectManager::class, $objectManagerMock);
+ GeneralUtility::setSingletonInstance(ObjectManager::class, $objectManagerMock);
$task = $this->getMockBuilder(UpdateExtensionListTask::class)
->setMethods(['dummy'])
@@ -77,14 +80,14 @@ class UpdateExtensionListTaskTest extends UnitTestCase
public function executeCallsPersistAllOnPersistenceManager()
{
$repositoryHelper = $this->createMock(Helper::class);
- $objectManagerMock = $this->createMock(\TYPO3\CMS\Extbase\Object\ObjectManager::class);
+ $objectManagerMock = $this->createMock(ObjectManager::class);
$objectManagerMock
->expects(self::at(0))
->method('get')
->with(Helper::class)
->willReturn($repositoryHelper);
- $persistenceManagerMock = $this->getMockBuilder(\TYPO3\CMS\Extbase\Persistence\Generic\PersistenceManager::class)->disableOriginalConstructor()->getMock();
+ $persistenceManagerMock = $this->getMockBuilder(PersistenceManager::class)->disableOriginalConstructor()->getMock();
$persistenceManagerMock
->expects(self::once())
->method('persistAll');
@@ -94,7 +97,7 @@ class UpdateExtensionListTaskTest extends UnitTestCase
->method('get')
->willReturn($persistenceManagerMock);
- \TYPO3\CMS\Core\Utility\GeneralUtility::setSingletonInstance(\TYPO3\CMS\Extbase\Object\ObjectManager::class, $objectManagerMock);
+ GeneralUtility::setSingletonInstance(ObjectManager::class, $objectManagerMock);
/** @var UpdateExtensionListTask|PHPUnit_Framework_MockObject_MockObject $task */
$task = $this->getMockBuilder(UpdateExtensionListTask::class)
diff --git a/typo3/sysext/extensionmanager/Tests/Unit/Utility/DependencyUtilityTest.php b/typo3/sysext/extensionmanager/Tests/Unit/Utility/DependencyUtilityTest.php
index 5ec2f9861e7efe98dd1450061aa492ea25e1699a..7000af2e2f30a68f76e60bb911a7e7c951fd7430 100644
--- a/typo3/sysext/extensionmanager/Tests/Unit/Utility/DependencyUtilityTest.php
+++ b/typo3/sysext/extensionmanager/Tests/Unit/Utility/DependencyUtilityTest.php
@@ -16,11 +16,14 @@
namespace TYPO3\CMS\Extensionmanager\Tests\Unit\Utility;
use Psr\EventDispatcher\EventDispatcherInterface;
+use TYPO3\CMS\Extbase\Object\ObjectManagerInterface;
use TYPO3\CMS\Extensionmanager\Domain\Model\Dependency;
use TYPO3\CMS\Extensionmanager\Domain\Model\Extension;
use TYPO3\CMS\Extensionmanager\Domain\Repository\ExtensionRepository;
use TYPO3\CMS\Extensionmanager\Exception\ExtensionManagerException;
+use TYPO3\CMS\Extensionmanager\Tests\Unit\Fixtures\LatestCompatibleExtensionObjectStorageFixture;
use TYPO3\CMS\Extensionmanager\Utility\DependencyUtility;
+use TYPO3\CMS\Extensionmanager\Utility\EmConfUtility;
use TYPO3\CMS\Extensionmanager\Utility\ListUtility;
use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
@@ -40,7 +43,7 @@ class DependencyUtilityTest extends UnitTestCase
protected function setUp(): void
{
parent::setUp();
- $this->objectManagerMock = $this->getMockBuilder(\TYPO3\CMS\Extbase\Object\ObjectManagerInterface::class)->getMock();
+ $this->objectManagerMock = $this->getMockBuilder(ObjectManagerInterface::class)->getMock();
}
/**
@@ -353,7 +356,7 @@ class DependencyUtilityTest extends UnitTestCase
*/
public function isAvailableVersionCompatibleCallsIsVersionCompatibleWithExtensionVersion(): void
{
- $emConfUtility = $this->getMockBuilder(\TYPO3\CMS\Extensionmanager\Utility\EmConfUtility::class)
+ $emConfUtility = $this->getMockBuilder(EmConfUtility::class)
->setMethods(['includeEmConf'])
->getMock();
$emConfUtility->expects(self::once())->method('includeEmConf')->willReturn([
@@ -483,7 +486,7 @@ class DependencyUtilityTest extends UnitTestCase
$extension2->setExtensionKey('bar');
$extension2->setVersion('1.0.42');
- $myStorage = new \TYPO3\CMS\Extensionmanager\Tests\Unit\Fixtures\LatestCompatibleExtensionObjectStorageFixture();
+ $myStorage = new LatestCompatibleExtensionObjectStorageFixture();
$myStorage->extensions[] = $extension1;
$myStorage->extensions[] = $extension2;
$dependency = new Dependency();
diff --git a/typo3/sysext/extensionmanager/Tests/Unit/Utility/ExtensionModelUtilityTest.php b/typo3/sysext/extensionmanager/Tests/Unit/Utility/ExtensionModelUtilityTest.php
index cf4343ae26cc55caae2ed5eaa90a923a7749b841..db366a49a9dad92a3f79edefd238453fe6e8e319 100644
--- a/typo3/sysext/extensionmanager/Tests/Unit/Utility/ExtensionModelUtilityTest.php
+++ b/typo3/sysext/extensionmanager/Tests/Unit/Utility/ExtensionModelUtilityTest.php
@@ -15,6 +15,7 @@
namespace TYPO3\CMS\Extensionmanager\Tests\Unit\Utility;
+use TYPO3\CMS\Extbase\Object\ObjectManager;
use TYPO3\CMS\Extensionmanager\Domain\Model\Dependency;
use TYPO3\CMS\Extensionmanager\Utility\ExtensionModelUtility;
use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
@@ -43,7 +44,7 @@ class ExtensionModelUtilityTest extends UnitTestCase
]);
/** @var $dependencyUtility \TYPO3\CMS\Extensionmanager\Utility\ExtensionModelUtility */
$dependencyUtility = new ExtensionModelUtility();
- $objectManagerMock = $this->createMock(\TYPO3\CMS\Extbase\Object\ObjectManager::class);
+ $objectManagerMock = $this->createMock(ObjectManager::class);
$objectManagerMock->method('get')->willReturn(new Dependency());
$dependencyUtility->injectObjectManager($objectManagerMock);
$objectStorage = $dependencyUtility->convertDependenciesToObjects($serializedDependencies);
@@ -64,7 +65,7 @@ class ExtensionModelUtilityTest extends UnitTestCase
]);
$dependencyUtility = new ExtensionModelUtility();
- $objectManagerMock = $this->createMock(\TYPO3\CMS\Extbase\Object\ObjectManager::class);
+ $objectManagerMock = $this->createMock(ObjectManager::class);
// ensure we get a new dependency on subsequent calls
$objectManagerMock->method('get')->willReturnCallback(
static function () {
@@ -143,7 +144,7 @@ class ExtensionModelUtilityTest extends UnitTestCase
{
$serializedDependencies = serialize($dependencies);
$dependencyUtility = new ExtensionModelUtility();
- $objectManagerMock = $this->createMock(\TYPO3\CMS\Extbase\Object\ObjectManager::class);
+ $objectManagerMock = $this->createMock(ObjectManager::class);
// ensure we get a new dependency on subsequent calls
$objectManagerMock->method('get')->willReturnCallback(
static function () {
diff --git a/typo3/sysext/felogin/Classes/Controller/FrontendLoginController.php b/typo3/sysext/felogin/Classes/Controller/FrontendLoginController.php
index f63a09bef065142fb8bd92d0653a47682aa86c55..9e2adc7f5fb67fe0f14585a1b7a3570a714a579d 100644
--- a/typo3/sysext/felogin/Classes/Controller/FrontendLoginController.php
+++ b/typo3/sysext/felogin/Classes/Controller/FrontendLoginController.php
@@ -26,6 +26,7 @@ use TYPO3\CMS\Core\Database\Query\Restriction\FrontendRestrictionContainer;
use TYPO3\CMS\Core\Mail\MailMessage;
use TYPO3\CMS\Core\Session\SessionManager;
use TYPO3\CMS\Core\Site\SiteFinder;
+use TYPO3\CMS\Core\Utility\ArrayUtility;
use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Core\Utility\HttpUtility;
use TYPO3\CMS\Core\Utility\MailUtility;
@@ -216,7 +217,7 @@ class FrontendLoginController extends AbstractPlugin
GeneralUtility::callUserFunction($_funcRef, $_params, $ref);
}
}
- \TYPO3\CMS\Core\Utility\HttpUtility::redirect($this->redirectUrl);
+ HttpUtility::redirect($this->redirectUrl);
}
}
// Adds hook for processing of extra item markers / special
@@ -1041,7 +1042,7 @@ class FrontendLoginController extends AbstractPlugin
$preserveQueryStringProperties = GeneralUtility::trimExplode(',', $this->conf['preserveGETvars']);
$preserveQueryParts = [];
parse_str(implode('=1&', $preserveQueryStringProperties) . '=1', $preserveQueryParts);
- $preserveQueryParts = \TYPO3\CMS\Core\Utility\ArrayUtility::intersectRecursive($getVars, $preserveQueryParts);
+ $preserveQueryParts = ArrayUtility::intersectRecursive($getVars, $preserveQueryParts);
}
return $preserveQueryParts;
}
diff --git a/typo3/sysext/filelist/Classes/ContextMenu/ItemProviders/FileDragProvider.php b/typo3/sysext/filelist/Classes/ContextMenu/ItemProviders/FileDragProvider.php
index 113fde593062616fef53f496e704a4326cf2b909..a662698ae3308bf88aac159249cb5789619b2440 100644
--- a/typo3/sysext/filelist/Classes/ContextMenu/ItemProviders/FileDragProvider.php
+++ b/typo3/sysext/filelist/Classes/ContextMenu/ItemProviders/FileDragProvider.php
@@ -17,13 +17,14 @@ declare(strict_types=1);
namespace TYPO3\CMS\Filelist\ContextMenu\ItemProviders;
+use TYPO3\CMS\Backend\ContextMenu\ItemProviders\AbstractProvider;
use TYPO3\CMS\Core\Utility\GeneralUtility;
/**
* Drag drop menu provider for legacy tree (used in filelist folder tree)
* @internal this is a concrete TYPO3 hook implementation and solely used for EXT:filelist and not part of TYPO3's Core API.
*/
-class FileDragProvider extends \TYPO3\CMS\Backend\ContextMenu\ItemProviders\AbstractProvider
+class FileDragProvider extends AbstractProvider
{
/**
* @var array
diff --git a/typo3/sysext/filelist/Classes/ContextMenu/ItemProviders/FileProvider.php b/typo3/sysext/filelist/Classes/ContextMenu/ItemProviders/FileProvider.php
index 5f2e1bee9223195ca84dfda9dc6279bb1c3a4f92..a17aec7c7868de6878d31f9a89dd37655b19bc63 100644
--- a/typo3/sysext/filelist/Classes/ContextMenu/ItemProviders/FileProvider.php
+++ b/typo3/sysext/filelist/Classes/ContextMenu/ItemProviders/FileProvider.php
@@ -17,6 +17,7 @@ declare(strict_types=1);
namespace TYPO3\CMS\Filelist\ContextMenu\ItemProviders;
+use TYPO3\CMS\Backend\ContextMenu\ItemProviders\AbstractProvider;
use TYPO3\CMS\Backend\Utility\BackendUtility;
use TYPO3\CMS\Core\Resource\File;
use TYPO3\CMS\Core\Resource\Folder;
@@ -27,7 +28,7 @@ use TYPO3\CMS\Core\Utility\GeneralUtility;
/**
* Provides click menu items for files and folders
*/
-class FileProvider extends \TYPO3\CMS\Backend\ContextMenu\ItemProviders\AbstractProvider
+class FileProvider extends AbstractProvider
{
/**
* @var File|Folder
diff --git a/typo3/sysext/filelist/Classes/Controller/File/FileUploadController.php b/typo3/sysext/filelist/Classes/Controller/File/FileUploadController.php
index 394639016f17b759bf38f519518695b44763a064..145ea74c800af0bd92ed2bd28ed458ca93700628 100644
--- a/typo3/sysext/filelist/Classes/Controller/File/FileUploadController.php
+++ b/typo3/sysext/filelist/Classes/Controller/File/FileUploadController.php
@@ -19,6 +19,7 @@ namespace TYPO3\CMS\Filelist\Controller\File;
use Psr\Http\Message\ResponseInterface;
use Psr\Http\Message\ServerRequestInterface;
+use TYPO3\CMS\Backend\Routing\UriBuilder;
use TYPO3\CMS\Backend\Template\ModuleTemplate;
use TYPO3\CMS\Core\Http\HtmlResponse;
use TYPO3\CMS\Core\Imaging\Icon;
@@ -95,7 +96,7 @@ class FileUploadController
$queryParams = $request->getQueryParams();
/** @var \TYPO3\CMS\Backend\Routing\UriBuilder $uriBuilder */
- $uriBuilder = GeneralUtility::makeInstance(\TYPO3\CMS\Backend\Routing\UriBuilder::class);
+ $uriBuilder = GeneralUtility::makeInstance(UriBuilder::class);
// Initialize GPvars:
$this->target = $parsedBody['target'] ?? $queryParams['target'] ?? null;
$this->returnUrl = GeneralUtility::sanitizeLocalUrl($parsedBody['returnUrl'] ?? $queryParams['returnUrl'] ?? '');
@@ -140,7 +141,7 @@ class FileUploadController
{
$lang = $this->getLanguageService();
/** @var \TYPO3\CMS\Backend\Routing\UriBuilder $uriBuilder */
- $uriBuilder = GeneralUtility::makeInstance(\TYPO3\CMS\Backend\Routing\UriBuilder::class);
+ $uriBuilder = GeneralUtility::makeInstance(UriBuilder::class);
// set page title
$this->moduleTemplate->setTitle($lang->sL('LLL:EXT:filelist/Resources/Private/Language/locallang.xlf:file_upload.php.pagetitle'));
diff --git a/typo3/sysext/filelist/Classes/Controller/File/RenameFileController.php b/typo3/sysext/filelist/Classes/Controller/File/RenameFileController.php
index 8eda2232144fd7d3771c86d4742d7f284e17a47c..14bd75384877935cf6bc318545a53d67d87e3c48 100644
--- a/typo3/sysext/filelist/Classes/Controller/File/RenameFileController.php
+++ b/typo3/sysext/filelist/Classes/Controller/File/RenameFileController.php
@@ -19,6 +19,7 @@ namespace TYPO3\CMS\Filelist\Controller\File;
use Psr\Http\Message\ResponseInterface;
use Psr\Http\Message\ServerRequestInterface;
+use TYPO3\CMS\Backend\Routing\UriBuilder;
use TYPO3\CMS\Backend\Template\Components\ButtonBar;
use TYPO3\CMS\Backend\Template\ModuleTemplate;
use TYPO3\CMS\Core\Http\HtmlResponse;
@@ -142,7 +143,7 @@ class RenameFileController
{
$assigns = [];
/** @var \TYPO3\CMS\Backend\Routing\UriBuilder $uriBuilder */
- $uriBuilder = GeneralUtility::makeInstance(\TYPO3\CMS\Backend\Routing\UriBuilder::class);
+ $uriBuilder = GeneralUtility::makeInstance(UriBuilder::class);
$assigns['moduleUrlTceFile'] = (string)$uriBuilder->buildUriFromRoute('tce_file');
$assigns['returnUrl'] = $this->returnUrl;
diff --git a/typo3/sysext/filelist/Classes/Controller/FileListController.php b/typo3/sysext/filelist/Classes/Controller/FileListController.php
index 00aa380c2d610459d26239281c8e97c355355e4b..d7c120f99f0117fe960516d3954a713d12601cc7 100644
--- a/typo3/sysext/filelist/Classes/Controller/FileListController.php
+++ b/typo3/sysext/filelist/Classes/Controller/FileListController.php
@@ -29,8 +29,11 @@ use TYPO3\CMS\Core\Localization\LanguageService;
use TYPO3\CMS\Core\Messaging\FlashMessage;
use TYPO3\CMS\Core\Resource\DuplicationBehavior;
use TYPO3\CMS\Core\Resource\Exception;
+use TYPO3\CMS\Core\Resource\Exception\InsufficientFolderAccessPermissionsException;
+use TYPO3\CMS\Core\Resource\FileRepository;
use TYPO3\CMS\Core\Resource\Folder;
use TYPO3\CMS\Core\Resource\ResourceFactory;
+use TYPO3\CMS\Core\Resource\ResourceStorage;
use TYPO3\CMS\Core\Resource\Search\FileSearchDemand;
use TYPO3\CMS\Core\Resource\Utility\ListUtility;
use TYPO3\CMS\Core\Type\Bitmask\JsConfirmation;
@@ -144,7 +147,7 @@ class FileListController extends ActionController implements LoggerAwareInterfac
/**
* @param \TYPO3\CMS\Core\Resource\FileRepository $fileRepository
*/
- public function injectFileRepository(\TYPO3\CMS\Core\Resource\FileRepository $fileRepository)
+ public function injectFileRepository(FileRepository $fileRepository)
{
$this->fileRepository = $fileRepository;
}
@@ -180,7 +183,7 @@ class FileListController extends ActionController implements LoggerAwareInterfac
$this->folderObject = $resourceFactory->getFolderObjectFromCombinedIdentifier($storage->getUid() . ':' . $identifier);
// Disallow access to fallback storage 0
if ($storage->getUid() === 0) {
- throw new Exception\InsufficientFolderAccessPermissionsException(
+ throw new InsufficientFolderAccessPermissionsException(
'You are not allowed to access files outside your storages',
1434539815
);
@@ -203,7 +206,7 @@ class FileListController extends ActionController implements LoggerAwareInterfac
if ($this->folderObject && !$this->folderObject->getStorage()->isWithinFileMountBoundaries($this->folderObject)) {
throw new \RuntimeException('Folder not accessible.', 1430409089);
}
- } catch (Exception\InsufficientFolderAccessPermissionsException $permissionException) {
+ } catch (InsufficientFolderAccessPermissionsException $permissionException) {
$this->folderObject = null;
$this->errorMessage = GeneralUtility::makeInstance(
FlashMessage::class,
@@ -220,7 +223,7 @@ class FileListController extends ActionController implements LoggerAwareInterfac
// Take the first object of the first storage
$fileStorages = $this->getBackendUser()->getFileStorages();
$fileStorage = reset($fileStorages);
- if ($fileStorage instanceof \TYPO3\CMS\Core\Resource\ResourceStorage) {
+ if ($fileStorage instanceof ResourceStorage) {
$this->folderObject = $fileStorage->getRootLevelFolder();
if (!$fileStorage->isWithinFileMountBoundaries($this->folderObject)) {
$this->folderObject = null;
diff --git a/typo3/sysext/filelist/Classes/FileListFolderTree.php b/typo3/sysext/filelist/Classes/FileListFolderTree.php
index ff944de1b180387f6c11fafea964646ceead38c2..3cff5c126b0a432ce44bda58984510cf2365dac7 100644
--- a/typo3/sysext/filelist/Classes/FileListFolderTree.php
+++ b/typo3/sysext/filelist/Classes/FileListFolderTree.php
@@ -15,12 +15,14 @@
namespace TYPO3\CMS\Filelist;
+use TYPO3\CMS\Backend\Tree\View\FolderTreeView;
+
/**
* Class for drag and drop and ajax functionality
* @see class \TYPO3\CMS\Backend\Tree\View\BrowseTreeView
* @internal this is a concrete TYPO3 tree implementation and solely used for EXT:filelist and not part of TYPO3's Core API.
*/
-class FileListFolderTree extends \TYPO3\CMS\Backend\Tree\View\FolderTreeView
+class FileListFolderTree extends FolderTreeView
{
/**
* @var bool
diff --git a/typo3/sysext/filelist/Classes/Hook/BackendControllerHook.php b/typo3/sysext/filelist/Classes/Hook/BackendControllerHook.php
index c9d6f92f8c89f9c88ced2788474fb7d8ee583f19..809b24d4eb5d74bf6a3b7cdb4f30c40f5e66c271 100644
--- a/typo3/sysext/filelist/Classes/Hook/BackendControllerHook.php
+++ b/typo3/sysext/filelist/Classes/Hook/BackendControllerHook.php
@@ -16,6 +16,7 @@
namespace TYPO3\CMS\Filelist\Hook;
use TYPO3\CMS\Backend\Controller\BackendController;
+use TYPO3\CMS\Backend\Routing\UriBuilder;
use TYPO3\CMS\Core\Page\PageRenderer;
use TYPO3\CMS\Core\Utility\GeneralUtility;
@@ -35,7 +36,7 @@ class BackendControllerHook
{
$pageRenderer = GeneralUtility::makeInstance(PageRenderer::class);
/** @var \TYPO3\CMS\Backend\Routing\UriBuilder $uriBuilder */
- $uriBuilder = GeneralUtility::makeInstance(\TYPO3\CMS\Backend\Routing\UriBuilder::class);
+ $uriBuilder = GeneralUtility::makeInstance(UriBuilder::class);
$pageRenderer->addInlineSetting('FileRename', 'moduleUrl', (string)$uriBuilder->buildUriFromRoute('file_rename'));
$pageRenderer->addInlineSetting('FileEdit', 'moduleUrl', (string)$uriBuilder->buildUriFromRoute('file_edit'));
$pageRenderer->addInlineSetting('FileUpload', 'moduleUrl', (string)$uriBuilder->buildUriFromRoute('file_upload'));
diff --git a/typo3/sysext/filelist/Classes/ViewHelpers/Uri/CopyCutFileViewHelper.php b/typo3/sysext/filelist/Classes/ViewHelpers/Uri/CopyCutFileViewHelper.php
index 6003caee31988e2580630d3e27fbda7aa4aa3dcd..6c3e48399509f0540e52d60d23360d6426965a8e 100644
--- a/typo3/sysext/filelist/Classes/ViewHelpers/Uri/CopyCutFileViewHelper.php
+++ b/typo3/sysext/filelist/Classes/ViewHelpers/Uri/CopyCutFileViewHelper.php
@@ -17,6 +17,7 @@ namespace TYPO3\CMS\Filelist\ViewHelpers\Uri;
use Closure;
use TYPO3\CMS\Backend\Clipboard\Clipboard;
+use TYPO3\CMS\Core\Resource\AbstractFile;
use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
@@ -34,7 +35,7 @@ class CopyCutFileViewHelper extends AbstractViewHelper
*/
public function initializeArguments()
{
- $this->registerArgument('file', \TYPO3\CMS\Core\Resource\AbstractFile::class, '', true);
+ $this->registerArgument('file', AbstractFile::class, '', true);
$this->registerArgument('copyOrCut', 'string', '', false, 'copy');
}
diff --git a/typo3/sysext/filelist/Classes/ViewHelpers/Uri/EditFileContentViewHelper.php b/typo3/sysext/filelist/Classes/ViewHelpers/Uri/EditFileContentViewHelper.php
index 47e60c18ae4f1db11d893d8e680242945d31e369..7d43f023cba4db1932bd1144dae295b7e3bf55e1 100644
--- a/typo3/sysext/filelist/Classes/ViewHelpers/Uri/EditFileContentViewHelper.php
+++ b/typo3/sysext/filelist/Classes/ViewHelpers/Uri/EditFileContentViewHelper.php
@@ -17,6 +17,7 @@ namespace TYPO3\CMS\Filelist\ViewHelpers\Uri;
use Closure;
use TYPO3\CMS\Backend\Routing\UriBuilder;
+use TYPO3\CMS\Core\Resource\AbstractFile;
use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
@@ -34,7 +35,7 @@ class EditFileContentViewHelper extends AbstractViewHelper
*/
public function initializeArguments()
{
- $this->registerArgument('file', \TYPO3\CMS\Core\Resource\AbstractFile::class, '', true);
+ $this->registerArgument('file', AbstractFile::class, '', true);
$this->registerArgument('returnUrl', 'string', '', false, '');
}
diff --git a/typo3/sysext/filelist/Classes/ViewHelpers/Uri/RenameFileViewHelper.php b/typo3/sysext/filelist/Classes/ViewHelpers/Uri/RenameFileViewHelper.php
index 971a69273c8152d3a25f8fd3e29cfdd72a5daf54..01d1bd0a22d41b55eb90ab46eec06572489fea38 100644
--- a/typo3/sysext/filelist/Classes/ViewHelpers/Uri/RenameFileViewHelper.php
+++ b/typo3/sysext/filelist/Classes/ViewHelpers/Uri/RenameFileViewHelper.php
@@ -16,6 +16,7 @@
namespace TYPO3\CMS\Filelist\ViewHelpers\Uri;
use TYPO3\CMS\Backend\Routing\UriBuilder;
+use TYPO3\CMS\Core\Resource\AbstractFile;
use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
@@ -33,7 +34,7 @@ class RenameFileViewHelper extends AbstractViewHelper
*/
public function initializeArguments()
{
- $this->registerArgument('file', \TYPO3\CMS\Core\Resource\AbstractFile::class, '', true);
+ $this->registerArgument('file', AbstractFile::class, '', true);
$this->registerArgument('returnUrl', 'string', '', false, '');
}
diff --git a/typo3/sysext/filelist/Classes/ViewHelpers/Uri/ReplaceFileViewHelper.php b/typo3/sysext/filelist/Classes/ViewHelpers/Uri/ReplaceFileViewHelper.php
index 1da4c086188dc4b1c398e6837bd767a8455ca0ad..d7dc83cfed87f6db19b6460203d7ea64563801a6 100644
--- a/typo3/sysext/filelist/Classes/ViewHelpers/Uri/ReplaceFileViewHelper.php
+++ b/typo3/sysext/filelist/Classes/ViewHelpers/Uri/ReplaceFileViewHelper.php
@@ -16,6 +16,7 @@
namespace TYPO3\CMS\Filelist\ViewHelpers\Uri;
use TYPO3\CMS\Backend\Routing\UriBuilder;
+use TYPO3\CMS\Core\Resource\AbstractFile;
use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
@@ -33,7 +34,7 @@ class ReplaceFileViewHelper extends AbstractViewHelper
*/
public function initializeArguments()
{
- $this->registerArgument('file', \TYPO3\CMS\Core\Resource\AbstractFile::class, '', true);
+ $this->registerArgument('file', AbstractFile::class, '', true);
$this->registerArgument('returnUrl', 'string', '', false, '');
}
diff --git a/typo3/sysext/fluid/Classes/Core/Rendering/RenderingContext.php b/typo3/sysext/fluid/Classes/Core/Rendering/RenderingContext.php
index 655295781498db799986fc5eefa294233bdb19ff..f16b59a50a05c4c822a30de19ef411820e3b5139 100644
--- a/typo3/sysext/fluid/Classes/Core/Rendering/RenderingContext.php
+++ b/typo3/sysext/fluid/Classes/Core/Rendering/RenderingContext.php
@@ -17,6 +17,7 @@ namespace TYPO3\CMS\Fluid\Core\Rendering;
use TYPO3\CMS\Core\Cache\CacheManager;
use TYPO3\CMS\Core\Utility\GeneralUtility;
+use TYPO3\CMS\Extbase\Mvc\Controller\ControllerContext;
use TYPO3\CMS\Extbase\Object\ObjectManager;
use TYPO3\CMS\Fluid\Core\Cache\FluidTemplateCache;
use TYPO3\CMS\Fluid\Core\ViewHelper\ViewHelperResolver;
@@ -55,7 +56,7 @@ class RenderingContext extends \TYPO3Fluid\Fluid\Core\Rendering\RenderingContext
/**
* @param \TYPO3Fluid\Fluid\Core\ViewHelper\ViewHelperVariableContainer $viewHelperVariableContainer
*/
- public function injectViewHelperVariableContainer(\TYPO3Fluid\Fluid\Core\ViewHelper\ViewHelperVariableContainer $viewHelperVariableContainer)
+ public function injectViewHelperVariableContainer(ViewHelperVariableContainer $viewHelperVariableContainer)
{
$this->viewHelperVariableContainer = $viewHelperVariableContainer;
}
@@ -195,7 +196,7 @@ class RenderingContext extends \TYPO3Fluid\Fluid\Core\Rendering\RenderingContext
*
* @param \TYPO3\CMS\Extbase\Mvc\Controller\ControllerContext $controllerContext The controller context to set
*/
- public function setControllerContext(\TYPO3\CMS\Extbase\Mvc\Controller\ControllerContext $controllerContext)
+ public function setControllerContext(ControllerContext $controllerContext)
{
$request = $controllerContext->getRequest();
$this->controllerContext = $controllerContext;
diff --git a/typo3/sysext/fluid/Classes/Core/Widget/AbstractWidgetController.php b/typo3/sysext/fluid/Classes/Core/Widget/AbstractWidgetController.php
index 0af1e1bce16c3b421f23bb845e69012d263fd262..97f31b3aa9227bf05d9abb46dafc985e207213e0 100644
--- a/typo3/sysext/fluid/Classes/Core/Widget/AbstractWidgetController.php
+++ b/typo3/sysext/fluid/Classes/Core/Widget/AbstractWidgetController.php
@@ -15,6 +15,12 @@
namespace TYPO3\CMS\Fluid\Core\Widget;
+use TYPO3\CMS\Core\SingletonInterface;
+use TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface;
+use TYPO3\CMS\Extbase\Mvc\Controller\ActionController;
+use TYPO3\CMS\Extbase\Mvc\RequestInterface;
+use TYPO3\CMS\Extbase\Mvc\ResponseInterface;
+use TYPO3\CMS\Extbase\Mvc\View\ViewInterface;
use TYPO3\CMS\Fluid\View\TemplatePaths;
/**
@@ -22,12 +28,12 @@ use TYPO3\CMS\Fluid\View\TemplatePaths;
* It is basically an ActionController and additionally has $this->widgetConfiguration set to the
* Configuration of the current Widget.
*/
-abstract class AbstractWidgetController extends \TYPO3\CMS\Extbase\Mvc\Controller\ActionController implements \TYPO3\CMS\Core\SingletonInterface
+abstract class AbstractWidgetController extends ActionController implements SingletonInterface
{
/**
* @var array
*/
- protected $supportedRequestTypes = [\TYPO3\CMS\Fluid\Core\Widget\WidgetRequest::class];
+ protected $supportedRequestTypes = [WidgetRequest::class];
/**
* Configuration for this widget.
@@ -42,7 +48,7 @@ abstract class AbstractWidgetController extends \TYPO3\CMS\Extbase\Mvc\Controlle
* @param \TYPO3\CMS\Extbase\Mvc\RequestInterface $request The request object
* @param \TYPO3\CMS\Extbase\Mvc\ResponseInterface $response The response, modified by this handler
*/
- public function processRequest(\TYPO3\CMS\Extbase\Mvc\RequestInterface $request, \TYPO3\CMS\Extbase\Mvc\ResponseInterface $response)
+ public function processRequest(RequestInterface $request, ResponseInterface $response)
{
$this->widgetConfiguration = $request->getWidgetContext()->getWidgetConfiguration();
parent::processRequest($request, $response);
@@ -54,9 +60,9 @@ abstract class AbstractWidgetController extends \TYPO3\CMS\Extbase\Mvc\Controlle
*
* @param \TYPO3\CMS\Extbase\Mvc\View\ViewInterface $view
*/
- protected function setViewConfiguration(\TYPO3\CMS\Extbase\Mvc\View\ViewInterface $view)
+ protected function setViewConfiguration(ViewInterface $view)
{
- $extbaseFrameworkConfiguration = $this->configurationManager->getConfiguration(\TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface::CONFIGURATION_TYPE_FRAMEWORK);
+ $extbaseFrameworkConfiguration = $this->configurationManager->getConfiguration(ConfigurationManagerInterface::CONFIGURATION_TYPE_FRAMEWORK);
$widgetViewHelperClassName = $this->request->getWidgetContext()->getWidgetViewHelperClassName();
$templatePaths = new TemplatePaths($this->controllerContext->getRequest()->getControllerExtensionKey());
$parentConfiguration = $view->getTemplatePaths()->toArray();
diff --git a/typo3/sysext/fluid/Classes/Core/Widget/AbstractWidgetViewHelper.php b/typo3/sysext/fluid/Classes/Core/Widget/AbstractWidgetViewHelper.php
index 38c6156b4e88f97fecde30855d8fb4a100187d4e..9ac001a76d6f94e4dd9b4f9220b75263759c4952 100644
--- a/typo3/sysext/fluid/Classes/Core/Widget/AbstractWidgetViewHelper.php
+++ b/typo3/sysext/fluid/Classes/Core/Widget/AbstractWidgetViewHelper.php
@@ -15,8 +15,13 @@
namespace TYPO3\CMS\Fluid\Core\Widget;
+use TYPO3\CMS\Extbase\Mvc\Web\Response;
+use TYPO3\CMS\Extbase\Object\ObjectManagerInterface;
+use TYPO3\CMS\Extbase\Service\ExtensionService;
+use TYPO3\CMS\Fluid\Core\Widget\Exception\MissingControllerException;
use TYPO3Fluid\Fluid\Component\ComponentInterface;
use TYPO3Fluid\Fluid\Core\Compiler\TemplateCompiler;
+use TYPO3Fluid\Fluid\Core\Parser\SyntaxTree\RootNode;
use TYPO3Fluid\Fluid\Core\Parser\SyntaxTree\ViewHelperNode;
use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
@@ -67,7 +72,7 @@ abstract class AbstractWidgetViewHelper extends AbstractViewHelper
* @param \TYPO3\CMS\Fluid\Core\Widget\AjaxWidgetContextHolder $ajaxWidgetContextHolder
* @internal
*/
- public function injectAjaxWidgetContextHolder(\TYPO3\CMS\Fluid\Core\Widget\AjaxWidgetContextHolder $ajaxWidgetContextHolder)
+ public function injectAjaxWidgetContextHolder(AjaxWidgetContextHolder $ajaxWidgetContextHolder)
{
$this->ajaxWidgetContextHolder = $ajaxWidgetContextHolder;
}
@@ -76,17 +81,17 @@ abstract class AbstractWidgetViewHelper extends AbstractViewHelper
* @param \TYPO3\CMS\Extbase\Object\ObjectManagerInterface $objectManager
* @internal
*/
- public function injectObjectManager(\TYPO3\CMS\Extbase\Object\ObjectManagerInterface $objectManager)
+ public function injectObjectManager(ObjectManagerInterface $objectManager)
{
$this->objectManager = $objectManager;
- $this->widgetContext = $this->objectManager->get(\TYPO3\CMS\Fluid\Core\Widget\WidgetContext::class);
+ $this->widgetContext = $this->objectManager->get(WidgetContext::class);
}
/**
* @param \TYPO3\CMS\Extbase\Service\ExtensionService $extensionService
* @internal
*/
- public function injectExtensionService(\TYPO3\CMS\Extbase\Service\ExtensionService $extensionService)
+ public function injectExtensionService(ExtensionService $extensionService)
{
$this->extensionService = $extensionService;
}
@@ -153,7 +158,7 @@ abstract class AbstractWidgetViewHelper extends AbstractViewHelper
public function onClose(RenderingContextInterface $renderingContext): ComponentInterface
{
$node = parent::onClose($renderingContext);
- $rootNode = $this->objectManager->get(\TYPO3Fluid\Fluid\Core\Parser\SyntaxTree\RootNode::class);
+ $rootNode = $this->objectManager->get(RootNode::class);
$rootNode->setChildren($this->getChildren());
$this->widgetContext->setViewHelperChildNodes($rootNode, $renderingContext);
return $node;
@@ -188,7 +193,7 @@ abstract class AbstractWidgetViewHelper extends AbstractViewHelper
*/
public function setChildNodes(array $childNodes)
{
- $rootNode = $this->objectManager->get(\TYPO3Fluid\Fluid\Core\Parser\SyntaxTree\RootNode::class);
+ $rootNode = $this->objectManager->get(RootNode::class);
foreach ($childNodes as $childNode) {
$rootNode->addChildNode($childNode);
}
@@ -214,19 +219,19 @@ abstract class AbstractWidgetViewHelper extends AbstractViewHelper
*/
protected function initiateSubRequest()
{
- if (!isset($this->controller) || !$this->controller instanceof \TYPO3\CMS\Fluid\Core\Widget\AbstractWidgetController) {
- throw new \TYPO3\CMS\Fluid\Core\Widget\Exception\MissingControllerException(
+ if (!isset($this->controller) || !$this->controller instanceof AbstractWidgetController) {
+ throw new MissingControllerException(
'initiateSubRequest() can not be called if there is no valid controller extending ' .
- \TYPO3\CMS\Fluid\Core\Widget\AbstractWidgetController::class .
+ AbstractWidgetController::class .
' Got "' . ($this->controller ? get_class($this->controller) : gettype($this->controller)) .
'" in class "' . static::class . '".',
1289422564
);
}
- $subRequest = $this->objectManager->get(\TYPO3\CMS\Fluid\Core\Widget\WidgetRequest::class);
+ $subRequest = $this->objectManager->get(WidgetRequest::class);
$subRequest->setWidgetContext($this->widgetContext);
$this->passArgumentsToSubRequest($subRequest);
- $subResponse = $this->objectManager->get(\TYPO3\CMS\Extbase\Mvc\Web\Response::class);
+ $subResponse = $this->objectManager->get(Response::class);
$this->controller->processRequest($subRequest, $subResponse);
return $subResponse;
}
@@ -236,7 +241,7 @@ abstract class AbstractWidgetViewHelper extends AbstractViewHelper
*
* @param \TYPO3\CMS\Fluid\Core\Widget\WidgetRequest $subRequest
*/
- private function passArgumentsToSubRequest(\TYPO3\CMS\Fluid\Core\Widget\WidgetRequest $subRequest)
+ private function passArgumentsToSubRequest(WidgetRequest $subRequest)
{
$arguments = $this->renderingContext->getControllerContext()->getRequest()->getArguments();
$widgetIdentifier = $this->widgetContext->getWidgetIdentifier();
diff --git a/typo3/sysext/fluid/Classes/Core/Widget/AjaxWidgetContextHolder.php b/typo3/sysext/fluid/Classes/Core/Widget/AjaxWidgetContextHolder.php
index 5997986912d3173e1f909f72e3f9ad28f100331a..7ec47ceb27690e24c4d0b73cf91edad158eeebfb 100644
--- a/typo3/sysext/fluid/Classes/Core/Widget/AjaxWidgetContextHolder.php
+++ b/typo3/sysext/fluid/Classes/Core/Widget/AjaxWidgetContextHolder.php
@@ -15,6 +15,8 @@
namespace TYPO3\CMS\Fluid\Core\Widget;
+use TYPO3\CMS\Core\SingletonInterface;
+use TYPO3\CMS\Fluid\Core\Widget\Exception\WidgetContextNotFoundException;
use TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController;
/**
@@ -24,7 +26,7 @@ use TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController;
*
* @internal This class is only used internally by the widget framework.
*/
-class AjaxWidgetContextHolder implements \TYPO3\CMS\Core\SingletonInterface
+class AjaxWidgetContextHolder implements SingletonInterface
{
/**
* An array $ajaxWidgetIdentifier => $widgetContext
@@ -69,7 +71,7 @@ class AjaxWidgetContextHolder implements \TYPO3\CMS\Core\SingletonInterface
public function get($ajaxWidgetId)
{
if (!isset($this->widgetContexts[$ajaxWidgetId])) {
- throw new \TYPO3\CMS\Fluid\Core\Widget\Exception\WidgetContextNotFoundException('No widget context was found for the Ajax Widget Identifier "' . $ajaxWidgetId . '". This only happens if AJAX URIs are called without including the widget on a page.', 1284793775);
+ throw new WidgetContextNotFoundException('No widget context was found for the Ajax Widget Identifier "' . $ajaxWidgetId . '". This only happens if AJAX URIs are called without including the widget on a page.', 1284793775);
}
return $this->widgetContexts[$ajaxWidgetId];
}
@@ -80,7 +82,7 @@ class AjaxWidgetContextHolder implements \TYPO3\CMS\Core\SingletonInterface
*
* @param \TYPO3\CMS\Fluid\Core\Widget\WidgetContext $widgetContext
*/
- public function store(\TYPO3\CMS\Fluid\Core\Widget\WidgetContext $widgetContext)
+ public function store(WidgetContext $widgetContext)
{
$ajaxWidgetId = md5(uniqid(random_int(0, mt_getrandmax()), true));
$widgetContext->setAjaxWidgetIdentifier($ajaxWidgetId);
diff --git a/typo3/sysext/fluid/Classes/Core/Widget/Bootstrap.php b/typo3/sysext/fluid/Classes/Core/Widget/Bootstrap.php
index d30d2330875cdd727b388c8f40718bc7b4023d83..edb14019997fbe94ff991bc6e9f66df82c4741d5 100644
--- a/typo3/sysext/fluid/Classes/Core/Widget/Bootstrap.php
+++ b/typo3/sysext/fluid/Classes/Core/Widget/Bootstrap.php
@@ -15,6 +15,11 @@
namespace TYPO3\CMS\Fluid\Core\Widget;
+use TYPO3\CMS\Core\Utility\GeneralUtility;
+use TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface;
+use TYPO3\CMS\Extbase\Object\ObjectManager;
+use TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer;
+
/**
* This is the bootstrap for Ajax Widget responses
*
@@ -47,10 +52,10 @@ class Bootstrap
*/
public function run($content, $configuration)
{
- $this->objectManager = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\TYPO3\CMS\Extbase\Object\ObjectManager::class);
+ $this->objectManager = GeneralUtility::makeInstance(ObjectManager::class);
$this->initializeConfiguration($configuration);
- $ajaxWidgetContextHolder = $this->objectManager->get(\TYPO3\CMS\Fluid\Core\Widget\AjaxWidgetContextHolder::class);
- $widgetIdentifier = \TYPO3\CMS\Core\Utility\GeneralUtility::_GET('fluid-widget-id');
+ $ajaxWidgetContextHolder = $this->objectManager->get(AjaxWidgetContextHolder::class);
+ $widgetIdentifier = GeneralUtility::_GET('fluid-widget-id');
$widgetContext = $ajaxWidgetContextHolder->get($widgetIdentifier);
$configuration['extensionName'] = $widgetContext->getParentExtensionName();
$configuration['pluginName'] = $widgetContext->getParentPluginName();
@@ -67,9 +72,9 @@ class Bootstrap
*/
public function initializeConfiguration($configuration)
{
- $this->configurationManager = $this->objectManager->get(\TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface::class);
+ $this->configurationManager = $this->objectManager->get(ConfigurationManagerInterface::class);
/** @var \TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer $contentObject */
- $contentObject = $this->cObj ?? \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer::class);
+ $contentObject = $this->cObj ?? GeneralUtility::makeInstance(ContentObjectRenderer::class);
$this->configurationManager->setContentObject($contentObject);
$this->configurationManager->setConfiguration($configuration);
}
diff --git a/typo3/sysext/fluid/Classes/Core/Widget/Exception/MissingControllerException.php b/typo3/sysext/fluid/Classes/Core/Widget/Exception/MissingControllerException.php
index b0a3f31e0f73bfa24426a7770a9ac8638a8404d0..5ac13a88acab1cefb2889922c8b30ccbf5e96f03 100644
--- a/typo3/sysext/fluid/Classes/Core/Widget/Exception/MissingControllerException.php
+++ b/typo3/sysext/fluid/Classes/Core/Widget/Exception/MissingControllerException.php
@@ -15,11 +15,13 @@
namespace TYPO3\CMS\Fluid\Core\Widget\Exception;
+use TYPO3\CMS\Fluid\Core\Widget\Exception;
+
/**
* An exception if the controller is missing.
*
* @internal
*/
-class MissingControllerException extends \TYPO3\CMS\Fluid\Core\Widget\Exception
+class MissingControllerException extends Exception
{
}
diff --git a/typo3/sysext/fluid/Classes/Core/Widget/Exception/RenderingContextNotFoundException.php b/typo3/sysext/fluid/Classes/Core/Widget/Exception/RenderingContextNotFoundException.php
index cfc1775ccc8b58fbe69c11017ef6ce2dae7e1c25..ace21e09f6fd5819f712f4b5e49aa9876ae7bf68 100644
--- a/typo3/sysext/fluid/Classes/Core/Widget/Exception/RenderingContextNotFoundException.php
+++ b/typo3/sysext/fluid/Classes/Core/Widget/Exception/RenderingContextNotFoundException.php
@@ -15,11 +15,13 @@
namespace TYPO3\CMS\Fluid\Core\Widget\Exception;
+use TYPO3\CMS\Fluid\Core\Widget\Exception;
+
/**
* An exception if no widget context could be found inside the AjaxWidgetContextHolder.
*
* @internal
*/
-class RenderingContextNotFoundException extends \TYPO3\CMS\Fluid\Core\Widget\Exception
+class RenderingContextNotFoundException extends Exception
{
}
diff --git a/typo3/sysext/fluid/Classes/Core/Widget/Exception/WidgetContextNotFoundException.php b/typo3/sysext/fluid/Classes/Core/Widget/Exception/WidgetContextNotFoundException.php
index f3f154a4b97b54b489c12057ee3803bc747f84e3..178f017116c6ff95f67775d100e4aaff8e970d63 100644
--- a/typo3/sysext/fluid/Classes/Core/Widget/Exception/WidgetContextNotFoundException.php
+++ b/typo3/sysext/fluid/Classes/Core/Widget/Exception/WidgetContextNotFoundException.php
@@ -15,11 +15,13 @@
namespace TYPO3\CMS\Fluid\Core\Widget\Exception;
+use TYPO3\CMS\Fluid\Core\Widget\Exception;
+
/**
* An exception if no widget context could be found inside the AjaxWidgetContextHolder.
*
* @internal
*/
-class WidgetContextNotFoundException extends \TYPO3\CMS\Fluid\Core\Widget\Exception
+class WidgetContextNotFoundException extends Exception
{
}
diff --git a/typo3/sysext/fluid/Classes/Core/Widget/Exception/WidgetRequestNotFoundException.php b/typo3/sysext/fluid/Classes/Core/Widget/Exception/WidgetRequestNotFoundException.php
index 1e7942d40034f0639abaac3aded5c804ef122a5d..dd467b363c4deef55ec494ae67428b50d41faa3d 100644
--- a/typo3/sysext/fluid/Classes/Core/Widget/Exception/WidgetRequestNotFoundException.php
+++ b/typo3/sysext/fluid/Classes/Core/Widget/Exception/WidgetRequestNotFoundException.php
@@ -15,11 +15,13 @@
namespace TYPO3\CMS\Fluid\Core\Widget\Exception;
+use TYPO3\CMS\Fluid\Core\Widget\Exception;
+
/**
* An exception if no widget Request could be found inside <f:renderChildren>.
*
* @internal
*/
-class WidgetRequestNotFoundException extends \TYPO3\CMS\Fluid\Core\Widget\Exception
+class WidgetRequestNotFoundException extends Exception
{
}
diff --git a/typo3/sysext/fluid/Classes/Core/Widget/WidgetContext.php b/typo3/sysext/fluid/Classes/Core/Widget/WidgetContext.php
index 121f3654336c81efdc1ddaf4dbcb046b0ec5d189..0049f86a4a5818532f4f7e9dc7a3db3f1efc6c7b 100644
--- a/typo3/sysext/fluid/Classes/Core/Widget/WidgetContext.php
+++ b/typo3/sysext/fluid/Classes/Core/Widget/WidgetContext.php
@@ -15,6 +15,9 @@
namespace TYPO3\CMS\Fluid\Core\Widget;
+use TYPO3Fluid\Fluid\Core\Parser\SyntaxTree\RootNode;
+use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
+
/**
* The WidgetContext stores all information a widget needs to know about the
* environment.
@@ -242,7 +245,7 @@ class WidgetContext
* @param \TYPO3Fluid\Fluid\Core\Parser\SyntaxTree\RootNode $viewHelperChildNodes
* @param \TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface $viewHelperChildNodeRenderingContext
*/
- public function setViewHelperChildNodes(\TYPO3Fluid\Fluid\Core\Parser\SyntaxTree\RootNode $viewHelperChildNodes, \TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface $viewHelperChildNodeRenderingContext)
+ public function setViewHelperChildNodes(RootNode $viewHelperChildNodes, RenderingContextInterface $viewHelperChildNodeRenderingContext)
{
$this->viewHelperChildNodes = $viewHelperChildNodes;
$this->viewHelperChildNodeRenderingContext = $viewHelperChildNodeRenderingContext;
diff --git a/typo3/sysext/fluid/Classes/Core/Widget/WidgetRequest.php b/typo3/sysext/fluid/Classes/Core/Widget/WidgetRequest.php
index fbb28f15d480745dfc9f862e707aaabf343b92df..008b34bd9ebd433815ac1facc76abd3369487ac4 100644
--- a/typo3/sysext/fluid/Classes/Core/Widget/WidgetRequest.php
+++ b/typo3/sysext/fluid/Classes/Core/Widget/WidgetRequest.php
@@ -15,11 +15,13 @@
namespace TYPO3\CMS\Fluid\Core\Widget;
+use TYPO3\CMS\Extbase\Mvc\Request;
+
/**
* Represents a widget request.
* @internal It is a purely internal class which should not be used outside of Fluid.
*/
-class WidgetRequest extends \TYPO3\CMS\Extbase\Mvc\Request
+class WidgetRequest extends Request
{
/**
* @var string The requested representation format
@@ -42,7 +44,7 @@ class WidgetRequest extends \TYPO3\CMS\Extbase\Mvc\Request
/**
* @param \TYPO3\CMS\Fluid\Core\Widget\WidgetContext $widgetContext
*/
- public function setWidgetContext(\TYPO3\CMS\Fluid\Core\Widget\WidgetContext $widgetContext)
+ public function setWidgetContext(WidgetContext $widgetContext)
{
$this->widgetContext = $widgetContext;
$this->setControllerObjectName($widgetContext->getControllerObjectName());
diff --git a/typo3/sysext/fluid/Classes/Core/Widget/WidgetRequestBuilder.php b/typo3/sysext/fluid/Classes/Core/Widget/WidgetRequestBuilder.php
index d306d2f90069bc0b9906a5a5ac52ec094de1726a..df84f9632cae1f0e9ab111aea71c68ed7d633a5f 100644
--- a/typo3/sysext/fluid/Classes/Core/Widget/WidgetRequestBuilder.php
+++ b/typo3/sysext/fluid/Classes/Core/Widget/WidgetRequestBuilder.php
@@ -46,7 +46,7 @@ class WidgetRequestBuilder extends RequestBuilder
*/
public function build(): RequestInterface
{
- $baseUri = \TYPO3\CMS\Core\Utility\GeneralUtility::getIndpEnv('TYPO3_SITE_URL');
+ $baseUri = GeneralUtility::getIndpEnv('TYPO3_SITE_URL');
if ($this->environmentService->isEnvironmentInBackendMode()) {
$baseUri .= TYPO3_mainDir;
}
diff --git a/typo3/sysext/fluid/Classes/Core/Widget/WidgetRequestHandler.php b/typo3/sysext/fluid/Classes/Core/Widget/WidgetRequestHandler.php
index ba7f755933dbd7cec842dcfe3cb937a7b584eb83..ca0e499806450b929acba8b52f95f0a1423f1f74 100644
--- a/typo3/sysext/fluid/Classes/Core/Widget/WidgetRequestHandler.php
+++ b/typo3/sysext/fluid/Classes/Core/Widget/WidgetRequestHandler.php
@@ -15,6 +15,12 @@
namespace TYPO3\CMS\Fluid\Core\Widget;
+use TYPO3\CMS\Core\Utility\GeneralUtility;
+use TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface;
+use TYPO3\CMS\Extbase\Mvc\Web\AbstractRequestHandler;
+use TYPO3\CMS\Extbase\Mvc\Web\RequestBuilder;
+use TYPO3\CMS\Extbase\Mvc\Web\Response;
+
/**
* Widget request handler, which handles the request if
* f3-fluid-widget-id is found.
@@ -22,7 +28,7 @@ namespace TYPO3\CMS\Fluid\Core\Widget;
* This Request Handler gets the WidgetRequestBuilder injected.
* @internal It is a purely internal class which should not be used outside of Fluid.
*/
-class WidgetRequestHandler extends \TYPO3\CMS\Extbase\Mvc\Web\AbstractRequestHandler
+class WidgetRequestHandler extends AbstractRequestHandler
{
/**
* @var \TYPO3\CMS\Fluid\Core\Widget\AjaxWidgetContextHolder
@@ -42,7 +48,7 @@ class WidgetRequestHandler extends \TYPO3\CMS\Extbase\Mvc\Web\AbstractRequestHan
/**
* @param \TYPO3\CMS\Fluid\Core\Widget\AjaxWidgetContextHolder $ajaxWidgetContextHolder
*/
- public function injectAjaxWidgetContextHolder(\TYPO3\CMS\Fluid\Core\Widget\AjaxWidgetContextHolder $ajaxWidgetContextHolder)
+ public function injectAjaxWidgetContextHolder(AjaxWidgetContextHolder $ajaxWidgetContextHolder)
{
$this->ajaxWidgetContextHolder = $ajaxWidgetContextHolder;
}
@@ -50,7 +56,7 @@ class WidgetRequestHandler extends \TYPO3\CMS\Extbase\Mvc\Web\AbstractRequestHan
/**
* @param \TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface $configurationManager
*/
- public function injectConfigurationManager(\TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface $configurationManager)
+ public function injectConfigurationManager(ConfigurationManagerInterface $configurationManager)
{
$this->configurationManager = $configurationManager;
}
@@ -58,7 +64,7 @@ class WidgetRequestHandler extends \TYPO3\CMS\Extbase\Mvc\Web\AbstractRequestHan
/**
* @param \TYPO3\CMS\Extbase\Mvc\Web\RequestBuilder $requestBuilder
*/
- public function injectRequestBuilder(\TYPO3\CMS\Extbase\Mvc\Web\RequestBuilder $requestBuilder)
+ public function injectRequestBuilder(RequestBuilder $requestBuilder)
{
// This method intentionally left blank
}
@@ -66,7 +72,7 @@ class WidgetRequestHandler extends \TYPO3\CMS\Extbase\Mvc\Web\AbstractRequestHan
/**
* @param \TYPO3\CMS\Fluid\Core\Widget\WidgetRequestBuilder $requestBuilder
*/
- public function injectWidgetRequestBuilder(\TYPO3\CMS\Fluid\Core\Widget\WidgetRequestBuilder $requestBuilder)
+ public function injectWidgetRequestBuilder(WidgetRequestBuilder $requestBuilder)
{
$this->requestBuilder = $requestBuilder;
}
@@ -79,7 +85,7 @@ class WidgetRequestHandler extends \TYPO3\CMS\Extbase\Mvc\Web\AbstractRequestHan
public function handleRequest()
{
$request = $this->requestBuilder->build();
- $response = $this->objectManager->get(\TYPO3\CMS\Extbase\Mvc\Web\Response::class);
+ $response = $this->objectManager->get(Response::class);
$this->dispatcher->dispatch($request, $response);
return $response;
}
@@ -89,7 +95,7 @@ class WidgetRequestHandler extends \TYPO3\CMS\Extbase\Mvc\Web\AbstractRequestHan
*/
public function canHandleRequest()
{
- $rawGetArguments = \TYPO3\CMS\Core\Utility\GeneralUtility::_GET();
+ $rawGetArguments = GeneralUtility::_GET();
return isset($rawGetArguments['fluid-widget-id']);
}
diff --git a/typo3/sysext/fluid/Classes/View/AbstractTemplateView.php b/typo3/sysext/fluid/Classes/View/AbstractTemplateView.php
index 769b56f6b19865015de33871b6103046287a51e7..b830ee047fdb0955e5f92b3f9577018ad33acee4 100644
--- a/typo3/sysext/fluid/Classes/View/AbstractTemplateView.php
+++ b/typo3/sysext/fluid/Classes/View/AbstractTemplateView.php
@@ -16,6 +16,8 @@
namespace TYPO3\CMS\Fluid\View;
use TYPO3\CMS\Core\Utility\GeneralUtility;
+use TYPO3\CMS\Extbase\Mvc\Controller\ControllerContext;
+use TYPO3\CMS\Extbase\Mvc\View\ViewInterface;
use TYPO3\CMS\Extbase\Object\ObjectManager;
use TYPO3\CMS\Fluid\Core\Rendering\RenderingContext;
use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
@@ -27,7 +29,7 @@ use TYPO3Fluid\Fluid\View\TemplateView;
*
* Contains the fundamental methods which any Fluid based template view needs.
*/
-abstract class AbstractTemplateView extends TemplateView implements \TYPO3\CMS\Extbase\Mvc\View\ViewInterface
+abstract class AbstractTemplateView extends TemplateView implements ViewInterface
{
/**
* @var \TYPO3\CMS\Extbase\Mvc\Controller\ControllerContext
@@ -62,7 +64,7 @@ abstract class AbstractTemplateView extends TemplateView implements \TYPO3\CMS\E
* @param \TYPO3\CMS\Extbase\Mvc\Controller\ControllerContext $controllerContext Controller context which is available inside the view
* @return bool TRUE if the view has something useful to display, otherwise FALSE
*/
- public function canRender(\TYPO3\CMS\Extbase\Mvc\Controller\ControllerContext $controllerContext)
+ public function canRender(ControllerContext $controllerContext)
{
return true;
}
@@ -73,7 +75,7 @@ abstract class AbstractTemplateView extends TemplateView implements \TYPO3\CMS\E
* @param \TYPO3\CMS\Extbase\Mvc\Controller\ControllerContext $controllerContext
* @internal
*/
- public function setControllerContext(\TYPO3\CMS\Extbase\Mvc\Controller\ControllerContext $controllerContext)
+ public function setControllerContext(ControllerContext $controllerContext)
{
$request = $controllerContext->getRequest();
$this->controllerContext = $controllerContext;
diff --git a/typo3/sysext/fluid/Classes/View/StandaloneView.php b/typo3/sysext/fluid/Classes/View/StandaloneView.php
index e106699ce65e06f717ba8b3b9a8583c3ba828284..b370b61f25d721c3f9b2490182b202aeb72c6c0f 100644
--- a/typo3/sysext/fluid/Classes/View/StandaloneView.php
+++ b/typo3/sysext/fluid/Classes/View/StandaloneView.php
@@ -18,6 +18,7 @@ namespace TYPO3\CMS\Fluid\View;
use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface;
use TYPO3\CMS\Extbase\Mvc\Controller\ControllerContext;
+use TYPO3\CMS\Extbase\Mvc\Web\Request;
use TYPO3\CMS\Extbase\Mvc\Web\Routing\UriBuilder;
use TYPO3\CMS\Extbase\Object\ObjectManager;
use TYPO3\CMS\Extbase\Service\EnvironmentService;
@@ -55,13 +56,13 @@ class StandaloneView extends AbstractTemplateView
}
$configurationManager->setContentObject($contentObject);
- $baseUri = \TYPO3\CMS\Core\Utility\GeneralUtility::getIndpEnv('TYPO3_SITE_URL');
+ $baseUri = GeneralUtility::getIndpEnv('TYPO3_SITE_URL');
if ($this->objectManager->get(EnvironmentService::class)->isEnvironmentInBackendMode()) {
$baseUri .= TYPO3_mainDir;
}
/** @var \TYPO3\CMS\Extbase\Mvc\Web\Request $request */
- $request = $this->objectManager->get(\TYPO3\CMS\Extbase\Mvc\Web\Request::class);
+ $request = $this->objectManager->get(Request::class);
$request->setRequestUri(GeneralUtility::getIndpEnv('TYPO3_REQUEST_URL'));
$request->setBaseUri($baseUri);
/** @var UriBuilder $uriBuilder */
diff --git a/typo3/sysext/fluid/Classes/ViewHelpers/Be/TableListViewHelper.php b/typo3/sysext/fluid/Classes/ViewHelpers/Be/TableListViewHelper.php
index d0867f9834f6f9ec86aa7b75c2cc35336982b877..a889b62cb85fb7067fcada76648ebc88e5837deb 100644
--- a/typo3/sysext/fluid/Classes/ViewHelpers/Be/TableListViewHelper.php
+++ b/typo3/sysext/fluid/Classes/ViewHelpers/Be/TableListViewHelper.php
@@ -18,6 +18,8 @@ namespace TYPO3\CMS\Fluid\ViewHelpers\Be;
use TYPO3\CMS\Backend\Utility\BackendUtility;
use TYPO3\CMS\Core\Type\Bitmask\Permission;
use TYPO3\CMS\Core\Utility\GeneralUtility;
+use TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface;
+use TYPO3\CMS\Recordlist\RecordList\DatabaseRecordList;
/**
* ViewHelper which renders a record list as known from the TYPO3 list module.
@@ -56,7 +58,7 @@ use TYPO3\CMS\Core\Utility\GeneralUtility;
* List of "Website user" records with a text property of ``foo`` stored on PID ``1`` and two levels down.
* Clicking on a username will open the TYPO3 info popup for the respective record
*/
-class TableListViewHelper extends \TYPO3\CMS\Fluid\ViewHelpers\Be\AbstractBackendViewHelper
+class TableListViewHelper extends AbstractBackendViewHelper
{
/**
* As this ViewHelper renders HTML, the output must not be escaped.
@@ -73,7 +75,7 @@ class TableListViewHelper extends \TYPO3\CMS\Fluid\ViewHelpers\Be\AbstractBacken
/**
* @param \TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface $configurationManager
*/
- public function injectConfigurationManager(\TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface $configurationManager)
+ public function injectConfigurationManager(ConfigurationManagerInterface $configurationManager)
{
$this->configurationManager = $configurationManager;
}
@@ -124,7 +126,7 @@ class TableListViewHelper extends \TYPO3\CMS\Fluid\ViewHelpers\Be\AbstractBacken
$pageinfo = BackendUtility::readPageAccess(GeneralUtility::_GP('id'), $GLOBALS['BE_USER']->getPagePermsClause(Permission::PAGE_SHOW));
/** @var \TYPO3\CMS\Recordlist\RecordList\DatabaseRecordList $dblist */
- $dblist = GeneralUtility::makeInstance(\TYPO3\CMS\Recordlist\RecordList\DatabaseRecordList::class);
+ $dblist = GeneralUtility::makeInstance(DatabaseRecordList::class);
$dblist->pageRow = $pageinfo;
if ($readOnly === false) {
$dblist->calcPerms = $GLOBALS['BE_USER']->calcPerms($pageinfo);
@@ -134,7 +136,7 @@ class TableListViewHelper extends \TYPO3\CMS\Fluid\ViewHelpers\Be\AbstractBacken
$dblist->clickTitleMode = $clickTitleMode;
$dblist->clickMenuEnabled = $enableClickMenu;
if ($storagePid === null) {
- $frameworkConfiguration = $this->configurationManager->getConfiguration(\TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface::CONFIGURATION_TYPE_FRAMEWORK);
+ $frameworkConfiguration = $this->configurationManager->getConfiguration(ConfigurationManagerInterface::CONFIGURATION_TYPE_FRAMEWORK);
$storagePid = $frameworkConfiguration['persistence']['storagePid'];
}
$dblist->start($storagePid, $tableName, (int)GeneralUtility::_GP('pointer'), $filter, $levels, $recordsPerPage);
diff --git a/typo3/sysext/fluid/Classes/ViewHelpers/Be/Widget/Controller/PaginateController.php b/typo3/sysext/fluid/Classes/ViewHelpers/Be/Widget/Controller/PaginateController.php
index e34721c7d19c5d491aa09c21cf6462bcb7d616f8..c3f2ee7e44304eb64c8705b6f1a409b258257729 100644
--- a/typo3/sysext/fluid/Classes/ViewHelpers/Be/Widget/Controller/PaginateController.php
+++ b/typo3/sysext/fluid/Classes/ViewHelpers/Be/Widget/Controller/PaginateController.php
@@ -15,10 +15,13 @@
namespace TYPO3\CMS\Fluid\ViewHelpers\Be\Widget\Controller;
+use TYPO3\CMS\Core\Utility\ArrayUtility;
+use TYPO3\CMS\Fluid\Core\Widget\AbstractWidgetController;
+
/**
* Class PaginateController
*/
-class PaginateController extends \TYPO3\CMS\Fluid\Core\Widget\AbstractWidgetController
+class PaginateController extends AbstractWidgetController
{
/**
* @var array
@@ -61,7 +64,7 @@ class PaginateController extends \TYPO3\CMS\Fluid\Core\Widget\AbstractWidgetCont
public function initializeAction()
{
$this->objects = $this->widgetConfiguration['objects'];
- \TYPO3\CMS\Core\Utility\ArrayUtility::mergeRecursiveWithOverrule($this->configuration, $this->widgetConfiguration['configuration'], false);
+ ArrayUtility::mergeRecursiveWithOverrule($this->configuration, $this->widgetConfiguration['configuration'], false);
$this->numberOfObjects = count($this->objects);
$itemsPerPage = (int)$this->configuration['itemsPerPage'];
$this->numberOfPages = $itemsPerPage > 0 ? ceil($this->numberOfObjects / $itemsPerPage) : 0;
diff --git a/typo3/sysext/fluid/Classes/ViewHelpers/Be/Widget/PaginateViewHelper.php b/typo3/sysext/fluid/Classes/ViewHelpers/Be/Widget/PaginateViewHelper.php
index be90299dd1a853be77f5cec02065c9aa0cdc393a..bbb38d6ca612263898cdcdce538288db00f3dbb1 100644
--- a/typo3/sysext/fluid/Classes/ViewHelpers/Be/Widget/PaginateViewHelper.php
+++ b/typo3/sysext/fluid/Classes/ViewHelpers/Be/Widget/PaginateViewHelper.php
@@ -16,6 +16,8 @@
namespace TYPO3\CMS\Fluid\ViewHelpers\Be\Widget;
use TYPO3\CMS\Extbase\Persistence\QueryResultInterface;
+use TYPO3\CMS\Fluid\Core\Widget\AbstractWidgetViewHelper;
+use TYPO3\CMS\Fluid\ViewHelpers\Be\Widget\Controller\PaginateController;
/**
* This ViewHelper renders a Pagination of objects for the TYPO3 Backend.
@@ -49,7 +51,7 @@ use TYPO3\CMS\Extbase\Persistence\QueryResultInterface;
* only the small subset of objects.
* So, there is no negative performance overhead in using the Be Paginate Widget.
*/
-class PaginateViewHelper extends \TYPO3\CMS\Fluid\Core\Widget\AbstractWidgetViewHelper
+class PaginateViewHelper extends AbstractWidgetViewHelper
{
/**
* @var \TYPO3\CMS\Fluid\ViewHelpers\Be\Widget\Controller\PaginateController
@@ -59,7 +61,7 @@ class PaginateViewHelper extends \TYPO3\CMS\Fluid\Core\Widget\AbstractWidgetView
/**
* @param \TYPO3\CMS\Fluid\ViewHelpers\Be\Widget\Controller\PaginateController $controller
*/
- public function injectPaginateController(\TYPO3\CMS\Fluid\ViewHelpers\Be\Widget\Controller\PaginateController $controller)
+ public function injectPaginateController(PaginateController $controller)
{
$this->controller = $controller;
}
diff --git a/typo3/sysext/fluid/Classes/ViewHelpers/CObjectViewHelper.php b/typo3/sysext/fluid/Classes/ViewHelpers/CObjectViewHelper.php
index 66eaebe1e5197b88f58d1b7bcaf610fbc31dd58a..b286ee2f80f715e5c6f3bd393ebee7453cc7adf4 100644
--- a/typo3/sysext/fluid/Classes/ViewHelpers/CObjectViewHelper.php
+++ b/typo3/sysext/fluid/Classes/ViewHelpers/CObjectViewHelper.php
@@ -20,10 +20,12 @@ use TYPO3\CMS\Core\TimeTracker\TimeTracker;
use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface;
use TYPO3\CMS\Extbase\Object\ObjectManager;
+use TYPO3\CMS\Extbase\Reflection\ObjectAccess;
use TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer;
use TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController;
use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
+use TYPO3Fluid\Fluid\Core\ViewHelper\Exception;
use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithContentArgumentAndRenderStatic;
/**
@@ -136,7 +138,7 @@ class CObjectViewHelper extends AbstractViewHelper
}
$currentValue = null;
if (is_object($data)) {
- $data = \TYPO3\CMS\Extbase\Reflection\ObjectAccess::getGettableProperties($data);
+ $data = ObjectAccess::getGettableProperties($data);
} elseif (is_string($data) || is_numeric($data)) {
$currentValue = (string)$data;
$data = [$data];
@@ -152,7 +154,7 @@ class CObjectViewHelper extends AbstractViewHelper
$setup = static::getConfigurationManager()->getConfiguration(ConfigurationManagerInterface::CONFIGURATION_TYPE_FULL_TYPOSCRIPT);
foreach ($pathSegments as $segment) {
if (!array_key_exists($segment . '.', $setup)) {
- throw new \TYPO3Fluid\Fluid\Core\ViewHelper\Exception(
+ throw new Exception(
'TypoScript object path "' . $typoscriptObjectPath . '" does not exist',
1253191023
);
@@ -160,7 +162,7 @@ class CObjectViewHelper extends AbstractViewHelper
$setup = $setup[$segment . '.'];
}
if (!isset($setup[$lastSegment])) {
- throw new \TYPO3Fluid\Fluid\Core\ViewHelper\Exception(
+ throw new Exception(
'No Content Object definition found at TypoScript object path "' . $typoscriptObjectPath . '"',
1540246570
);
diff --git a/typo3/sysext/fluid/Classes/ViewHelpers/Form/AbstractFormFieldViewHelper.php b/typo3/sysext/fluid/Classes/ViewHelpers/Form/AbstractFormFieldViewHelper.php
index d318b2cb9013ddc16ef635505470ea44ad33ac47..ab320384e944aa34a892fc8e4efb834896be3b5e 100644
--- a/typo3/sysext/fluid/Classes/ViewHelpers/Form/AbstractFormFieldViewHelper.php
+++ b/typo3/sysext/fluid/Classes/ViewHelpers/Form/AbstractFormFieldViewHelper.php
@@ -15,7 +15,10 @@
namespace TYPO3\CMS\Fluid\ViewHelpers\Form;
+use TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface;
+use TYPO3\CMS\Extbase\Error\Result;
use TYPO3\CMS\Extbase\Reflection\ObjectAccess;
+use TYPO3\CMS\Fluid\ViewHelpers\FormViewHelper;
/**
* Abstract Form ViewHelper. Bundles functionality related to direct property access of objects in other Form ViewHelpers.
@@ -38,7 +41,7 @@ abstract class AbstractFormFieldViewHelper extends AbstractFormViewHelper
/**
* @param \TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface $configurationManager
*/
- public function injectConfigurationManager(\TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface $configurationManager)
+ public function injectConfigurationManager(ConfigurationManagerInterface $configurationManager)
{
$this->configurationManager = $configurationManager;
}
@@ -111,7 +114,7 @@ abstract class AbstractFormFieldViewHelper extends AbstractFormViewHelper
{
if ($this->isObjectAccessorMode()) {
$formObjectName = $this->renderingContext->getViewHelperVariableContainer()->get(
- \TYPO3\CMS\Fluid\ViewHelpers\FormViewHelper::class,
+ FormViewHelper::class,
'formObjectName'
);
if (!empty($formObjectName)) {
@@ -247,7 +250,7 @@ abstract class AbstractFormFieldViewHelper extends AbstractFormViewHelper
$viewHelperVariableContainer = $this->renderingContext->getViewHelperVariableContainer();
if (!$viewHelperVariableContainer->exists(
- \TYPO3\CMS\Fluid\ViewHelpers\FormViewHelper::class,
+ FormViewHelper::class,
'formObject'
)
) {
@@ -259,11 +262,11 @@ abstract class AbstractFormFieldViewHelper extends AbstractFormViewHelper
return;
}
$formObject = $viewHelperVariableContainer->get(
- \TYPO3\CMS\Fluid\ViewHelpers\FormViewHelper::class,
+ FormViewHelper::class,
'formObject'
);
$objectName = $viewHelperVariableContainer->get(
- \TYPO3\CMS\Fluid\ViewHelpers\FormViewHelper::class,
+ FormViewHelper::class,
'formObjectName'
);
// If count == 2 -> we need to go through the for-loop exactly once
@@ -274,12 +277,12 @@ abstract class AbstractFormFieldViewHelper extends AbstractFormViewHelper
$hiddenIdentityField = $this->renderHiddenIdentityField($object, $objectName);
// Add the hidden identity field to the ViewHelperVariableContainer
$additionalIdentityProperties = $viewHelperVariableContainer->get(
- \TYPO3\CMS\Fluid\ViewHelpers\FormViewHelper::class,
+ FormViewHelper::class,
'additionalIdentityProperties'
);
$additionalIdentityProperties[$objectName] = $hiddenIdentityField;
$viewHelperVariableContainer->addOrUpdate(
- \TYPO3\CMS\Fluid\ViewHelpers\FormViewHelper::class,
+ FormViewHelper::class,
'additionalIdentityProperties',
$additionalIdentityProperties
);
@@ -295,14 +298,14 @@ abstract class AbstractFormFieldViewHelper extends AbstractFormViewHelper
{
$viewHelperVariableContainer = $this->renderingContext->getViewHelperVariableContainer();
if (!$viewHelperVariableContainer->exists(
- \TYPO3\CMS\Fluid\ViewHelpers\FormViewHelper::class,
+ FormViewHelper::class,
'formObject'
)
) {
return null;
}
$formObject = $viewHelperVariableContainer->get(
- \TYPO3\CMS\Fluid\ViewHelpers\FormViewHelper::class,
+ FormViewHelper::class,
'formObject'
);
return ObjectAccess::getPropertyPath($formObject, $this->arguments['property']);
@@ -316,7 +319,7 @@ abstract class AbstractFormFieldViewHelper extends AbstractFormViewHelper
protected function isObjectAccessorMode()
{
return $this->hasArgument('property') && $this->renderingContext->getViewHelperVariableContainer()->exists(
- \TYPO3\CMS\Fluid\ViewHelpers\FormViewHelper::class,
+ FormViewHelper::class,
'formObjectName'
);
}
@@ -351,11 +354,11 @@ abstract class AbstractFormFieldViewHelper extends AbstractFormViewHelper
protected function getMappingResultsForProperty()
{
if (!$this->isObjectAccessorMode()) {
- return new \TYPO3\CMS\Extbase\Error\Result();
+ return new Result();
}
$originalRequestMappingResults = $this->getRequest()->getOriginalRequestMappingResults();
$formObjectName = $this->renderingContext->getViewHelperVariableContainer()->get(
- \TYPO3\CMS\Fluid\ViewHelpers\FormViewHelper::class,
+ FormViewHelper::class,
'formObjectName'
);
return $originalRequestMappingResults->forProperty($formObjectName)->forProperty($this->arguments['property']);
@@ -372,12 +375,12 @@ abstract class AbstractFormFieldViewHelper extends AbstractFormViewHelper
$hiddenFieldNames = [];
$viewHelperVariableContainer = $this->renderingContext->getViewHelperVariableContainer();
if ($viewHelperVariableContainer->exists(
- \TYPO3\CMS\Fluid\ViewHelpers\FormViewHelper::class,
+ FormViewHelper::class,
'renderedHiddenFields'
)
) {
$hiddenFieldNames = $viewHelperVariableContainer->get(
- \TYPO3\CMS\Fluid\ViewHelpers\FormViewHelper::class,
+ FormViewHelper::class,
'renderedHiddenFields'
);
}
@@ -388,7 +391,7 @@ abstract class AbstractFormFieldViewHelper extends AbstractFormViewHelper
if (!in_array($fieldName, $hiddenFieldNames)) {
$hiddenFieldNames[] = $fieldName;
$viewHelperVariableContainer->addOrUpdate(
- \TYPO3\CMS\Fluid\ViewHelpers\FormViewHelper::class,
+ FormViewHelper::class,
'renderedHiddenFields',
$hiddenFieldNames
);
diff --git a/typo3/sysext/fluid/Classes/ViewHelpers/Form/AbstractFormViewHelper.php b/typo3/sysext/fluid/Classes/ViewHelpers/Form/AbstractFormViewHelper.php
index 5bf09c11733c13e56f99266c570e118ebb59582a..d080261f7d21d1476bb3e5729685cb9adad80f5a 100644
--- a/typo3/sysext/fluid/Classes/ViewHelpers/Form/AbstractFormViewHelper.php
+++ b/typo3/sysext/fluid/Classes/ViewHelpers/Form/AbstractFormViewHelper.php
@@ -15,6 +15,10 @@
namespace TYPO3\CMS\Fluid\ViewHelpers\Form;
+use TYPO3\CMS\Extbase\DomainObject\AbstractDomainObject;
+use TYPO3\CMS\Extbase\Persistence\Generic\LazyLoadingProxy;
+use TYPO3\CMS\Extbase\Persistence\PersistenceManagerInterface;
+use TYPO3\CMS\Fluid\ViewHelpers\FormViewHelper;
use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractTagBasedViewHelper;
/**
@@ -33,7 +37,7 @@ abstract class AbstractFormViewHelper extends AbstractTagBasedViewHelper
/**
* @param \TYPO3\CMS\Extbase\Persistence\PersistenceManagerInterface $persistenceManager
*/
- public function injectPersistenceManager(\TYPO3\CMS\Extbase\Persistence\PersistenceManagerInterface $persistenceManager)
+ public function injectPersistenceManager(PersistenceManagerInterface $persistenceManager)
{
$this->persistenceManager = $persistenceManager;
}
@@ -50,10 +54,10 @@ abstract class AbstractFormViewHelper extends AbstractTagBasedViewHelper
return '';
}
$viewHelperVariableContainer = $this->renderingContext->getViewHelperVariableContainer();
- if (!$viewHelperVariableContainer->exists(\TYPO3\CMS\Fluid\ViewHelpers\FormViewHelper::class, 'fieldNamePrefix')) {
+ if (!$viewHelperVariableContainer->exists(FormViewHelper::class, 'fieldNamePrefix')) {
return $fieldName;
}
- $fieldNamePrefix = (string)$viewHelperVariableContainer->get(\TYPO3\CMS\Fluid\ViewHelpers\FormViewHelper::class, 'fieldNamePrefix');
+ $fieldNamePrefix = (string)$viewHelperVariableContainer->get(FormViewHelper::class, 'fieldNamePrefix');
if ($fieldNamePrefix === '') {
return $fieldName;
}
@@ -75,11 +79,11 @@ abstract class AbstractFormViewHelper extends AbstractTagBasedViewHelper
*/
protected function renderHiddenIdentityField($object, $name)
{
- if ($object instanceof \TYPO3\CMS\Extbase\Persistence\Generic\LazyLoadingProxy) {
+ if ($object instanceof LazyLoadingProxy) {
$object = $object->_loadRealInstance();
}
if (!is_object($object)
- || !($object instanceof \TYPO3\CMS\Extbase\DomainObject\AbstractDomainObject)
+ || !($object instanceof AbstractDomainObject)
|| ($object->_isNew() && !$object->_isClone())) {
return '';
}
@@ -103,12 +107,12 @@ abstract class AbstractFormViewHelper extends AbstractTagBasedViewHelper
protected function registerFieldNameForFormTokenGeneration($fieldName)
{
$viewHelperVariableContainer = $this->renderingContext->getViewHelperVariableContainer();
- if ($viewHelperVariableContainer->exists(\TYPO3\CMS\Fluid\ViewHelpers\FormViewHelper::class, 'formFieldNames')) {
- $formFieldNames = $viewHelperVariableContainer->get(\TYPO3\CMS\Fluid\ViewHelpers\FormViewHelper::class, 'formFieldNames');
+ if ($viewHelperVariableContainer->exists(FormViewHelper::class, 'formFieldNames')) {
+ $formFieldNames = $viewHelperVariableContainer->get(FormViewHelper::class, 'formFieldNames');
} else {
$formFieldNames = [];
}
$formFieldNames[] = $fieldName;
- $viewHelperVariableContainer->addOrUpdate(\TYPO3\CMS\Fluid\ViewHelpers\FormViewHelper::class, 'formFieldNames', $formFieldNames);
+ $viewHelperVariableContainer->addOrUpdate(FormViewHelper::class, 'formFieldNames', $formFieldNames);
}
}
diff --git a/typo3/sysext/fluid/Classes/ViewHelpers/Form/HiddenViewHelper.php b/typo3/sysext/fluid/Classes/ViewHelpers/Form/HiddenViewHelper.php
index 335bb7822e9f4a4c50df913bbc65f05e4e622c6f..df7e5c76cda696c6a496b6327594d9dea41d7128 100644
--- a/typo3/sysext/fluid/Classes/ViewHelpers/Form/HiddenViewHelper.php
+++ b/typo3/sysext/fluid/Classes/ViewHelpers/Form/HiddenViewHelper.php
@@ -32,7 +32,7 @@ namespace TYPO3\CMS\Fluid\ViewHelpers\Form;
* You can also use the "property" attribute if you have bound an object to the form.
* See :ref:`<f:form> <typo3-fluid-form>` for more documentation.
*/
-class HiddenViewHelper extends \TYPO3\CMS\Fluid\ViewHelpers\Form\AbstractFormFieldViewHelper
+class HiddenViewHelper extends AbstractFormFieldViewHelper
{
/**
* @var string
diff --git a/typo3/sysext/fluid/Classes/ViewHelpers/Form/PasswordViewHelper.php b/typo3/sysext/fluid/Classes/ViewHelpers/Form/PasswordViewHelper.php
index ce9a58095ca17fe464dc0b07d97a2abd03abd7c7..b1b6f429a02de7929a3b13dbdc6efb85f170528f 100644
--- a/typo3/sysext/fluid/Classes/ViewHelpers/Form/PasswordViewHelper.php
+++ b/typo3/sysext/fluid/Classes/ViewHelpers/Form/PasswordViewHelper.php
@@ -29,7 +29,7 @@ namespace TYPO3\CMS\Fluid\ViewHelpers\Form;
*
* <input type="password" name="myPassword" value="default value" />
*/
-class PasswordViewHelper extends \TYPO3\CMS\Fluid\ViewHelpers\Form\AbstractFormFieldViewHelper
+class PasswordViewHelper extends AbstractFormFieldViewHelper
{
/**
* @var string
diff --git a/typo3/sysext/fluid/Classes/ViewHelpers/Form/RadioViewHelper.php b/typo3/sysext/fluid/Classes/ViewHelpers/Form/RadioViewHelper.php
index 027e1858ef1f47746a62351a28cb05d6e814d41c..f3b707abf8ea408a39f78fa92711e1342c1d512c 100644
--- a/typo3/sysext/fluid/Classes/ViewHelpers/Form/RadioViewHelper.php
+++ b/typo3/sysext/fluid/Classes/ViewHelpers/Form/RadioViewHelper.php
@@ -60,7 +60,7 @@ namespace TYPO3\CMS\Fluid\ViewHelpers\Form;
*
* Depending on property ``newsletter``.
*/
-class RadioViewHelper extends \TYPO3\CMS\Fluid\ViewHelpers\Form\AbstractFormFieldViewHelper
+class RadioViewHelper extends AbstractFormFieldViewHelper
{
/**
* @var string
diff --git a/typo3/sysext/fluid/Classes/ViewHelpers/Form/Select/OptgroupViewHelper.php b/typo3/sysext/fluid/Classes/ViewHelpers/Form/Select/OptgroupViewHelper.php
index 94f9d8c584bb068a6b355926e09459a697a91632..be2ccffda586c38db884cff51cc68c533d218784 100644
--- a/typo3/sysext/fluid/Classes/ViewHelpers/Form/Select/OptgroupViewHelper.php
+++ b/typo3/sysext/fluid/Classes/ViewHelpers/Form/Select/OptgroupViewHelper.php
@@ -15,11 +15,13 @@
namespace TYPO3\CMS\Fluid\ViewHelpers\Form\Select;
+use TYPO3\CMS\Fluid\ViewHelpers\Form\AbstractFormFieldViewHelper;
+
/**
* Adds custom :html:`<optgroup>` tags inside an :ref:`<f:form.select> <typo3-fluid-form-select>`,
* supports further child :ref:`<f:form.select.option> <typo3-fluid-form-select-option>` tags.
*/
-class OptgroupViewHelper extends \TYPO3\CMS\Fluid\ViewHelpers\Form\AbstractFormFieldViewHelper
+class OptgroupViewHelper extends AbstractFormFieldViewHelper
{
/**
* @var string
diff --git a/typo3/sysext/fluid/Classes/ViewHelpers/Form/Select/OptionViewHelper.php b/typo3/sysext/fluid/Classes/ViewHelpers/Form/Select/OptionViewHelper.php
index 64fce2682c6964da7c426cbfae84b6ed8da8a6d9..99913d50a1f5d05af7853ce9a02f2138201d1a61 100644
--- a/typo3/sysext/fluid/Classes/ViewHelpers/Form/Select/OptionViewHelper.php
+++ b/typo3/sysext/fluid/Classes/ViewHelpers/Form/Select/OptionViewHelper.php
@@ -15,12 +15,13 @@
namespace TYPO3\CMS\Fluid\ViewHelpers\Form\Select;
+use TYPO3\CMS\Fluid\ViewHelpers\Form\AbstractFormFieldViewHelper;
use TYPO3\CMS\Fluid\ViewHelpers\Form\SelectViewHelper;
/**
* Adds custom :html:`<option>` tags inside an :ref:`<f:form.select> <typo3-fluid-form-select>`.
*/
-class OptionViewHelper extends \TYPO3\CMS\Fluid\ViewHelpers\Form\AbstractFormFieldViewHelper
+class OptionViewHelper extends AbstractFormFieldViewHelper
{
/**
* @var string
diff --git a/typo3/sysext/fluid/Classes/ViewHelpers/Form/SelectViewHelper.php b/typo3/sysext/fluid/Classes/ViewHelpers/Form/SelectViewHelper.php
index 038f6a7f3f505a1dc0c84b7b54cad045147e8db0..d702109c4dc6e334cfb85386e99139566c447077 100644
--- a/typo3/sysext/fluid/Classes/ViewHelpers/Form/SelectViewHelper.php
+++ b/typo3/sysext/fluid/Classes/ViewHelpers/Form/SelectViewHelper.php
@@ -15,6 +15,9 @@
namespace TYPO3\CMS\Fluid\ViewHelpers\Form;
+use TYPO3\CMS\Extbase\Reflection\ObjectAccess;
+use TYPO3Fluid\Fluid\Core\ViewHelper\Exception;
+
/**
* This ViewHelper generates a :html:`<select>` dropdown list for the use with a form.
*
@@ -88,7 +91,7 @@ namespace TYPO3\CMS\Fluid\ViewHelpers\Form;
*
* The ``value`` property now expects a domain object, and tests for object equivalence.
*/
-class SelectViewHelper extends \TYPO3\CMS\Fluid\ViewHelpers\Form\AbstractFormFieldViewHelper
+class SelectViewHelper extends AbstractFormFieldViewHelper
{
/**
* @var string
@@ -235,12 +238,12 @@ class SelectViewHelper extends \TYPO3\CMS\Fluid\ViewHelpers\Form\AbstractFormFie
foreach ($optionsArgument as $key => $value) {
if (is_object($value) || is_array($value)) {
if ($this->hasArgument('optionValueField')) {
- $key = \TYPO3\CMS\Extbase\Reflection\ObjectAccess::getPropertyPath($value, $this->arguments['optionValueField']);
+ $key = ObjectAccess::getPropertyPath($value, $this->arguments['optionValueField']);
if (is_object($key)) {
if (method_exists($key, '__toString')) {
$key = (string)$key;
} else {
- throw new \TYPO3Fluid\Fluid\Core\ViewHelper\Exception('Identifying value for object of class "' . get_class($value) . '" was an object.', 1247827428);
+ throw new Exception('Identifying value for object of class "' . get_class($value) . '" was an object.', 1247827428);
}
}
} elseif ($this->persistenceManager->getIdentifierByObject($value) !== null) {
@@ -249,15 +252,15 @@ class SelectViewHelper extends \TYPO3\CMS\Fluid\ViewHelpers\Form\AbstractFormFie
} elseif (method_exists($value, '__toString')) {
$key = (string)$value;
} else {
- throw new \TYPO3Fluid\Fluid\Core\ViewHelper\Exception('No identifying value for object of class "' . get_class($value) . '" found.', 1247826696);
+ throw new Exception('No identifying value for object of class "' . get_class($value) . '" found.', 1247826696);
}
if ($this->hasArgument('optionLabelField')) {
- $value = \TYPO3\CMS\Extbase\Reflection\ObjectAccess::getPropertyPath($value, $this->arguments['optionLabelField']);
+ $value = ObjectAccess::getPropertyPath($value, $this->arguments['optionLabelField']);
if (is_object($value)) {
if (method_exists($value, '__toString')) {
$value = (string)$value;
} else {
- throw new \TYPO3Fluid\Fluid\Core\ViewHelper\Exception('Label value for object of class "' . get_class($value) . '" was an object without a __toString() method.', 1247827553);
+ throw new Exception('Label value for object of class "' . get_class($value) . '" was an object without a __toString() method.', 1247827553);
}
}
} elseif (method_exists($value, '__toString')) {
@@ -327,7 +330,7 @@ class SelectViewHelper extends \TYPO3\CMS\Fluid\ViewHelpers\Form\AbstractFormFie
{
if (is_object($valueElement)) {
if ($this->hasArgument('optionValueField')) {
- return \TYPO3\CMS\Extbase\Reflection\ObjectAccess::getPropertyPath($valueElement, $this->arguments['optionValueField']);
+ return ObjectAccess::getPropertyPath($valueElement, $this->arguments['optionValueField']);
}
// @todo use $this->persistenceManager->isNewObject() once it is implemented
if ($this->persistenceManager->getIdentifierByObject($valueElement) !== null) {
diff --git a/typo3/sysext/fluid/Classes/ViewHelpers/Form/SubmitViewHelper.php b/typo3/sysext/fluid/Classes/ViewHelpers/Form/SubmitViewHelper.php
index 64be769d60e7640886cd31f8afc42c6d007c2c72..dd08a4955db6f068ccf311682f0c0d4a0c838c87 100644
--- a/typo3/sysext/fluid/Classes/ViewHelpers/Form/SubmitViewHelper.php
+++ b/typo3/sysext/fluid/Classes/ViewHelpers/Form/SubmitViewHelper.php
@@ -43,7 +43,7 @@ namespace TYPO3\CMS\Fluid\ViewHelpers\Form;
*
* <input type="submit" name="mySubmit" value="Send Mail" />
*/
-class SubmitViewHelper extends \TYPO3\CMS\Fluid\ViewHelpers\Form\AbstractFormFieldViewHelper
+class SubmitViewHelper extends AbstractFormFieldViewHelper
{
/**
* @var string
diff --git a/typo3/sysext/fluid/Classes/ViewHelpers/Form/TextareaViewHelper.php b/typo3/sysext/fluid/Classes/ViewHelpers/Form/TextareaViewHelper.php
index fe3f689de81ab4da1a0cc86f88472f14934785ef..08900b432007397eebedff7ce19711c254ab4118 100644
--- a/typo3/sysext/fluid/Classes/ViewHelpers/Form/TextareaViewHelper.php
+++ b/typo3/sysext/fluid/Classes/ViewHelpers/Form/TextareaViewHelper.php
@@ -31,7 +31,7 @@ namespace TYPO3\CMS\Fluid\ViewHelpers\Form;
*
* <textarea name="myTextArea">This is shown inside the textarea</textarea>
*/
-class TextareaViewHelper extends \TYPO3\CMS\Fluid\ViewHelpers\Form\AbstractFormFieldViewHelper
+class TextareaViewHelper extends AbstractFormFieldViewHelper
{
/**
* @var string
diff --git a/typo3/sysext/fluid/Classes/ViewHelpers/Form/UploadViewHelper.php b/typo3/sysext/fluid/Classes/ViewHelpers/Form/UploadViewHelper.php
index 5a29aa8b67a7f489e673492a59da6faa1e3d24e5..5a925541113d511cce03d6101136da57fcff046c 100644
--- a/typo3/sysext/fluid/Classes/ViewHelpers/Form/UploadViewHelper.php
+++ b/typo3/sysext/fluid/Classes/ViewHelpers/Form/UploadViewHelper.php
@@ -30,7 +30,7 @@ namespace TYPO3\CMS\Fluid\ViewHelpers\Form;
*
* <input type="file" name="file" />
*/
-class UploadViewHelper extends \TYPO3\CMS\Fluid\ViewHelpers\Form\AbstractFormFieldViewHelper
+class UploadViewHelper extends AbstractFormFieldViewHelper
{
/**
* @var string
diff --git a/typo3/sysext/fluid/Classes/ViewHelpers/FormViewHelper.php b/typo3/sysext/fluid/Classes/ViewHelpers/FormViewHelper.php
index 962b42aee5852edc4f04a295b2342ea75a049f24..7027658045a34c5d6aab2b7c57c5efed0defa006 100644
--- a/typo3/sysext/fluid/Classes/ViewHelpers/FormViewHelper.php
+++ b/typo3/sysext/fluid/Classes/ViewHelpers/FormViewHelper.php
@@ -15,8 +15,13 @@
namespace TYPO3\CMS\Fluid\ViewHelpers;
+use TYPO3\CMS\Extbase\Mvc\Controller\MvcPropertyMappingConfigurationService;
use TYPO3\CMS\Extbase\Mvc\RequestInterface;
use TYPO3\CMS\Extbase\Mvc\Web\Routing\UriBuilder;
+use TYPO3\CMS\Extbase\Security\Cryptography\HashService;
+use TYPO3\CMS\Extbase\Service\ExtensionService;
+use TYPO3\CMS\Fluid\ViewHelpers\Form\AbstractFormViewHelper;
+use TYPO3\CMS\Fluid\ViewHelpers\Form\CheckboxViewHelper;
/**
* Form ViewHelper. Generates a :html:`<form>` Tag.
@@ -52,7 +57,7 @@ use TYPO3\CMS\Extbase\Mvc\Web\Routing\UriBuilder;
* This automatically inserts the value of ``{customer.name}`` inside the
* textbox and adjusts the name of the textbox accordingly.
*/
-class FormViewHelper extends \TYPO3\CMS\Fluid\ViewHelpers\Form\AbstractFormViewHelper
+class FormViewHelper extends AbstractFormViewHelper
{
/**
* @var string
@@ -85,7 +90,7 @@ class FormViewHelper extends \TYPO3\CMS\Fluid\ViewHelpers\Form\AbstractFormViewH
/**
* @param \TYPO3\CMS\Extbase\Security\Cryptography\HashService $hashService
*/
- public function injectHashService(\TYPO3\CMS\Extbase\Security\Cryptography\HashService $hashService)
+ public function injectHashService(HashService $hashService)
{
$this->hashService = $hashService;
}
@@ -93,7 +98,7 @@ class FormViewHelper extends \TYPO3\CMS\Fluid\ViewHelpers\Form\AbstractFormViewH
/**
* @param \TYPO3\CMS\Extbase\Mvc\Controller\MvcPropertyMappingConfigurationService $mvcPropertyMappingConfigurationService
*/
- public function injectMvcPropertyMappingConfigurationService(\TYPO3\CMS\Extbase\Mvc\Controller\MvcPropertyMappingConfigurationService $mvcPropertyMappingConfigurationService)
+ public function injectMvcPropertyMappingConfigurationService(MvcPropertyMappingConfigurationService $mvcPropertyMappingConfigurationService)
{
$this->mvcPropertyMappingConfigurationService = $mvcPropertyMappingConfigurationService;
}
@@ -101,7 +106,7 @@ class FormViewHelper extends \TYPO3\CMS\Fluid\ViewHelpers\Form\AbstractFormViewH
/**
* @param \TYPO3\CMS\Extbase\Service\ExtensionService $extensionService
*/
- public function injectExtensionService(\TYPO3\CMS\Extbase\Service\ExtensionService $extensionService)
+ public function injectExtensionService(ExtensionService $extensionService)
{
$this->extensionService = $extensionService;
}
@@ -454,8 +459,8 @@ class FormViewHelper extends \TYPO3\CMS\Fluid\ViewHelpers\Form\AbstractFormViewH
protected function removeCheckboxFieldNamesFromViewHelperVariableContainer()
{
$viewHelperVariableContainer = $this->renderingContext->getViewHelperVariableContainer();
- if ($viewHelperVariableContainer->exists(\TYPO3\CMS\Fluid\ViewHelpers\Form\CheckboxViewHelper::class, 'checkboxFieldNames')) {
- $viewHelperVariableContainer->remove(\TYPO3\CMS\Fluid\ViewHelpers\Form\CheckboxViewHelper::class, 'checkboxFieldNames');
+ if ($viewHelperVariableContainer->exists(CheckboxViewHelper::class, 'checkboxFieldNames')) {
+ $viewHelperVariableContainer->remove(CheckboxViewHelper::class, 'checkboxFieldNames');
}
}
diff --git a/typo3/sysext/fluid/Classes/ViewHelpers/ImageViewHelper.php b/typo3/sysext/fluid/Classes/ViewHelpers/ImageViewHelper.php
index 9e472f33797d64256a22257287624ab288b4f7b6..5a37e1ef58a3b745f73ec607f01de1dffb73cebe 100644
--- a/typo3/sysext/fluid/Classes/ViewHelpers/ImageViewHelper.php
+++ b/typo3/sysext/fluid/Classes/ViewHelpers/ImageViewHelper.php
@@ -17,6 +17,7 @@ namespace TYPO3\CMS\Fluid\ViewHelpers;
use TYPO3\CMS\Core\Imaging\ImageManipulation\CropVariantCollection;
use TYPO3\CMS\Core\Resource\Exception\ResourceDoesNotExistException;
+use TYPO3\CMS\Extbase\Service\ImageService;
use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractTagBasedViewHelper;
use TYPO3Fluid\Fluid\Core\ViewHelper\Exception;
@@ -101,7 +102,7 @@ class ImageViewHelper extends AbstractTagBasedViewHelper
/**
* @param \TYPO3\CMS\Extbase\Service\ImageService $imageService
*/
- public function injectImageService(\TYPO3\CMS\Extbase\Service\ImageService $imageService)
+ public function injectImageService(ImageService $imageService)
{
$this->imageService = $imageService;
}
diff --git a/typo3/sysext/fluid/Classes/ViewHelpers/RenderChildrenViewHelper.php b/typo3/sysext/fluid/Classes/ViewHelpers/RenderChildrenViewHelper.php
index aba566e10ed31bfc174ee5691f3fb58bda7eec93..6eb7d6bff244e359b1522b85438605484bccd3ed 100644
--- a/typo3/sysext/fluid/Classes/ViewHelpers/RenderChildrenViewHelper.php
+++ b/typo3/sysext/fluid/Classes/ViewHelpers/RenderChildrenViewHelper.php
@@ -15,6 +15,9 @@
namespace TYPO3\CMS\Fluid\ViewHelpers;
+use TYPO3\CMS\Fluid\Core\Widget\Exception\RenderingContextNotFoundException;
+use TYPO3\CMS\Fluid\Core\Widget\Exception\WidgetRequestNotFoundException;
+use TYPO3\CMS\Fluid\Core\Widget\WidgetRequest;
use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithRenderStatic;
@@ -71,8 +74,8 @@ class RenderChildrenViewHelper extends AbstractViewHelper
protected static function getWidgetRenderingContext(RenderingContextInterface $renderingContext)
{
$subRenderingContext = static::getWidgetContext($renderingContext)->getViewHelperChildNodeRenderingContext();
- if (!$subRenderingContext instanceof \TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface) {
- throw new \TYPO3\CMS\Fluid\Core\Widget\Exception\RenderingContextNotFoundException('Rendering Context not found inside Widget. <f:renderChildren> has been used in an AJAX Request, but is only usable in non-ajax mode.', 1284986604);
+ if (!$subRenderingContext instanceof RenderingContextInterface) {
+ throw new RenderingContextNotFoundException('Rendering Context not found inside Widget. <f:renderChildren> has been used in an AJAX Request, but is only usable in non-ajax mode.', 1284986604);
}
return $subRenderingContext;
}
@@ -94,8 +97,8 @@ class RenderChildrenViewHelper extends AbstractViewHelper
protected static function getWidgetContext(RenderingContextInterface $renderingContext)
{
$request = $renderingContext->getControllerContext()->getRequest();
- if (!$request instanceof \TYPO3\CMS\Fluid\Core\Widget\WidgetRequest) {
- throw new \TYPO3\CMS\Fluid\Core\Widget\Exception\WidgetRequestNotFoundException('The Request is not a WidgetRequest! <f:renderChildren> must be called inside a Widget Template.', 1284986120);
+ if (!$request instanceof WidgetRequest) {
+ throw new WidgetRequestNotFoundException('The Request is not a WidgetRequest! <f:renderChildren> must be called inside a Widget Template.', 1284986120);
}
return $request->getWidgetContext();
}
diff --git a/typo3/sysext/fluid/Classes/ViewHelpers/Widget/AutocompleteViewHelper.php b/typo3/sysext/fluid/Classes/ViewHelpers/Widget/AutocompleteViewHelper.php
index 42fb8624c7c7522d5f77386a826d3dc5711f344c..b98b7c1672528ff5aa7c10b8f3a30df2fd752c72 100644
--- a/typo3/sysext/fluid/Classes/ViewHelpers/Widget/AutocompleteViewHelper.php
+++ b/typo3/sysext/fluid/Classes/ViewHelpers/Widget/AutocompleteViewHelper.php
@@ -16,6 +16,8 @@
namespace TYPO3\CMS\Fluid\ViewHelpers\Widget;
use TYPO3\CMS\Extbase\Persistence\QueryResultInterface;
+use TYPO3\CMS\Fluid\Core\Widget\AbstractWidgetViewHelper;
+use TYPO3\CMS\Fluid\ViewHelpers\Widget\Controller\AutocompleteController;
/**
* Simple autocomplete widget.
@@ -48,7 +50,7 @@ use TYPO3\CMS\Extbase\Persistence\QueryResultInterface;
* See Resources/Private/Templates/ViewHelpers/Widget/Autocomplete/Index.html
* @deprecated since TYPO3 v10.4, will be removed in TYPO3 v11.0.
*/
-class AutocompleteViewHelper extends \TYPO3\CMS\Fluid\Core\Widget\AbstractWidgetViewHelper
+class AutocompleteViewHelper extends AbstractWidgetViewHelper
{
/**
* @var bool
@@ -79,7 +81,7 @@ class AutocompleteViewHelper extends \TYPO3\CMS\Fluid\Core\Widget\AbstractWidget
/**
* @param \TYPO3\CMS\Fluid\ViewHelpers\Widget\Controller\AutocompleteController $controller
*/
- public function injectAutocompleteController(\TYPO3\CMS\Fluid\ViewHelpers\Widget\Controller\AutocompleteController $controller)
+ public function injectAutocompleteController(AutocompleteController $controller)
{
$this->controller = $controller;
}
diff --git a/typo3/sysext/fluid/Classes/ViewHelpers/Widget/Controller/AutocompleteController.php b/typo3/sysext/fluid/Classes/ViewHelpers/Widget/Controller/AutocompleteController.php
index c64a08b85da77a9faa3080f9429b81750834467a..5b32b59ce5915f689d04d8ee45d6747f8269f63a 100644
--- a/typo3/sysext/fluid/Classes/ViewHelpers/Widget/Controller/AutocompleteController.php
+++ b/typo3/sysext/fluid/Classes/ViewHelpers/Widget/Controller/AutocompleteController.php
@@ -15,11 +15,14 @@
namespace TYPO3\CMS\Fluid\ViewHelpers\Widget\Controller;
+use TYPO3\CMS\Extbase\Reflection\ObjectAccess;
+use TYPO3\CMS\Fluid\Core\Widget\AbstractWidgetController;
+
/**
* Class AutocompleteController
* @deprecated since TYPO3 v10.4, will be removed in TYPO3 v11.0.
*/
-class AutocompleteController extends \TYPO3\CMS\Fluid\Core\Widget\AbstractWidgetController
+class AutocompleteController extends AbstractWidgetController
{
public function __construct()
{
@@ -51,7 +54,7 @@ class AutocompleteController extends \TYPO3\CMS\Fluid\Core\Widget\AbstractWidget
$results = $query->execute();
$output = [];
foreach ($results as $singleResult) {
- $val = \TYPO3\CMS\Extbase\Reflection\ObjectAccess::getProperty($singleResult, $searchProperty);
+ $val = ObjectAccess::getProperty($singleResult, $searchProperty);
$output[] = [
'id' => $val,
'label' => $val,
diff --git a/typo3/sysext/fluid/Classes/ViewHelpers/Widget/PaginateViewHelper.php b/typo3/sysext/fluid/Classes/ViewHelpers/Widget/PaginateViewHelper.php
index e0868a155b8a973c14985e64b9d494a11300f49d..cbe2636957de0cbf91d5f3f74bd360e263f2ac13 100644
--- a/typo3/sysext/fluid/Classes/ViewHelpers/Widget/PaginateViewHelper.php
+++ b/typo3/sysext/fluid/Classes/ViewHelpers/Widget/PaginateViewHelper.php
@@ -18,6 +18,7 @@ namespace TYPO3\CMS\Fluid\ViewHelpers\Widget;
use TYPO3\CMS\Extbase\Persistence\ObjectStorage;
use TYPO3\CMS\Extbase\Persistence\QueryResultInterface;
use TYPO3\CMS\Fluid\Core\Widget\AbstractWidgetViewHelper;
+use TYPO3\CMS\Fluid\ViewHelpers\Widget\Controller\PaginateController;
/**
* This ViewHelper renders a Pagination of objects.
@@ -67,7 +68,7 @@ class PaginateViewHelper extends AbstractWidgetViewHelper
/**
* @param \TYPO3\CMS\Fluid\ViewHelpers\Widget\Controller\PaginateController $controller
*/
- public function injectPaginateController(\TYPO3\CMS\Fluid\ViewHelpers\Widget\Controller\PaginateController $controller)
+ public function injectPaginateController(PaginateController $controller)
{
$this->controller = $controller;
}
diff --git a/typo3/sysext/fluid/Tests/Functional/View/TemplatesPathsTest.php b/typo3/sysext/fluid/Tests/Functional/View/TemplatesPathsTest.php
index e85dce1195c6ee3bb62cd4e574ea81fefdfe2025..936a51cc4fd24a32d7f37f83cb81753eaae0fd99 100644
--- a/typo3/sysext/fluid/Tests/Functional/View/TemplatesPathsTest.php
+++ b/typo3/sysext/fluid/Tests/Functional/View/TemplatesPathsTest.php
@@ -18,6 +18,7 @@ namespace TYPO3\CMS\Fluid\Tests\Functional\View;
use TYPO3\CMS\Core\Tests\Functional\SiteHandling\SiteBasedTestTrait;
use TYPO3\TestingFramework\Core\Functional\Framework\Frontend\InternalRequest;
use TYPO3\TestingFramework\Core\Functional\FunctionalTestCase;
+use TYPO3Fluid\FluidTest\Controller\TemplateController;
class TemplatesPathsTest extends FunctionalTestCase
{
@@ -54,8 +55,8 @@ class TemplatesPathsTest extends FunctionalTestCase
'plugins' => [
'Pi' => [
'controllers' => [
- \TYPO3Fluid\FluidTest\Controller\TemplateController::class => [
- 'className' => \TYPO3Fluid\FluidTest\Controller\TemplateController::class,
+ TemplateController::class => [
+ 'className' => TemplateController::class,
'alias' => 'Template',
'actions' => [
'baseTemplate',
diff --git a/typo3/sysext/fluid/Tests/Unit/Core/Rendering/RenderingContextTest.php b/typo3/sysext/fluid/Tests/Unit/Core/Rendering/RenderingContextTest.php
index 6d1d693879d7fdd200d6e530d49b5cf6eed0db5a..16002e3dae09508e3a2f36dcd04d417983f18138 100644
--- a/typo3/sysext/fluid/Tests/Unit/Core/Rendering/RenderingContextTest.php
+++ b/typo3/sysext/fluid/Tests/Unit/Core/Rendering/RenderingContextTest.php
@@ -80,7 +80,7 @@ class RenderingContextTest extends UnitTestCase
*/
public function controllerContextCanBeReadCorrectly()
{
- $controllerContext = $this->getMockBuilder(\TYPO3\CMS\Extbase\Mvc\Controller\ControllerContext::class)
+ $controllerContext = $this->getMockBuilder(ControllerContext::class)
->disableOriginalConstructor()
->getMock();
$controllerContext->expects(self::atLeastOnce())->method('getRequest')->willReturn($this->createMock(Request::class));
diff --git a/typo3/sysext/fluid/Tests/Unit/Core/Widget/AbstractWidgetControllerTest.php b/typo3/sysext/fluid/Tests/Unit/Core/Widget/AbstractWidgetControllerTest.php
index 4a0f17a822a20e8cff4fbf429e653c30cb694a70..171a0ede052ecc57bb11abf567ce9d5c4babc3cf 100644
--- a/typo3/sysext/fluid/Tests/Unit/Core/Widget/AbstractWidgetControllerTest.php
+++ b/typo3/sysext/fluid/Tests/Unit/Core/Widget/AbstractWidgetControllerTest.php
@@ -17,8 +17,11 @@ namespace TYPO3\CMS\Fluid\Tests\Unit\Core\Widget;
use TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface;
use TYPO3\CMS\Extbase\Mvc\Controller\Arguments;
+use TYPO3\CMS\Extbase\Mvc\Controller\MvcPropertyMappingConfigurationService;
use TYPO3\CMS\Extbase\Mvc\Request;
use TYPO3\CMS\Extbase\Mvc\ResponseInterface;
+use TYPO3\CMS\Extbase\Mvc\Web\Routing\UriBuilder;
+use TYPO3\CMS\Extbase\Object\ObjectManagerInterface;
use TYPO3\CMS\Fluid\Core\Widget\AbstractWidgetController;
use TYPO3\CMS\Fluid\Core\Widget\WidgetRequest;
use TYPO3\CMS\Fluid\View\TemplatePaths;
@@ -36,12 +39,12 @@ class AbstractWidgetControllerTest extends UnitTestCase
public function canHandleWidgetRequest()
{
/** @var WidgetRequest|\PHPUnit\Framework\MockObject\MockObject $request */
- $request = $this->getMockBuilder(\TYPO3\CMS\Fluid\Core\Widget\WidgetRequest::class)
+ $request = $this->getMockBuilder(WidgetRequest::class)
->setMethods(['dummy'])
->disableOriginalConstructor()
->getMock();
/** @var AbstractWidgetController|\PHPUnit\Framework\MockObject\MockObject $abstractWidgetController */
- $abstractWidgetController = $this->getMockBuilder(\TYPO3\CMS\Fluid\Core\Widget\AbstractWidgetController::class)
+ $abstractWidgetController = $this->getMockBuilder(AbstractWidgetController::class)
->setMethods(['dummy'])
->disableOriginalConstructor()
->getMock();
@@ -56,17 +59,17 @@ class AbstractWidgetControllerTest extends UnitTestCase
$widgetContext = $this->createMock(\TYPO3\CMS\Fluid\Core\Widget\WidgetContext::class);
$widgetContext->expects(self::once())->method('getWidgetConfiguration')->willReturn('myConfiguration');
/** @var WidgetRequest|\PHPUnit\Framework\MockObject\MockObject $request */
- $request = $this->createMock(\TYPO3\CMS\Fluid\Core\Widget\WidgetRequest::class);
+ $request = $this->createMock(WidgetRequest::class);
$request->expects(self::once())->method('getWidgetContext')->willReturn($widgetContext);
/** @var ResponseInterface|\PHPUnit\Framework\MockObject\MockObject $response */
- $response = $this->createMock(\TYPO3\CMS\Extbase\Mvc\ResponseInterface::class);
+ $response = $this->createMock(ResponseInterface::class);
/** @var AbstractWidgetController|\PHPUnit\Framework\MockObject\MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface $abstractWidgetController */
- $abstractWidgetController = $this->getAccessibleMock(\TYPO3\CMS\Fluid\Core\Widget\AbstractWidgetController::class, ['resolveActionMethodName', 'initializeActionMethodArguments', 'initializeActionMethodValidators', 'initializeAction', 'checkRequestHash', 'mapRequestArgumentsToControllerArguments', 'buildControllerContext', 'resolveView', 'callActionMethod'], [], '', false);
- $mockUriBuilder = $this->createMock(\TYPO3\CMS\Extbase\Mvc\Web\Routing\UriBuilder::class);
- $objectManager = $this->createMock(\TYPO3\CMS\Extbase\Object\ObjectManagerInterface::class);
- $objectManager->expects(self::any())->method('get')->with(\TYPO3\CMS\Extbase\Mvc\Web\Routing\UriBuilder::class)->willReturn($mockUriBuilder);
+ $abstractWidgetController = $this->getAccessibleMock(AbstractWidgetController::class, ['resolveActionMethodName', 'initializeActionMethodArguments', 'initializeActionMethodValidators', 'initializeAction', 'checkRequestHash', 'mapRequestArgumentsToControllerArguments', 'buildControllerContext', 'resolveView', 'callActionMethod'], [], '', false);
+ $mockUriBuilder = $this->createMock(UriBuilder::class);
+ $objectManager = $this->createMock(ObjectManagerInterface::class);
+ $objectManager->expects(self::any())->method('get')->with(UriBuilder::class)->willReturn($mockUriBuilder);
- $configurationService = $this->createMock(\TYPO3\CMS\Extbase\Mvc\Controller\MvcPropertyMappingConfigurationService::class);
+ $configurationService = $this->createMock(MvcPropertyMappingConfigurationService::class);
$abstractWidgetController->_set('mvcPropertyMappingConfigurationService', $configurationService);
$abstractWidgetController->_set('arguments', new Arguments());
diff --git a/typo3/sysext/fluid/Tests/Unit/Core/Widget/AjaxWidgetContextHolderTest.php b/typo3/sysext/fluid/Tests/Unit/Core/Widget/AjaxWidgetContextHolderTest.php
index 0ef54cb1086f6b2706cf46ffa574bc07701a1af7..9330e62a0758d7cfecb3da5c89be9b9a262866b1 100644
--- a/typo3/sysext/fluid/Tests/Unit/Core/Widget/AjaxWidgetContextHolderTest.php
+++ b/typo3/sysext/fluid/Tests/Unit/Core/Widget/AjaxWidgetContextHolderTest.php
@@ -15,6 +15,7 @@
namespace TYPO3\CMS\Fluid\Tests\Unit\Core\Widget;
+use TYPO3\CMS\Fluid\Core\Widget\AjaxWidgetContextHolder;
use TYPO3\CMS\Fluid\Core\Widget\Exception\WidgetContextNotFoundException;
use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
@@ -29,7 +30,7 @@ class AjaxWidgetContextHolderTest extends UnitTestCase
public function getThrowsExceptionIfWidgetContextIsNotFound()
{
/** @var \TYPO3\CMS\Fluid\Core\Widget\AjaxWidgetContextHolder $ajaxWidgetContextHolder */
- $ajaxWidgetContextHolder = $this->getMockBuilder(\TYPO3\CMS\Fluid\Core\Widget\AjaxWidgetContextHolder::class)
+ $ajaxWidgetContextHolder = $this->getMockBuilder(AjaxWidgetContextHolder::class)
->setMethods(['dummy'])
->disableOriginalConstructor()
->getMock();
diff --git a/typo3/sysext/fluid/Tests/Unit/Core/Widget/WidgetContextTest.php b/typo3/sysext/fluid/Tests/Unit/Core/Widget/WidgetContextTest.php
index 0af377ea9dfd36ec1d0a8fa2bbf14fab51651f98..1adc67137ad61ed888ac53cc1a3073f49981d1ee 100644
--- a/typo3/sysext/fluid/Tests/Unit/Core/Widget/WidgetContextTest.php
+++ b/typo3/sysext/fluid/Tests/Unit/Core/Widget/WidgetContextTest.php
@@ -17,6 +17,8 @@ namespace TYPO3\CMS\Fluid\Tests\Unit\Core\Widget;
use TYPO3\CMS\Fluid\Core\Widget\WidgetContext;
use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
+use TYPO3Fluid\Fluid\Core\Parser\SyntaxTree\RootNode;
+use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
/**
* Test case
@@ -31,7 +33,7 @@ class WidgetContextTest extends UnitTestCase
protected function setUp(): void
{
parent::setUp();
- $this->widgetContext = new \TYPO3\CMS\Fluid\Core\Widget\WidgetContext();
+ $this->widgetContext = new WidgetContext();
}
/**
@@ -117,8 +119,8 @@ class WidgetContextTest extends UnitTestCase
*/
public function viewHelperChildNodesCanBeReadAgain()
{
- $viewHelperChildNodes = $this->createMock(\TYPO3Fluid\Fluid\Core\Parser\SyntaxTree\RootNode::class);
- $renderingContext = $this->createMock(\TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface::class);
+ $viewHelperChildNodes = $this->createMock(RootNode::class);
+ $renderingContext = $this->createMock(RenderingContextInterface::class);
$this->widgetContext->setViewHelperChildNodes($viewHelperChildNodes, $renderingContext);
self::assertSame($viewHelperChildNodes, $this->widgetContext->getViewHelperChildNodes());
self::assertSame($renderingContext, $this->widgetContext->getViewHelperChildNodeRenderingContext());
diff --git a/typo3/sysext/fluid/Tests/Unit/Core/Widget/WidgetRequestHandlerTest.php b/typo3/sysext/fluid/Tests/Unit/Core/Widget/WidgetRequestHandlerTest.php
index c44cb61d791c7cbae0dedcc95e551b697f90171b..9926b2a7cad44568f98d231c5054374d35413c7f 100644
--- a/typo3/sysext/fluid/Tests/Unit/Core/Widget/WidgetRequestHandlerTest.php
+++ b/typo3/sysext/fluid/Tests/Unit/Core/Widget/WidgetRequestHandlerTest.php
@@ -15,7 +15,9 @@
namespace TYPO3\CMS\Fluid\Tests\Unit\Core\Widget;
+use Prophecy\Argument;
use TYPO3\CMS\Extbase\Mvc\Dispatcher;
+use TYPO3\CMS\Extbase\Mvc\Web\AbstractRequestHandler;
use TYPO3\CMS\Extbase\Mvc\Web\Request;
use TYPO3\CMS\Extbase\Mvc\Web\Response;
use TYPO3\CMS\Extbase\Object\ObjectManager;
@@ -39,7 +41,7 @@ class WidgetRequestHandlerTest extends UnitTestCase
protected function setUp(): void
{
parent::setUp();
- $this->widgetRequestHandler = $this->getAccessibleMock(\TYPO3\CMS\Fluid\Core\Widget\WidgetRequestHandler::class, ['dummy'], [], '', false);
+ $this->widgetRequestHandler = $this->getAccessibleMock(WidgetRequestHandler::class, ['dummy'], [], '', false);
}
/**
@@ -65,7 +67,7 @@ class WidgetRequestHandlerTest extends UnitTestCase
*/
public function priorityIsHigherThanDefaultRequestHandler()
{
- $defaultWebRequestHandler = $this->getMockBuilder(\TYPO3\CMS\Extbase\Mvc\Web\AbstractRequestHandler::class)
+ $defaultWebRequestHandler = $this->getMockBuilder(AbstractRequestHandler::class)
->setMethods(['handleRequest'])
->disableOriginalConstructor()
->getMock();
@@ -85,7 +87,7 @@ class WidgetRequestHandlerTest extends UnitTestCase
$requestBuilder->expects(self::once())->method('build')->willReturn($request);
$objectManager = $this->prophesize(ObjectManager::class);
$handler->injectObjectManager($objectManager->reveal());
- $objectManager->get(\Prophecy\Argument::any())->willReturn($this->createMock(Response::class));
+ $objectManager->get(Argument::any())->willReturn($this->createMock(Response::class));
$requestDispatcher = $this->getMockBuilder(Dispatcher::class)
->setMethods(['dispatch'])
->disableOriginalConstructor()
diff --git a/typo3/sysext/fluid/Tests/Unit/Core/Widget/WidgetRequestTest.php b/typo3/sysext/fluid/Tests/Unit/Core/Widget/WidgetRequestTest.php
index e49cfe6813e0f5bff173052bd78d4f2b764a19ae..1149a281f003e8473f39ae7bbacf131c81c5f745 100644
--- a/typo3/sysext/fluid/Tests/Unit/Core/Widget/WidgetRequestTest.php
+++ b/typo3/sysext/fluid/Tests/Unit/Core/Widget/WidgetRequestTest.php
@@ -15,6 +15,8 @@
namespace TYPO3\CMS\Fluid\Tests\Unit\Core\Widget;
+use TYPO3\CMS\Fluid\Core\Widget\WidgetContext;
+use TYPO3\CMS\Fluid\Core\Widget\WidgetRequest;
use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
/**
@@ -27,11 +29,11 @@ class WidgetRequestTest extends UnitTestCase
*/
public function setWidgetContextAlsoSetsControllerObjectName()
{
- $widgetContext = $this->getMockBuilder(\TYPO3\CMS\Fluid\Core\Widget\WidgetContext::class)
+ $widgetContext = $this->getMockBuilder(WidgetContext::class)
->setMethods(['getControllerObjectName'])
->getMock();
$widgetContext->expects(self::once())->method('getControllerObjectName')->willReturn('Tx_Fluid_ControllerObjectName');
- $widgetRequest = $this->getMockBuilder(\TYPO3\CMS\Fluid\Core\Widget\WidgetRequest::class)
+ $widgetRequest = $this->getMockBuilder(WidgetRequest::class)
->setMethods(['setControllerObjectName'])
->getMock();
$widgetRequest->expects(self::once())->method('setControllerObjectName')->with('Tx_Fluid_ControllerObjectName');
@@ -43,12 +45,12 @@ class WidgetRequestTest extends UnitTestCase
*/
public function getArgumentPrefixReadsVariablesFromWidgetContext()
{
- $widgetContext = $this->getMockBuilder(\TYPO3\CMS\Fluid\Core\Widget\WidgetContext::class)
+ $widgetContext = $this->getMockBuilder(WidgetContext::class)
->setMethods(['getParentPluginNamespace', 'getWidgetIdentifier'])
->getMock();
$widgetContext->expects(self::once())->method('getParentPluginNamespace')->willReturn('foo');
$widgetContext->expects(self::once())->method('getWidgetIdentifier')->willReturn('bar');
- $widgetRequest = $this->getAccessibleMock(\TYPO3\CMS\Fluid\Core\Widget\WidgetRequest::class, ['dummy']);
+ $widgetRequest = $this->getAccessibleMock(WidgetRequest::class, ['dummy']);
$widgetRequest->_set('widgetContext', $widgetContext);
self::assertEquals('foo[bar]', $widgetRequest->getArgumentPrefix());
}
@@ -58,8 +60,8 @@ class WidgetRequestTest extends UnitTestCase
*/
public function widgetContextCanBeReadAgain()
{
- $widgetContext = $this->createMock(\TYPO3\CMS\Fluid\Core\Widget\WidgetContext::class);
- $widgetRequest = $this->getMockBuilder(\TYPO3\CMS\Fluid\Core\Widget\WidgetRequest::class)
+ $widgetContext = $this->createMock(WidgetContext::class);
+ $widgetRequest = $this->getMockBuilder(WidgetRequest::class)
->setMethods(['setControllerObjectName'])
->getMock();
$widgetRequest->setWidgetContext($widgetContext);
diff --git a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/CObjectViewHelperTest.php b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/CObjectViewHelperTest.php
index 7f78a97e6b1b9374ff227a775ae2c4ce3add466b..bbe491b505e0b6610b0be97ead61eac081de57c4 100644
--- a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/CObjectViewHelperTest.php
+++ b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/CObjectViewHelperTest.php
@@ -25,6 +25,7 @@ use TYPO3\CMS\Fluid\ViewHelpers\CObjectViewHelper;
use TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer;
use TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController;
use TYPO3\TestingFramework\Fluid\Unit\ViewHelpers\ViewHelperBaseTestcase;
+use TYPO3Fluid\Fluid\Core\ViewHelper\Exception;
/**
* Test case
@@ -147,7 +148,7 @@ class CObjectViewHelperTest extends ViewHelperBaseTestcase
]
);
- $this->expectException(\TYPO3Fluid\Fluid\Core\ViewHelper\Exception::class);
+ $this->expectException(Exception::class);
$this->expectExceptionCode($exceptionCode);
$this->viewHelper->initializeArgumentsAndRender();
}
diff --git a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/AbstractFormFieldViewHelperTest.php b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/AbstractFormFieldViewHelperTest.php
index 09e8ee380861301c30d158cd88e995624951d343..7f2d46e4efdd11f04516acfa0a4abd4756e88973 100644
--- a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/AbstractFormFieldViewHelperTest.php
+++ b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/AbstractFormFieldViewHelperTest.php
@@ -15,6 +15,7 @@
namespace TYPO3\CMS\Fluid\Tests\Unit\ViewHelpers\Form;
+use TYPO3\CMS\Fluid\Tests\Unit\ViewHelpers\Form\Fixtures\ClassWithTwoGetters;
use TYPO3\CMS\Fluid\ViewHelpers\Form\AbstractFormFieldViewHelper;
use TYPO3\CMS\Fluid\ViewHelpers\FormViewHelper;
@@ -73,7 +74,7 @@ class AbstractFormFieldViewHelperTest extends FormFieldViewHelperBaseTestcase
$this->injectDependenciesIntoViewHelper($formViewHelper);
$formViewHelper->_set('respectSubmittedDataValue', false);
- $mockObject = new \TYPO3\CMS\Fluid\Tests\Unit\ViewHelpers\Form\Fixtures\ClassWithTwoGetters('testing', 1476108385);
+ $mockObject = new ClassWithTwoGetters('testing', 1476108385);
$formViewHelper->expects(self::any())->method('isObjectAccessorMode')->willReturn(true);
$this->viewHelperVariableContainer->get(FormViewHelper::class, 'formObject')
@@ -264,7 +265,7 @@ class AbstractFormFieldViewHelperTest extends FormFieldViewHelperBaseTestcase
*/
public function addAdditionalIdentityPropertiesIfNeededCallsRenderIdentityFieldWithTheRightParameters()
{
- $mockFormObject = new \TYPO3\CMS\Fluid\Tests\Unit\ViewHelpers\Form\Fixtures\ClassWithTwoGetters();
+ $mockFormObject = new ClassWithTwoGetters();
$property = 'value.something';
$objectName = 'myObject';
@@ -312,7 +313,7 @@ class AbstractFormFieldViewHelperTest extends FormFieldViewHelperBaseTestcase
*/
public function addAdditionalIdentityPropertiesIfNeededCallsRenderIdentityFieldWithTheRightParametersWithMoreHierarchyLevels(
) {
- $mockFormObject = new \TYPO3\CMS\Fluid\Tests\Unit\ViewHelpers\Form\Fixtures\ClassWithTwoGetters();
+ $mockFormObject = new ClassWithTwoGetters();
$property = 'value.value.something';
$objectName = 'myObject';
$expectedProperty1 = 'myObject[value]';
diff --git a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/AbstractFormViewHelperTest.php b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/AbstractFormViewHelperTest.php
index 0376be3d76ea90161485e9bd4a28ab38a38705c8..fd852b9261281d1a5353ab7ca3e2ce3d56766660 100644
--- a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/AbstractFormViewHelperTest.php
+++ b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/AbstractFormViewHelperTest.php
@@ -16,6 +16,8 @@
namespace TYPO3\CMS\Fluid\Tests\Unit\ViewHelpers\Form;
use TYPO3\CMS\Fluid\Tests\Unit\ViewHelpers\Form\Fixtures\ExtendsAbstractEntity;
+use TYPO3\CMS\Fluid\ViewHelpers\Form\AbstractFormViewHelper;
+use TYPO3\CMS\Fluid\ViewHelpers\FormViewHelper;
use TYPO3\TestingFramework\Fluid\Unit\ViewHelpers\ViewHelperBaseTestcase;
/**
@@ -31,7 +33,7 @@ class AbstractFormViewHelperTest extends ViewHelperBaseTestcase
$extendsAbstractEntity = new ExtendsAbstractEntity();
$extendsAbstractEntity->_setProperty('uid', 123);
$expectedResult = chr(10) . '<input type="hidden" name="prefix[theName][__identity]" value="123" />' . chr(10);
- $viewHelper = $this->getAccessibleMock(\TYPO3\CMS\Fluid\ViewHelpers\FormViewHelper::class, ['prefixFieldName', 'registerFieldNameForFormTokenGeneration'], [], '', false);
+ $viewHelper = $this->getAccessibleMock(FormViewHelper::class, ['prefixFieldName', 'registerFieldNameForFormTokenGeneration'], [], '', false);
$viewHelper->expects(self::any())->method('prefixFieldName')->with('theName')->willReturn('prefix[theName]');
$actualResult = $viewHelper->_call('renderHiddenIdentityField', $extendsAbstractEntity, 'theName');
self::assertSame($expectedResult, $actualResult);
@@ -46,7 +48,7 @@ class AbstractFormViewHelperTest extends ViewHelperBaseTestcase
$extendsAbstractEntity->_setProperty('uid', 123);
$object = clone $extendsAbstractEntity;
$expectedResult = chr(10) . '<input type="hidden" name="prefix[theName][__identity]" value="123" />' . chr(10);
- $viewHelper = $this->getAccessibleMock(\TYPO3\CMS\Fluid\ViewHelpers\FormViewHelper::class, ['prefixFieldName', 'registerFieldNameForFormTokenGeneration'], [], '', false);
+ $viewHelper = $this->getAccessibleMock(FormViewHelper::class, ['prefixFieldName', 'registerFieldNameForFormTokenGeneration'], [], '', false);
$viewHelper->expects(self::any())->method('prefixFieldName')->with('theName')->willReturn('prefix[theName]');
$actualResult = $viewHelper->_call('renderHiddenIdentityField', $extendsAbstractEntity, 'theName');
self::assertSame($expectedResult, $actualResult);
@@ -57,7 +59,7 @@ class AbstractFormViewHelperTest extends ViewHelperBaseTestcase
*/
public function prefixFieldNameReturnsEmptyStringIfGivenFieldNameIsNULL()
{
- $viewHelper = $this->getAccessibleMock(\TYPO3\CMS\Fluid\ViewHelpers\Form\AbstractFormViewHelper::class, ['dummy'], [], '', false);
+ $viewHelper = $this->getAccessibleMock(AbstractFormViewHelper::class, ['dummy'], [], '', false);
$this->injectDependenciesIntoViewHelper($viewHelper);
self::assertSame('', $viewHelper->_call('prefixFieldName', null));
}
@@ -67,7 +69,7 @@ class AbstractFormViewHelperTest extends ViewHelperBaseTestcase
*/
public function prefixFieldNameReturnsEmptyStringIfGivenFieldNameIsEmpty()
{
- $viewHelper = $this->getAccessibleMock(\TYPO3\CMS\Fluid\ViewHelpers\Form\AbstractFormViewHelper::class, ['dummy'], [], '', false);
+ $viewHelper = $this->getAccessibleMock(AbstractFormViewHelper::class, ['dummy'], [], '', false);
$this->injectDependenciesIntoViewHelper($viewHelper);
self::assertSame('', $viewHelper->_call('prefixFieldName', ''));
}
@@ -77,10 +79,10 @@ class AbstractFormViewHelperTest extends ViewHelperBaseTestcase
*/
public function prefixFieldNameReturnsGivenFieldNameIfFieldNamePrefixIsEmpty()
{
- $viewHelper = $this->getAccessibleMock(\TYPO3\CMS\Fluid\ViewHelpers\Form\AbstractFormViewHelper::class, ['dummy'], [], '', false);
+ $viewHelper = $this->getAccessibleMock(AbstractFormViewHelper::class, ['dummy'], [], '', false);
$this->injectDependenciesIntoViewHelper($viewHelper);
- $this->viewHelperVariableContainer->exists(\TYPO3\CMS\Fluid\ViewHelpers\FormViewHelper::class, 'fieldNamePrefix')->willReturn(true);
- $this->viewHelperVariableContainer->get(\TYPO3\CMS\Fluid\ViewHelpers\FormViewHelper::class, 'fieldNamePrefix')->willReturn('');
+ $this->viewHelperVariableContainer->exists(FormViewHelper::class, 'fieldNamePrefix')->willReturn(true);
+ $this->viewHelperVariableContainer->get(FormViewHelper::class, 'fieldNamePrefix')->willReturn('');
self::assertSame('someFieldName', $viewHelper->_call('prefixFieldName', 'someFieldName'));
}
@@ -89,10 +91,10 @@ class AbstractFormViewHelperTest extends ViewHelperBaseTestcase
*/
public function prefixFieldNamePrefixesGivenFieldNameWithFieldNamePrefix()
{
- $viewHelper = $this->getAccessibleMock(\TYPO3\CMS\Fluid\ViewHelpers\Form\AbstractFormViewHelper::class, ['dummy'], [], '', false);
+ $viewHelper = $this->getAccessibleMock(AbstractFormViewHelper::class, ['dummy'], [], '', false);
$this->injectDependenciesIntoViewHelper($viewHelper);
- $this->viewHelperVariableContainer->exists(\TYPO3\CMS\Fluid\ViewHelpers\FormViewHelper::class, 'fieldNamePrefix')->willReturn(true);
- $this->viewHelperVariableContainer->get(\TYPO3\CMS\Fluid\ViewHelpers\FormViewHelper::class, 'fieldNamePrefix')->willReturn('somePrefix');
+ $this->viewHelperVariableContainer->exists(FormViewHelper::class, 'fieldNamePrefix')->willReturn(true);
+ $this->viewHelperVariableContainer->get(FormViewHelper::class, 'fieldNamePrefix')->willReturn('somePrefix');
self::assertSame('somePrefix[someFieldName]', $viewHelper->_call('prefixFieldName', 'someFieldName'));
}
@@ -101,10 +103,10 @@ class AbstractFormViewHelperTest extends ViewHelperBaseTestcase
*/
public function prefixFieldNamePreservesSquareBracketsOfFieldName()
{
- $viewHelper = $this->getAccessibleMock(\TYPO3\CMS\Fluid\ViewHelpers\Form\AbstractFormViewHelper::class, ['dummy'], [], '', false);
+ $viewHelper = $this->getAccessibleMock(AbstractFormViewHelper::class, ['dummy'], [], '', false);
$this->injectDependenciesIntoViewHelper($viewHelper);
- $this->viewHelperVariableContainer->exists(\TYPO3\CMS\Fluid\ViewHelpers\FormViewHelper::class, 'fieldNamePrefix')->willReturn(true);
- $this->viewHelperVariableContainer->get(\TYPO3\CMS\Fluid\ViewHelpers\FormViewHelper::class, 'fieldNamePrefix')->willReturn('somePrefix[foo]');
+ $this->viewHelperVariableContainer->exists(FormViewHelper::class, 'fieldNamePrefix')->willReturn(true);
+ $this->viewHelperVariableContainer->get(FormViewHelper::class, 'fieldNamePrefix')->willReturn('somePrefix[foo]');
self::assertSame('somePrefix[foo][someFieldName][bar]', $viewHelper->_call('prefixFieldName', 'someFieldName[bar]'));
}
}
diff --git a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/Fixtures/EmptySyntaxTreeNode.php b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/Fixtures/EmptySyntaxTreeNode.php
index 79d1ff3871d65d4d071acd09d39b5de82504c5d1..865c499850d98bef5dd364206ced94a9412fdc47 100644
--- a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/Fixtures/EmptySyntaxTreeNode.php
+++ b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/Fixtures/EmptySyntaxTreeNode.php
@@ -15,10 +15,12 @@
namespace TYPO3\CMS\Fluid\Tests\Unit\ViewHelpers\Form\Fixtures;
+use TYPO3Fluid\Fluid\Core\Parser\SyntaxTree\ViewHelperNode;
+
/**
* [Enter description here]
*/
-class EmptySyntaxTreeNode extends \TYPO3Fluid\Fluid\Core\Parser\SyntaxTree\ViewHelperNode
+class EmptySyntaxTreeNode extends ViewHelperNode
{
public function __construct()
{
diff --git a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/Fixtures/ExtendsAbstractEntity.php b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/Fixtures/ExtendsAbstractEntity.php
index 45f52f18adff34461ebc2521d00ef7051f8d8c04..7418810a110fe7ccf351b662c15b6b21b4e80e66 100644
--- a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/Fixtures/ExtendsAbstractEntity.php
+++ b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/Fixtures/ExtendsAbstractEntity.php
@@ -15,9 +15,11 @@
namespace TYPO3\CMS\Fluid\Tests\Unit\ViewHelpers\Form\Fixtures;
+use TYPO3\CMS\Extbase\DomainObject\AbstractEntity;
+
/**
* Class ExtendsAbstractEntity
*/
-class ExtendsAbstractEntity extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
+class ExtendsAbstractEntity extends AbstractEntity
{
}
diff --git a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/HiddenViewHelperTest.php b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/HiddenViewHelperTest.php
index 75baf78857aed9e2f0b54df559a6db400dd17c48..9a85c32b3e01a366208f0ed9f3bc4db5fc4277ef 100644
--- a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/HiddenViewHelperTest.php
+++ b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/HiddenViewHelperTest.php
@@ -21,7 +21,7 @@ use TYPO3Fluid\Fluid\Core\ViewHelper\TagBuilder;
/**
* Test for the "Hidden" Form view helper
*/
-class HiddenViewHelperTest extends \TYPO3\CMS\Fluid\Tests\Unit\ViewHelpers\Form\FormFieldViewHelperBaseTestcase
+class HiddenViewHelperTest extends FormFieldViewHelperBaseTestcase
{
/**
* @var \TYPO3\CMS\Fluid\ViewHelpers\Form\HiddenViewHelper
diff --git a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/PasswordViewHelperTest.php b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/PasswordViewHelperTest.php
index 156c65c05c328344267c59608298b37cd443090d..4c0a06d811e97150395b9fbf358126a259f52dbd 100644
--- a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/PasswordViewHelperTest.php
+++ b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/PasswordViewHelperTest.php
@@ -15,12 +15,14 @@
namespace TYPO3\CMS\Fluid\Tests\Unit\ViewHelpers\Form;
+use TYPO3\CMS\Fluid\Tests\Unit\ViewHelpers\Form\Fixtures\EmptySyntaxTreeNode;
+use TYPO3\CMS\Fluid\ViewHelpers\Form\PasswordViewHelper;
use TYPO3Fluid\Fluid\Core\ViewHelper\TagBuilder;
/**
* Test for the "Password" Form view helper
*/
-class PasswordViewHelperTest extends \TYPO3\CMS\Fluid\Tests\Unit\ViewHelpers\Form\FormFieldViewHelperBaseTestcase
+class PasswordViewHelperTest extends FormFieldViewHelperBaseTestcase
{
/**
* @var \TYPO3\CMS\Fluid\ViewHelpers\Form\PasswordViewHelper
@@ -30,7 +32,7 @@ class PasswordViewHelperTest extends \TYPO3\CMS\Fluid\Tests\Unit\ViewHelpers\For
protected function setUp(): void
{
parent::setUp();
- $this->viewHelper = $this->getAccessibleMock(\TYPO3\CMS\Fluid\ViewHelpers\Form\PasswordViewHelper::class, ['setErrorClassAttribute', 'registerFieldNameForFormTokenGeneration']);
+ $this->viewHelper = $this->getAccessibleMock(PasswordViewHelper::class, ['setErrorClassAttribute', 'registerFieldNameForFormTokenGeneration']);
$this->arguments['name'] = '';
$this->injectDependenciesIntoViewHelper($this->viewHelper);
}
@@ -71,7 +73,7 @@ class PasswordViewHelperTest extends \TYPO3\CMS\Fluid\Tests\Unit\ViewHelpers\For
];
$this->viewHelper->setArguments($arguments);
- $this->viewHelper->setViewHelperNode(new \TYPO3\CMS\Fluid\Tests\Unit\ViewHelpers\Form\Fixtures\EmptySyntaxTreeNode());
+ $this->viewHelper->setViewHelperNode(new EmptySyntaxTreeNode());
$this->viewHelper->initializeArgumentsAndRender();
}
diff --git a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/SubmitViewHelperTest.php b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/SubmitViewHelperTest.php
index a5060b38dfd099cf4d115647c04960698b2e215b..9746469b12e97fa23f8192494f5386fd8bbd02ab 100644
--- a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/SubmitViewHelperTest.php
+++ b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/SubmitViewHelperTest.php
@@ -15,12 +15,13 @@
namespace TYPO3\CMS\Fluid\Tests\Unit\ViewHelpers\Form;
+use TYPO3\CMS\Fluid\ViewHelpers\Form\SubmitViewHelper;
use TYPO3Fluid\Fluid\Core\ViewHelper\TagBuilder;
/**
* Test for the "Submit" Form view helper
*/
-class SubmitViewHelperTest extends \TYPO3\CMS\Fluid\Tests\Unit\ViewHelpers\Form\FormFieldViewHelperBaseTestcase
+class SubmitViewHelperTest extends FormFieldViewHelperBaseTestcase
{
/**
* @var \TYPO3\CMS\Fluid\ViewHelpers\Form\SubmitViewHelper
@@ -30,7 +31,7 @@ class SubmitViewHelperTest extends \TYPO3\CMS\Fluid\Tests\Unit\ViewHelpers\Form\
protected function setUp(): void
{
parent::setUp();
- $this->viewHelper = $this->getAccessibleMock(\TYPO3\CMS\Fluid\ViewHelpers\Form\SubmitViewHelper::class, ['dummy']);
+ $this->viewHelper = $this->getAccessibleMock(SubmitViewHelper::class, ['dummy']);
$this->arguments['name'] = '';
$this->injectDependenciesIntoViewHelper($this->viewHelper);
}
diff --git a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/TextareaViewHelperTest.php b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/TextareaViewHelperTest.php
index ec1a9c1dfc72dda6b6c5d50da092a018a3f0a29a..914d9f0ec3c20c54ef5739128bc0466a7a43ee50 100644
--- a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/TextareaViewHelperTest.php
+++ b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/TextareaViewHelperTest.php
@@ -15,6 +15,7 @@
namespace TYPO3\CMS\Fluid\Tests\Unit\ViewHelpers\Form;
+use TYPO3\CMS\Fluid\Tests\Unit\ViewHelpers\Form\Fixtures\EmptySyntaxTreeNode;
use TYPO3\CMS\Fluid\ViewHelpers\Form\TextareaViewHelper;
use TYPO3Fluid\Fluid\Core\ViewHelper\TagBuilder;
@@ -62,7 +63,7 @@ class TextareaViewHelperTest extends FormFieldViewHelperBaseTestcase
];
$this->viewHelper->setArguments($arguments);
- $this->viewHelper->setViewHelperNode(new Fixtures\EmptySyntaxTreeNode());
+ $this->viewHelper->setViewHelperNode(new EmptySyntaxTreeNode());
$actual = $this->viewHelper->initializeArgumentsAndRender();
$expected = '<textarea name="NameOfTextarea">Current value</textarea>';
self::assertSame($expected, $actual);
@@ -88,7 +89,7 @@ class TextareaViewHelperTest extends FormFieldViewHelperBaseTestcase
];
$this->viewHelper->setArguments($arguments);
- $this->viewHelper->setViewHelperNode(new Fixtures\EmptySyntaxTreeNode());
+ $this->viewHelper->setViewHelperNode(new EmptySyntaxTreeNode());
$actual = $this->viewHelper->initializeArgumentsAndRender();
$expected = '<textarea name="NameOfTextarea">some <tag> & "quotes"</textarea>';
self::assertSame($expected, $actual);
@@ -105,7 +106,7 @@ class TextareaViewHelperTest extends FormFieldViewHelperBaseTestcase
];
$this->viewHelper->setArguments($arguments);
- $this->viewHelper->setViewHelperNode(new Fixtures\EmptySyntaxTreeNode());
+ $this->viewHelper->setViewHelperNode(new EmptySyntaxTreeNode());
$actual = $this->viewHelper->initializeArgumentsAndRender();
$expected = '<textarea placeholder="SomePlaceholder" name="NameOfTextarea"></textarea>';
self::assertSame($expected, $actual);
@@ -122,7 +123,7 @@ class TextareaViewHelperTest extends FormFieldViewHelperBaseTestcase
];
$this->viewHelper->setArguments($arguments);
- $this->viewHelper->setViewHelperNode(new Fixtures\EmptySyntaxTreeNode());
+ $this->viewHelper->setViewHelperNode(new EmptySyntaxTreeNode());
$actual = $this->viewHelper->initializeArgumentsAndRender();
$expected = '<textarea readonly="foo" name="NameOfTextarea"></textarea>';
self::assertSame($expected, $actual);
@@ -139,7 +140,7 @@ class TextareaViewHelperTest extends FormFieldViewHelperBaseTestcase
];
$this->viewHelper->setArguments($arguments);
- $this->viewHelper->setViewHelperNode(new Fixtures\EmptySyntaxTreeNode());
+ $this->viewHelper->setViewHelperNode(new EmptySyntaxTreeNode());
$actual = $this->viewHelper->initializeArgumentsAndRender();
$expected = '<textarea name="NameOfTextarea" required="required"></textarea>';
self::assertSame($expected, $actual);
diff --git a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/UploadViewHelperTest.php b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/UploadViewHelperTest.php
index bcfa8bcabd9ae874c09c6fea1c891d114552619e..7a04245d7e592ce29bd548f973fe3fa2abd3aa50 100644
--- a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/UploadViewHelperTest.php
+++ b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/UploadViewHelperTest.php
@@ -15,6 +15,9 @@
namespace TYPO3\CMS\Fluid\Tests\Unit\ViewHelpers\Form;
+use TYPO3\CMS\Core\Utility\GeneralUtility;
+use TYPO3\CMS\Fluid\Tests\Unit\ViewHelpers\Form\Fixtures\EmptySyntaxTreeNode;
+use TYPO3\CMS\Fluid\ViewHelpers\Form\UploadViewHelper;
use TYPO3\TestingFramework\Fluid\Unit\ViewHelpers\ViewHelperBaseTestcase;
use TYPO3Fluid\Fluid\Core\ViewHelper\TagBuilder;
@@ -31,7 +34,7 @@ class UploadViewHelperTest extends ViewHelperBaseTestcase
protected function setUp(): void
{
parent::setUp();
- $this->viewHelper = $this->getAccessibleMock(\TYPO3\CMS\Fluid\ViewHelpers\Form\UploadViewHelper::class, ['setErrorClassAttribute', 'registerFieldNameForFormTokenGeneration']);
+ $this->viewHelper = $this->getAccessibleMock(UploadViewHelper::class, ['setErrorClassAttribute', 'registerFieldNameForFormTokenGeneration']);
$this->arguments['name'] = '';
$this->injectDependenciesIntoViewHelper($this->viewHelper);
}
@@ -41,7 +44,7 @@ class UploadViewHelperTest extends ViewHelperBaseTestcase
*/
public function renderCorrectlySetsTagName()
{
- $this->tagBuilder = $this->createMock(\TYPO3Fluid\Fluid\Core\ViewHelper\TagBuilder::class);
+ $this->tagBuilder = $this->createMock(TagBuilder::class);
$this->tagBuilder->expects(self::atLeastOnce())->method('setTagName')->with('input');
$this->viewHelper->setTagBuilder($this->tagBuilder);
$this->viewHelper->initializeArgumentsAndRender();
@@ -69,7 +72,7 @@ class UploadViewHelperTest extends ViewHelperBaseTestcase
'name' => 'someName'
];
$this->viewHelper->setArguments($arguments);
- $this->viewHelper->setViewHelperNode(new \TYPO3\CMS\Fluid\Tests\Unit\ViewHelpers\Form\Fixtures\EmptySyntaxTreeNode());
+ $this->viewHelper->setViewHelperNode(new EmptySyntaxTreeNode());
$this->viewHelper->initializeArgumentsAndRender();
}
@@ -88,7 +91,7 @@ class UploadViewHelperTest extends ViewHelperBaseTestcase
public function renderSetsAttributeNameAsArrayIfMultipleIsGiven()
{
/** @var TagBuilder $tagBuilder */
- $tagBuilder = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(TagBuilder::class);
+ $tagBuilder = GeneralUtility::makeInstance(TagBuilder::class);
$tagBuilder->addAttribute('multiple', 'multiple');
$this->viewHelper->setTagBuilder($tagBuilder);
$arguments = [
diff --git a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Format/CaseViewHelperTest.php b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Format/CaseViewHelperTest.php
index fba0c1d05486b6d69f72ad50102f908da4abdb4f..89c589495a1a83863bd483a9202f52ec8cbbe518 100644
--- a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Format/CaseViewHelperTest.php
+++ b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Format/CaseViewHelperTest.php
@@ -17,6 +17,7 @@ namespace TYPO3\CMS\Fluid\Tests\Unit\ViewHelpers\Format;
use TYPO3\CMS\Fluid\ViewHelpers\Format\CaseViewHelper;
use TYPO3\TestingFramework\Fluid\Unit\ViewHelpers\ViewHelperBaseTestcase;
+use TYPO3Fluid\Fluid\Core\ViewHelper\Exception;
/**
* Test case
@@ -70,7 +71,7 @@ class CaseViewHelperTest extends ViewHelperBaseTestcase
*/
public function viewHelperThrowsExceptionIfIncorrectModeIsGiven()
{
- $this->expectException(\TYPO3Fluid\Fluid\Core\ViewHelper\Exception::class);
+ $this->expectException(Exception::class);
$this->expectExceptionCode(1358349150);
$this->setArgumentsUnderTest(
$this->viewHelper,
diff --git a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/ImageViewHelperTest.php b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/ImageViewHelperTest.php
index 9140d3a75fe376d4ce3ffbf9dbb0e54e8860dab5..e727fef681be7826035398f0de52abb4f5409c06 100644
--- a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/ImageViewHelperTest.php
+++ b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/ImageViewHelperTest.php
@@ -21,6 +21,7 @@ use TYPO3\CMS\Core\Resource\ProcessedFile;
use TYPO3\CMS\Extbase\Service\ImageService;
use TYPO3\CMS\Fluid\ViewHelpers\ImageViewHelper;
use TYPO3\TestingFramework\Fluid\Unit\ViewHelpers\ViewHelperBaseTestcase;
+use TYPO3Fluid\Fluid\Core\ViewHelper\Exception;
use TYPO3Fluid\Fluid\Core\ViewHelper\TagBuilder;
/**
@@ -67,7 +68,7 @@ class ImageViewHelperTest extends ViewHelperBaseTestcase
{
$this->setArgumentsUnderTest($this->viewHelper, $arguments);
- $this->expectException(\TYPO3Fluid\Fluid\Core\ViewHelper\Exception::class);
+ $this->expectException(Exception::class);
$this->expectExceptionCode(1382284106);
$this->viewHelper->render();
diff --git a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Link/EmailViewHelperTest.php b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Link/EmailViewHelperTest.php
index 53284ee71c1501a132961291ab2d6c87939dfd70..69226edd8723f0e9db90b2e2f389b2b17d1cf5ba 100644
--- a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Link/EmailViewHelperTest.php
+++ b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Link/EmailViewHelperTest.php
@@ -40,7 +40,7 @@ class EmailViewHelperTest extends ViewHelperBaseTestcase
{
parent::setUp();
$GLOBALS['TSFE'] = new \stdClass();
- $GLOBALS['TSFE']->cObj = $this->createMock(\TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer::class);
+ $GLOBALS['TSFE']->cObj = $this->createMock(ContentObjectRenderer::class);
$this->viewHelper = $this->getAccessibleMock(EmailViewHelper::class, ['renderChildren']);
$this->injectDependenciesIntoViewHelper($this->viewHelper);
}
diff --git a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Link/ExternalViewHelperTest.php b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Link/ExternalViewHelperTest.php
index e80087e1ecb7e2d7546ffc7afa7195b72c2acaa0..ae376e4f4a9b4f1145ba11cdd7fe4c486a94b0ec 100644
--- a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Link/ExternalViewHelperTest.php
+++ b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Link/ExternalViewHelperTest.php
@@ -15,6 +15,7 @@
namespace TYPO3\CMS\Fluid\Tests\Unit\ViewHelpers\Link;
+use TYPO3\CMS\Fluid\ViewHelpers\Link\ExternalViewHelper;
use TYPO3\TestingFramework\Fluid\Unit\ViewHelpers\ViewHelperBaseTestcase;
use TYPO3Fluid\Fluid\Core\ViewHelper\TagBuilder;
@@ -31,7 +32,7 @@ class ExternalViewHelperTest extends ViewHelperBaseTestcase
protected function setUp(): void
{
parent::setUp();
- $this->viewHelper = $this->getAccessibleMock(\TYPO3\CMS\Fluid\ViewHelpers\Link\ExternalViewHelper::class, ['renderChildren']);
+ $this->viewHelper = $this->getAccessibleMock(ExternalViewHelper::class, ['renderChildren']);
$this->injectDependenciesIntoViewHelper($this->viewHelper);
}
diff --git a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Link/PageViewHelperTest.php b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Link/PageViewHelperTest.php
index 0128e1f183e99c97e97f1a0e3b9dc1463aaa0df7..4841f9f9e26ec81ccd88e9886461415417a49850 100644
--- a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Link/PageViewHelperTest.php
+++ b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Link/PageViewHelperTest.php
@@ -17,6 +17,7 @@ declare(strict_types=1);
namespace TYPO3\CMS\Fluid\Tests\Unit\ViewHelpers\Link;
+use TYPO3\CMS\Extbase\Mvc\Controller\ControllerContext;
use TYPO3\CMS\Extbase\Mvc\Web\Routing\UriBuilder;
use TYPO3\CMS\Fluid\Core\Rendering\RenderingContext;
use TYPO3\CMS\Fluid\ViewHelpers\Link\PageViewHelper;
@@ -60,7 +61,7 @@ class PageViewHelperTest extends ViewHelperBaseTestcase
$this->uriBuilder->expects(self::any())->method('setAddQueryStringMethod')->willReturn($this->uriBuilder);
// reset parent controller context and uri builder @todo: remove once fluid-cleanup is merged in testing framework
- $this->controllerContext = $this->createMock(\TYPO3\CMS\Extbase\Mvc\Controller\ControllerContext::class);
+ $this->controllerContext = $this->createMock(ControllerContext::class);
$this->controllerContext->expects(self::any())->method('getUriBuilder')->willReturn($this->uriBuilder);
$this->controllerContext->expects(self::any())->method('getRequest')->willReturn($this->request->reveal());
$this->arguments = [];
diff --git a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/TranslateViewHelperTest.php b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/TranslateViewHelperTest.php
index b5728b071b52787d6750c2b0b10d56fb17141488..091aee9cc69f5261608c263c217c7d9f8a6ebdeb 100644
--- a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/TranslateViewHelperTest.php
+++ b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/TranslateViewHelperTest.php
@@ -18,6 +18,7 @@ namespace TYPO3\CMS\Fluid\Tests\Unit\ViewHelpers;
use TYPO3\CMS\Fluid\Tests\Unit\ViewHelpers\Fixtures\TranslateViewHelperFixtureForEmptyString;
use TYPO3\CMS\Fluid\ViewHelpers\TranslateViewHelper;
use TYPO3\TestingFramework\Fluid\Unit\ViewHelpers\ViewHelperBaseTestcase;
+use TYPO3Fluid\Fluid\Core\ViewHelper\Exception;
/**
* Test class for TranslateViewHelper
@@ -37,7 +38,7 @@ class TranslateViewHelperTest extends ViewHelperBaseTestcase
$this->viewHelper = new TranslateViewHelper();
$this->injectDependenciesIntoViewHelper($this->viewHelper);
- $this->expectException(\TYPO3Fluid\Fluid\Core\ViewHelper\Exception::class);
+ $this->expectException(Exception::class);
$this->expectExceptionCode(1351584844);
$this->setArgumentsUnderTest(
diff --git a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Widget/Controller/PaginateControllerTest.php b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Widget/Controller/PaginateControllerTest.php
index 53de5e280ae9cde6251ebd0801b4d4e65449eefe..ebf3107693dd3bf6452f300c716eb46e761aad55 100644
--- a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Widget/Controller/PaginateControllerTest.php
+++ b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Widget/Controller/PaginateControllerTest.php
@@ -15,7 +15,16 @@
namespace TYPO3\CMS\Fluid\Tests\Unit\ViewHelpers\Widget\Controller;
+use TYPO3\CMS\Extbase\Mvc\View\ViewInterface;
+use TYPO3\CMS\Extbase\Persistence\Generic\BackendInterface;
+use TYPO3\CMS\Extbase\Persistence\Generic\Mapper\DataMapper;
+use TYPO3\CMS\Extbase\Persistence\Generic\Query;
+use TYPO3\CMS\Extbase\Persistence\Generic\QuerySettingsInterface;
use TYPO3\CMS\Extbase\Persistence\ObjectStorage;
+use TYPO3\CMS\Extbase\Persistence\PersistenceManagerInterface;
+use TYPO3\CMS\Extbase\Persistence\QueryInterface;
+use TYPO3\CMS\Extbase\Persistence\QueryResultInterface;
+use TYPO3\CMS\Fluid\ViewHelpers\Widget\Controller\PaginateController;
use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
/**
@@ -59,22 +68,22 @@ class PaginateControllerTest extends UnitTestCase
protected function setUp(): void
{
parent::setUp();
- $this->query = $this->getAccessibleMock(\TYPO3\CMS\Extbase\Persistence\Generic\Query::class, ['dummy'], ['someType']);
- $this->querySettings = $this->createMock(\TYPO3\CMS\Extbase\Persistence\Generic\QuerySettingsInterface::class);
+ $this->query = $this->getAccessibleMock(Query::class, ['dummy'], ['someType']);
+ $this->querySettings = $this->createMock(QuerySettingsInterface::class);
$this->query->_set('querySettings', $this->querySettings);
- $this->persistenceManager = $this->createMock(\TYPO3\CMS\Extbase\Persistence\PersistenceManagerInterface::class);
- $this->backend = $this->createMock(\TYPO3\CMS\Extbase\Persistence\Generic\BackendInterface::class);
+ $this->persistenceManager = $this->createMock(PersistenceManagerInterface::class);
+ $this->backend = $this->createMock(BackendInterface::class);
$this->query->_set('persistenceManager', $this->persistenceManager);
- $this->dataMapper = $this->createMock(\TYPO3\CMS\Extbase\Persistence\Generic\Mapper\DataMapper::class);
+ $this->dataMapper = $this->createMock(DataMapper::class);
$this->query->_set('dataMapper', $this->dataMapper);
$this->controller = $this->getAccessibleMock(
- \TYPO3\CMS\Fluid\ViewHelpers\Widget\Controller\PaginateController::class,
+ PaginateController::class,
['dummy'],
[],
'',
false
);
- $this->controller->_set('view', $this->createMock(\TYPO3\CMS\Extbase\Mvc\View\ViewInterface::class));
+ $this->controller->_set('view', $this->createMock(ViewInterface::class));
}
/**
@@ -160,8 +169,8 @@ class PaginateControllerTest extends UnitTestCase
*/
public function acceptQueryResultInterfaceAsObjects()
{
- $mockQueryResult = $this->createMock(\TYPO3\CMS\Extbase\Persistence\QueryResultInterface::class);
- $mockQuery = $this->createMock(\TYPO3\CMS\Extbase\Persistence\QueryInterface::class);
+ $mockQueryResult = $this->createMock(QueryResultInterface::class);
+ $mockQuery = $this->createMock(QueryInterface::class);
$mockQueryResult->expects(self::any())->method('getQuery')->willReturn($mockQuery);
$this->controller->_set('objects', $mockQueryResult);
$this->controller->_set('widgetConfiguration', ['as' => 'paginatedObjects']);
diff --git a/typo3/sysext/fluid_styled_content/Tests/Functional/Tca/ContentVisibleFieldsTest.php b/typo3/sysext/fluid_styled_content/Tests/Functional/Tca/ContentVisibleFieldsTest.php
index 8dd421ebd88fe6d844a47f9b06a8d9eb8a5e05cf..3a8465d5dae7cdadc12238b7d9526a1cb5ad2467 100644
--- a/typo3/sysext/fluid_styled_content/Tests/Functional/Tca/ContentVisibleFieldsTest.php
+++ b/typo3/sysext/fluid_styled_content/Tests/Functional/Tca/ContentVisibleFieldsTest.php
@@ -18,8 +18,9 @@ namespace TYPO3\CMS\FluidStyledContent\Tests\Functional\Tca;
use TYPO3\CMS\Backend\Tests\Functional\Form\FormTestService;
use TYPO3\CMS\Core\Localization\LanguageService;
use TYPO3\CMS\Core\Utility\GeneralUtility;
+use TYPO3\TestingFramework\Core\Functional\FunctionalTestCase;
-class ContentVisibleFieldsTest extends \TYPO3\TestingFramework\Core\Functional\FunctionalTestCase
+class ContentVisibleFieldsTest extends FunctionalTestCase
{
/**
* @var array
diff --git a/typo3/sysext/form/Classes/Controller/AbstractBackendController.php b/typo3/sysext/form/Classes/Controller/AbstractBackendController.php
index 793e813cc7f5d7c3d2835f0bf8ea43d57ade8305..8fba03da36c6ca20293b9e97fbfa2cdb74594471 100644
--- a/typo3/sysext/form/Classes/Controller/AbstractBackendController.php
+++ b/typo3/sysext/form/Classes/Controller/AbstractBackendController.php
@@ -21,6 +21,7 @@ use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Core\Utility\PathUtility;
use TYPO3\CMS\Extbase\Mvc\Controller\ActionController;
use TYPO3\CMS\Form\Mvc\Configuration\ConfigurationManagerInterface;
+use TYPO3\CMS\Form\Mvc\Persistence\FormPersistenceManagerInterface;
/**
* The abstract form backend controller
@@ -45,7 +46,7 @@ abstract class AbstractBackendController extends ActionController
* @param \TYPO3\CMS\Form\Mvc\Persistence\FormPersistenceManagerInterface $formPersistenceManager
* @internal
*/
- public function injectFormPersistenceManager(\TYPO3\CMS\Form\Mvc\Persistence\FormPersistenceManagerInterface $formPersistenceManager)
+ public function injectFormPersistenceManager(FormPersistenceManagerInterface $formPersistenceManager)
{
$this->formPersistenceManager = $formPersistenceManager;
}
diff --git a/typo3/sysext/form/Classes/Controller/FormFrontendController.php b/typo3/sysext/form/Classes/Controller/FormFrontendController.php
index 33412275f2cab240264e2bff480325d0811863e5..569f2c2cc3d765fc11d63be2bd4a6e8fc4262af0 100644
--- a/typo3/sysext/form/Classes/Controller/FormFrontendController.php
+++ b/typo3/sysext/form/Classes/Controller/FormFrontendController.php
@@ -28,6 +28,7 @@ use TYPO3\CMS\Form\Domain\Configuration\ConfigurationService;
use TYPO3\CMS\Form\Domain\Configuration\FormDefinition\Converters\FinisherOptionsFlexFormOverridesConverter;
use TYPO3\CMS\Form\Domain\Configuration\FormDefinition\Converters\FlexFormFinisherOverridesConverterDto;
use TYPO3\CMS\Form\Mvc\Configuration\TypoScriptService;
+use TYPO3\CMS\Form\Mvc\Persistence\FormPersistenceManagerInterface;
/**
* The frontend controller
@@ -47,7 +48,7 @@ class FormFrontendController extends ActionController
* @param \TYPO3\CMS\Form\Mvc\Persistence\FormPersistenceManagerInterface $formPersistenceManager
* @internal
*/
- public function injectFormPersistenceManager(\TYPO3\CMS\Form\Mvc\Persistence\FormPersistenceManagerInterface $formPersistenceManager)
+ public function injectFormPersistenceManager(FormPersistenceManagerInterface $formPersistenceManager)
{
$this->formPersistenceManager = $formPersistenceManager;
}
diff --git a/typo3/sysext/form/Classes/Controller/FormManagerController.php b/typo3/sysext/form/Classes/Controller/FormManagerController.php
index 196d29481c781e0afd57dbbba46c1358af999afc..c8a97a53b1fd217772b3f11b39ae9a3ba74237c7 100644
--- a/typo3/sysext/form/Classes/Controller/FormManagerController.php
+++ b/typo3/sysext/form/Classes/Controller/FormManagerController.php
@@ -18,6 +18,7 @@ declare(strict_types=1);
namespace TYPO3\CMS\Form\Controller;
use Symfony\Component\Yaml\Yaml;
+use TYPO3\CMS\Backend\Routing\UriBuilder;
use TYPO3\CMS\Backend\Template\Components\ButtonBar;
use TYPO3\CMS\Backend\Utility\BackendUtility;
use TYPO3\CMS\Backend\View\BackendTemplateView;
@@ -54,7 +55,7 @@ class FormManagerController extends AbstractBackendController
* @param \TYPO3\CMS\Form\Service\DatabaseService $databaseService
* @internal
*/
- public function injectDatabaseService(\TYPO3\CMS\Form\Service\DatabaseService $databaseService)
+ public function injectDatabaseService(DatabaseService $databaseService)
{
$this->databaseService = $databaseService;
}
@@ -544,7 +545,7 @@ class FormManagerController extends AbstractBackendController
protected function getModuleUrl(string $moduleName, array $urlParameters = []): string
{
/** @var \TYPO3\CMS\Backend\Routing\UriBuilder $uriBuilder */
- $uriBuilder = GeneralUtility::makeInstance(\TYPO3\CMS\Backend\Routing\UriBuilder::class);
+ $uriBuilder = GeneralUtility::makeInstance(UriBuilder::class);
return (string)$uriBuilder->buildUriFromRoute($moduleName, $urlParameters);
}
diff --git a/typo3/sysext/form/Classes/Domain/Finishers/AbstractFinisher.php b/typo3/sysext/form/Classes/Domain/Finishers/AbstractFinisher.php
index cf1fe26f666fc7b70de1762ad94e0ee435a3f2b6..a3f68c40c3e174a83f9290ad6ce6bfd9cf8b30f9 100644
--- a/typo3/sysext/form/Classes/Domain/Finishers/AbstractFinisher.php
+++ b/typo3/sysext/form/Classes/Domain/Finishers/AbstractFinisher.php
@@ -23,6 +23,7 @@ namespace TYPO3\CMS\Form\Domain\Finishers;
use TYPO3\CMS\Core\Utility\ArrayUtility;
use TYPO3\CMS\Core\Utility\Exception\MissingArrayPathException;
+use TYPO3\CMS\Extbase\Object\ObjectManagerInterface;
use TYPO3\CMS\Extbase\Reflection\ObjectAccess;
use TYPO3\CMS\Form\Domain\Finishers\Exception\FinisherException;
use TYPO3\CMS\Form\Domain\Model\FormElements\StringableFormElementInterface;
@@ -80,7 +81,7 @@ abstract class AbstractFinisher implements FinisherInterface
* @param \TYPO3\CMS\Extbase\Object\ObjectManagerInterface $objectManager
* @internal
*/
- public function injectObjectManager(\TYPO3\CMS\Extbase\Object\ObjectManagerInterface $objectManager)
+ public function injectObjectManager(ObjectManagerInterface $objectManager)
{
$this->objectManager = $objectManager;
}
diff --git a/typo3/sysext/form/Classes/Domain/Finishers/ConfirmationFinisher.php b/typo3/sysext/form/Classes/Domain/Finishers/ConfirmationFinisher.php
index c86aa9d90f305531859ac13263d4c2ba0371731f..9e84b412b49e1131ecc0334136903bfc63f04186 100644
--- a/typo3/sysext/form/Classes/Domain/Finishers/ConfirmationFinisher.php
+++ b/typo3/sysext/form/Classes/Domain/Finishers/ConfirmationFinisher.php
@@ -76,7 +76,7 @@ class ConfirmationFinisher extends AbstractFinisher
/**
* @param \TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface $configurationManager
*/
- public function injectConfigurationManager(\TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface $configurationManager)
+ public function injectConfigurationManager(ConfigurationManagerInterface $configurationManager)
{
$this->configurationManager = $configurationManager;
$this->typoScriptSetup = $this->configurationManager->getConfiguration(ConfigurationManagerInterface::CONFIGURATION_TYPE_FULL_TYPOSCRIPT);
diff --git a/typo3/sysext/form/Classes/Domain/Model/FormDefinition.php b/typo3/sysext/form/Classes/Domain/Model/FormDefinition.php
index 0646bf5921cf4fbd0249ed6b692c33598d18482a..18c9b0daa0bbb51e2bb910cbb15f363b13640a12 100644
--- a/typo3/sysext/form/Classes/Domain/Model/FormDefinition.php
+++ b/typo3/sysext/form/Classes/Domain/Model/FormDefinition.php
@@ -24,6 +24,7 @@ namespace TYPO3\CMS\Form\Domain\Model;
use TYPO3\CMS\Core\Utility\ArrayUtility;
use TYPO3\CMS\Extbase\Mvc\Web\Request;
use TYPO3\CMS\Extbase\Mvc\Web\Response;
+use TYPO3\CMS\Extbase\Object\ObjectManagerInterface;
use TYPO3\CMS\Extbase\Reflection\ObjectAccess;
use TYPO3\CMS\Form\Domain\Exception\IdentifierNotValidException;
use TYPO3\CMS\Form\Domain\Exception\TypeDefinitionNotFoundException;
@@ -293,7 +294,7 @@ class FormDefinition extends AbstractCompositeRenderable implements VariableRend
* @param \TYPO3\CMS\Extbase\Object\ObjectManagerInterface $objectManager
* @internal
*/
- public function injectObjectManager(\TYPO3\CMS\Extbase\Object\ObjectManagerInterface $objectManager)
+ public function injectObjectManager(ObjectManagerInterface $objectManager)
{
$this->objectManager = $objectManager;
}
diff --git a/typo3/sysext/form/Classes/Domain/Model/FormElements/FileUpload.php b/typo3/sysext/form/Classes/Domain/Model/FormElements/FileUpload.php
index b3a5351862aa3943281f380d1478b60c93fd22b8..06d74741d6976fa2e57e17bda5c02fb427564c1d 100644
--- a/typo3/sysext/form/Classes/Domain/Model/FormElements/FileUpload.php
+++ b/typo3/sysext/form/Classes/Domain/Model/FormElements/FileUpload.php
@@ -17,6 +17,8 @@ declare(strict_types=1);
namespace TYPO3\CMS\Form\Domain\Model\FormElements;
+use TYPO3\CMS\Extbase\Domain\Model\FileReference;
+
/**
* A generic file upload form element
*
@@ -31,7 +33,7 @@ class FileUpload extends AbstractFormElement
*/
public function initializeFormElement()
{
- $this->setDataType(\TYPO3\CMS\Extbase\Domain\Model\FileReference::class);
+ $this->setDataType(FileReference::class);
parent::initializeFormElement();
}
}
diff --git a/typo3/sysext/form/Classes/Domain/Renderer/AbstractElementRenderer.php b/typo3/sysext/form/Classes/Domain/Renderer/AbstractElementRenderer.php
index 66f2911d7d02e564d780f6b462b8da3a3014ad3f..7ce9f42967e01493ded39f0666e63e3fd9d833a7 100644
--- a/typo3/sysext/form/Classes/Domain/Renderer/AbstractElementRenderer.php
+++ b/typo3/sysext/form/Classes/Domain/Renderer/AbstractElementRenderer.php
@@ -21,6 +21,7 @@ declare(strict_types=1);
namespace TYPO3\CMS\Form\Domain\Renderer;
+use TYPO3\CMS\Extbase\Mvc\Controller\ControllerContext;
use TYPO3\CMS\Form\Domain\Runtime\FormRuntime;
/**
@@ -49,7 +50,7 @@ abstract class AbstractElementRenderer implements RendererInterface
*
* @param \TYPO3\CMS\Extbase\Mvc\Controller\ControllerContext $controllerContext
*/
- public function setControllerContext(\TYPO3\CMS\Extbase\Mvc\Controller\ControllerContext $controllerContext)
+ public function setControllerContext(ControllerContext $controllerContext)
{
$this->controllerContext = $controllerContext;
}
diff --git a/typo3/sysext/form/Classes/Domain/Runtime/FormRuntime.php b/typo3/sysext/form/Classes/Domain/Runtime/FormRuntime.php
index 60c0582b6c33c44a61098334de7163a8ee876038..77ab4940ec1b22c537cd2a667c3bb4429769bbb3 100644
--- a/typo3/sysext/form/Classes/Domain/Runtime/FormRuntime.php
+++ b/typo3/sysext/form/Classes/Domain/Runtime/FormRuntime.php
@@ -37,7 +37,9 @@ use TYPO3\CMS\Extbase\Mvc\Controller\ControllerContext;
use TYPO3\CMS\Extbase\Mvc\Web\Request;
use TYPO3\CMS\Extbase\Mvc\Web\Response;
use TYPO3\CMS\Extbase\Mvc\Web\Routing\UriBuilder;
+use TYPO3\CMS\Extbase\Object\ObjectManagerInterface;
use TYPO3\CMS\Extbase\Property\Exception as PropertyException;
+use TYPO3\CMS\Extbase\Security\Cryptography\HashService;
use TYPO3\CMS\Extbase\Security\Exception\InvalidArgumentForHashGenerationException;
use TYPO3\CMS\Extbase\Security\Exception\InvalidHashException;
use TYPO3\CMS\Form\Domain\Exception\RenderingException;
@@ -165,7 +167,7 @@ class FormRuntime implements RootRenderableInterface, \ArrayAccess
* @param \TYPO3\CMS\Extbase\Security\Cryptography\HashService $hashService
* @internal
*/
- public function injectHashService(\TYPO3\CMS\Extbase\Security\Cryptography\HashService $hashService)
+ public function injectHashService(HashService $hashService)
{
$this->hashService = $hashService;
}
@@ -174,7 +176,7 @@ class FormRuntime implements RootRenderableInterface, \ArrayAccess
* @param \TYPO3\CMS\Extbase\Object\ObjectManagerInterface $objectManager
* @internal
*/
- public function injectObjectManager(\TYPO3\CMS\Extbase\Object\ObjectManagerInterface $objectManager)
+ public function injectObjectManager(ObjectManagerInterface $objectManager)
{
$this->objectManager = $objectManager;
}
diff --git a/typo3/sysext/form/Classes/Hooks/FormPagePreviewRenderer.php b/typo3/sysext/form/Classes/Hooks/FormPagePreviewRenderer.php
index 59d811f89b940444f9b39bfc3c9926ff5e148f95..c0ce9cc3d4b3131fac5fc7e58679ce9a24679608 100644
--- a/typo3/sysext/form/Classes/Hooks/FormPagePreviewRenderer.php
+++ b/typo3/sysext/form/Classes/Hooks/FormPagePreviewRenderer.php
@@ -17,6 +17,7 @@ declare(strict_types=1);
namespace TYPO3\CMS\Form\Hooks;
+use TYPO3\CMS\Backend\View\PageLayoutView;
use TYPO3\CMS\Backend\View\PageLayoutViewDrawItemHookInterface;
use TYPO3\CMS\Core\Error\Exception;
use TYPO3\CMS\Core\Localization\LanguageService;
@@ -54,7 +55,7 @@ class FormPagePreviewRenderer implements PageLayoutViewDrawItemHookInterface
* @param array $row Record row of tt_content
*/
public function preProcess(
- \TYPO3\CMS\Backend\View\PageLayoutView &$parentObject,
+ PageLayoutView &$parentObject,
&$drawItem,
&$headerContent,
&$itemContent,
diff --git a/typo3/sysext/form/Classes/Mvc/Configuration/ConfigurationManager.php b/typo3/sysext/form/Classes/Mvc/Configuration/ConfigurationManager.php
index ddffbf8d57417e95c690556d9fa34a03a6a4833a..f25416e6bd6fe58185349fd8ddf1e42cf3676f9a 100644
--- a/typo3/sysext/form/Classes/Mvc/Configuration/ConfigurationManager.php
+++ b/typo3/sysext/form/Classes/Mvc/Configuration/ConfigurationManager.php
@@ -47,7 +47,7 @@ class ConfigurationManager extends ExtbaseConfigurationManager implements Config
* @param \TYPO3\CMS\Form\Mvc\Configuration\YamlSource $yamlSource
* @internal
*/
- public function injectYamlSource(\TYPO3\CMS\Form\Mvc\Configuration\YamlSource $yamlSource)
+ public function injectYamlSource(YamlSource $yamlSource)
{
$this->yamlSource = $yamlSource;
}
diff --git a/typo3/sysext/form/Classes/Mvc/Persistence/FormPersistenceManager.php b/typo3/sysext/form/Classes/Mvc/Persistence/FormPersistenceManager.php
index 6b5206d3f892aee30c29150308f3b05e170084f2..090441635612b85104c9f3a28028f4cdcfa79cef 100644
--- a/typo3/sysext/form/Classes/Mvc/Persistence/FormPersistenceManager.php
+++ b/typo3/sysext/form/Classes/Mvc/Persistence/FormPersistenceManager.php
@@ -30,6 +30,7 @@ use TYPO3\CMS\Core\Resource\Filter\FileExtensionFilter;
use TYPO3\CMS\Core\Resource\Folder;
use TYPO3\CMS\Core\Resource\ResourceFactory;
use TYPO3\CMS\Core\Resource\ResourceStorage;
+use TYPO3\CMS\Core\Resource\StorageRepository;
use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Core\Utility\PathUtility;
use TYPO3\CMS\Core\Utility\StringUtility;
@@ -37,6 +38,7 @@ use TYPO3\CMS\Extbase\Object\ObjectManager;
use TYPO3\CMS\Form\Mvc\Configuration\ConfigurationManagerInterface;
use TYPO3\CMS\Form\Mvc\Configuration\Exception\FileWriteException;
use TYPO3\CMS\Form\Mvc\Configuration\Exception\NoSuchFileException;
+use TYPO3\CMS\Form\Mvc\Configuration\YamlSource;
use TYPO3\CMS\Form\Mvc\Persistence\Exception\NoUniqueIdentifierException;
use TYPO3\CMS\Form\Mvc\Persistence\Exception\NoUniquePersistenceIdentifierException;
use TYPO3\CMS\Form\Mvc\Persistence\Exception\PersistenceManagerException;
@@ -85,7 +87,7 @@ class FormPersistenceManager implements FormPersistenceManagerInterface
* @param \TYPO3\CMS\Form\Mvc\Configuration\YamlSource $yamlSource
* @internal
*/
- public function injectYamlSource(\TYPO3\CMS\Form\Mvc\Configuration\YamlSource $yamlSource)
+ public function injectYamlSource(YamlSource $yamlSource)
{
$this->yamlSource = $yamlSource;
}
@@ -94,7 +96,7 @@ class FormPersistenceManager implements FormPersistenceManagerInterface
* @param \TYPO3\CMS\Core\Resource\StorageRepository $storageRepository
* @internal
*/
- public function injectStorageRepository(\TYPO3\CMS\Core\Resource\StorageRepository $storageRepository)
+ public function injectStorageRepository(StorageRepository $storageRepository)
{
$this->storageRepository = $storageRepository;
}
@@ -102,7 +104,7 @@ class FormPersistenceManager implements FormPersistenceManagerInterface
/**
* @param \TYPO3\CMS\Form\Slot\FilePersistenceSlot $filePersistenceSlot
*/
- public function injectFilePersistenceSlot(\TYPO3\CMS\Form\Slot\FilePersistenceSlot $filePersistenceSlot)
+ public function injectFilePersistenceSlot(FilePersistenceSlot $filePersistenceSlot)
{
$this->filePersistenceSlot = $filePersistenceSlot;
}
@@ -110,7 +112,7 @@ class FormPersistenceManager implements FormPersistenceManagerInterface
/**
* @param \TYPO3\CMS\Core\Resource\ResourceFactory $resourceFactory
*/
- public function injectResourceFactory(\TYPO3\CMS\Core\Resource\ResourceFactory $resourceFactory)
+ public function injectResourceFactory(ResourceFactory $resourceFactory)
{
$this->resourceFactory = $resourceFactory;
}
diff --git a/typo3/sysext/form/Classes/Mvc/ProcessingRule.php b/typo3/sysext/form/Classes/Mvc/ProcessingRule.php
index 14c257345435bbd8a59fb4be6c50f894db44f6e8..cb339bcd60cf323971c8b09ee7eee46b2ee5badb 100644
--- a/typo3/sysext/form/Classes/Mvc/ProcessingRule.php
+++ b/typo3/sysext/form/Classes/Mvc/ProcessingRule.php
@@ -20,7 +20,9 @@ namespace TYPO3\CMS\Form\Mvc;
use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Extbase\Error\Result;
use TYPO3\CMS\Extbase\Object\ObjectManager;
+use TYPO3\CMS\Extbase\Property\PropertyMapper;
use TYPO3\CMS\Extbase\Property\PropertyMappingConfiguration;
+use TYPO3\CMS\Extbase\Validation\Validator\ConjunctionValidator;
use TYPO3\CMS\Extbase\Validation\Validator\ValidatorInterface;
/**
@@ -64,7 +66,7 @@ class ProcessingRule
* @param \TYPO3\CMS\Extbase\Property\PropertyMappingConfiguration $propertyMappingConfiguration
* @internal
*/
- public function injectPropertyMappingConfiguration(\TYPO3\CMS\Extbase\Property\PropertyMappingConfiguration $propertyMappingConfiguration)
+ public function injectPropertyMappingConfiguration(PropertyMappingConfiguration $propertyMappingConfiguration)
{
$this->propertyMappingConfiguration = $propertyMappingConfiguration;
}
@@ -73,7 +75,7 @@ class ProcessingRule
* @param \TYPO3\CMS\Extbase\Validation\Validator\ConjunctionValidator $validator
* @internal
*/
- public function injectConjunctionValidator(\TYPO3\CMS\Extbase\Validation\Validator\ConjunctionValidator $validator)
+ public function injectConjunctionValidator(ConjunctionValidator $validator)
{
$this->validator = $validator;
}
@@ -82,7 +84,7 @@ class ProcessingRule
* @param \TYPO3\CMS\Extbase\Property\PropertyMapper $propertyMapper
* @internal
*/
- public function injectPropertyMapper(\TYPO3\CMS\Extbase\Property\PropertyMapper $propertyMapper)
+ public function injectPropertyMapper(PropertyMapper $propertyMapper)
{
$this->propertyMapper = $propertyMapper;
}
diff --git a/typo3/sysext/form/Classes/Mvc/Property/TypeConverter/UploadedFileReferenceConverter.php b/typo3/sysext/form/Classes/Mvc/Property/TypeConverter/UploadedFileReferenceConverter.php
index 2471c83d1629a5e4993614dba7b7ebddff738201..33cb6e37edf264d67c9753365307b62a56e20f0b 100644
--- a/typo3/sysext/form/Classes/Mvc/Property/TypeConverter/UploadedFileReferenceConverter.php
+++ b/typo3/sysext/form/Classes/Mvc/Property/TypeConverter/UploadedFileReferenceConverter.php
@@ -20,13 +20,16 @@ namespace TYPO3\CMS\Form\Mvc\Property\TypeConverter;
use TYPO3\CMS\Core\Log\LogManager;
use TYPO3\CMS\Core\Resource\File as File;
use TYPO3\CMS\Core\Resource\FileReference as CoreFileReference;
+use TYPO3\CMS\Core\Resource\ResourceFactory;
use TYPO3\CMS\Core\Resource\Security\FileNameValidator;
use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Extbase\Domain\Model\AbstractFileFolder;
use TYPO3\CMS\Extbase\Domain\Model\FileReference as ExtbaseFileReference;
use TYPO3\CMS\Extbase\Error\Error;
+use TYPO3\CMS\Extbase\Persistence\PersistenceManagerInterface;
use TYPO3\CMS\Extbase\Property\PropertyMappingConfigurationInterface;
use TYPO3\CMS\Extbase\Property\TypeConverter\AbstractTypeConverter;
+use TYPO3\CMS\Extbase\Security\Cryptography\HashService;
use TYPO3\CMS\Extbase\Validation\Validator\AbstractValidator;
use TYPO3\CMS\Form\Mvc\Property\Exception\TypeConverterException;
use TYPO3\CMS\Form\Service\TranslationService;
@@ -108,7 +111,7 @@ class UploadedFileReferenceConverter extends AbstractTypeConverter
* @param \TYPO3\CMS\Core\Resource\ResourceFactory $resourceFactory
* @internal
*/
- public function injectResourceFactory(\TYPO3\CMS\Core\Resource\ResourceFactory $resourceFactory)
+ public function injectResourceFactory(ResourceFactory $resourceFactory)
{
$this->resourceFactory = $resourceFactory;
}
@@ -117,7 +120,7 @@ class UploadedFileReferenceConverter extends AbstractTypeConverter
* @param \TYPO3\CMS\Extbase\Security\Cryptography\HashService $hashService
* @internal
*/
- public function injectHashService(\TYPO3\CMS\Extbase\Security\Cryptography\HashService $hashService)
+ public function injectHashService(HashService $hashService)
{
$this->hashService = $hashService;
}
@@ -126,7 +129,7 @@ class UploadedFileReferenceConverter extends AbstractTypeConverter
* @param \TYPO3\CMS\Extbase\Persistence\PersistenceManagerInterface $persistenceManager
* @internal
*/
- public function injectPersistenceManager(\TYPO3\CMS\Extbase\Persistence\PersistenceManagerInterface $persistenceManager)
+ public function injectPersistenceManager(PersistenceManagerInterface $persistenceManager)
{
$this->persistenceManager = $persistenceManager;
}
diff --git a/typo3/sysext/form/Classes/ViewHelpers/Form/DatePickerViewHelper.php b/typo3/sysext/form/Classes/ViewHelpers/Form/DatePickerViewHelper.php
index 0a00b7ec008ecc15b6ef0160e6c1e34ebc61e2ff..1faf052484ecb3a966020abc4e09d90b58e24e51 100644
--- a/typo3/sysext/form/Classes/ViewHelpers/Form/DatePickerViewHelper.php
+++ b/typo3/sysext/form/Classes/ViewHelpers/Form/DatePickerViewHelper.php
@@ -23,6 +23,7 @@ namespace TYPO3\CMS\Form\ViewHelpers\Form;
use TYPO3\CMS\Core\Page\PageRenderer;
use TYPO3\CMS\Core\Utility\GeneralUtility;
+use TYPO3\CMS\Extbase\Property\PropertyMapper;
use TYPO3\CMS\Fluid\ViewHelpers\Form\AbstractFormFieldViewHelper;
use TYPO3\CMS\Form\Domain\Runtime\FormRuntime;
use TYPO3\CMS\Form\ViewHelpers\RenderRenderableViewHelper;
@@ -51,7 +52,7 @@ class DatePickerViewHelper extends AbstractFormFieldViewHelper
* @param \TYPO3\CMS\Extbase\Property\PropertyMapper $propertyMapper
* @internal
*/
- public function injectPropertyMapper(\TYPO3\CMS\Extbase\Property\PropertyMapper $propertyMapper)
+ public function injectPropertyMapper(PropertyMapper $propertyMapper)
{
$this->propertyMapper = $propertyMapper;
}
diff --git a/typo3/sysext/form/Classes/ViewHelpers/Form/TimePickerViewHelper.php b/typo3/sysext/form/Classes/ViewHelpers/Form/TimePickerViewHelper.php
index 6b72eb1e85512f6b855ae6ccdddb85c6b8e6494a..ec7151ae6321a3608c0c907c0e86b01b3c47cb98 100644
--- a/typo3/sysext/form/Classes/ViewHelpers/Form/TimePickerViewHelper.php
+++ b/typo3/sysext/form/Classes/ViewHelpers/Form/TimePickerViewHelper.php
@@ -21,6 +21,7 @@ declare(strict_types=1);
namespace TYPO3\CMS\Form\ViewHelpers\Form;
+use TYPO3\CMS\Extbase\Property\PropertyMapper;
use TYPO3\CMS\Fluid\ViewHelpers\Form\AbstractFormFieldViewHelper;
use TYPO3\CMS\Form\Domain\Runtime\FormRuntime;
use TYPO3\CMS\Form\ViewHelpers\RenderRenderableViewHelper;
@@ -47,7 +48,7 @@ class TimePickerViewHelper extends AbstractFormFieldViewHelper
* @param \TYPO3\CMS\Extbase\Property\PropertyMapper $propertyMapper
* @internal
*/
- public function injectPropertyMapper(\TYPO3\CMS\Extbase\Property\PropertyMapper $propertyMapper)
+ public function injectPropertyMapper(PropertyMapper $propertyMapper)
{
$this->propertyMapper = $propertyMapper;
}
diff --git a/typo3/sysext/form/Classes/ViewHelpers/Form/UploadedResourceViewHelper.php b/typo3/sysext/form/Classes/ViewHelpers/Form/UploadedResourceViewHelper.php
index c773311e4700bd744306ee678bdac29ee9bf9b70..9761112bda5983f0957db671a82cbc677603f265 100644
--- a/typo3/sysext/form/Classes/ViewHelpers/Form/UploadedResourceViewHelper.php
+++ b/typo3/sysext/form/Classes/ViewHelpers/Form/UploadedResourceViewHelper.php
@@ -18,6 +18,7 @@ declare(strict_types=1);
namespace TYPO3\CMS\Form\ViewHelpers\Form;
use TYPO3\CMS\Extbase\Domain\Model\FileReference;
+use TYPO3\CMS\Extbase\Property\PropertyMapper;
use TYPO3\CMS\Extbase\Security\Cryptography\HashService;
use TYPO3\CMS\Fluid\ViewHelpers\Form\UploadViewHelper;
@@ -46,7 +47,7 @@ class UploadedResourceViewHelper extends UploadViewHelper
* @param HashService $hashService
* @internal
*/
- public function injectHashService(\TYPO3\CMS\Extbase\Security\Cryptography\HashService $hashService)
+ public function injectHashService(HashService $hashService)
{
$this->hashService = $hashService;
}
@@ -55,7 +56,7 @@ class UploadedResourceViewHelper extends UploadViewHelper
* @param \TYPO3\CMS\Extbase\Property\PropertyMapper $propertyMapper
* @internal
*/
- public function injectPropertyMapper(\TYPO3\CMS\Extbase\Property\PropertyMapper $propertyMapper)
+ public function injectPropertyMapper(PropertyMapper $propertyMapper)
{
$this->propertyMapper = $propertyMapper;
}
diff --git a/typo3/sysext/form/Classes/ViewHelpers/RenderViewHelper.php b/typo3/sysext/form/Classes/ViewHelpers/RenderViewHelper.php
index ba99b7a574bec79661e146090237453f658fcd5b..dee1dc3c4caa320f0ee2f89fa9fe597200a763c3 100644
--- a/typo3/sysext/form/Classes/ViewHelpers/RenderViewHelper.php
+++ b/typo3/sysext/form/Classes/ViewHelpers/RenderViewHelper.php
@@ -23,6 +23,7 @@ namespace TYPO3\CMS\Form\ViewHelpers;
use TYPO3\CMS\Core\Utility\ArrayUtility;
use TYPO3\CMS\Core\Utility\GeneralUtility;
+use TYPO3\CMS\Extbase\Mvc\Exception\StopActionException;
use TYPO3\CMS\Extbase\Mvc\Web\Response;
use TYPO3\CMS\Extbase\Object\ObjectManager;
use TYPO3\CMS\Form\Domain\Factory\ArrayFormFactory;
@@ -108,7 +109,7 @@ class RenderViewHelper extends AbstractViewHelper
if ($renderingContext->getControllerContext()->getResponse() === null) {
try {
return $form->render();
- } catch (\TYPO3\CMS\Extbase\Mvc\Exception\StopActionException $exception) {
+ } catch (StopActionException $exception) {
return $response->shutdown();
}
}
diff --git a/typo3/sysext/impexp/Classes/Command/ImportCommand.php b/typo3/sysext/impexp/Classes/Command/ImportCommand.php
index 394b2940ac69dab60b09ba5707b8a794e652d3fe..742f9b1e8da12351e71520ad387b29c1c7340f02 100644
--- a/typo3/sysext/impexp/Classes/Command/ImportCommand.php
+++ b/typo3/sysext/impexp/Classes/Command/ImportCommand.php
@@ -23,6 +23,10 @@ use Symfony\Component\Console\Output\OutputInterface;
use Symfony\Component\Console\Style\SymfonyStyle;
use TYPO3\CMS\Core\Core\Bootstrap;
use TYPO3\CMS\Core\Utility\GeneralUtility;
+use TYPO3\CMS\Impexp\Command\Exception\ImportFailedException;
+use TYPO3\CMS\Impexp\Command\Exception\InvalidFileException;
+use TYPO3\CMS\Impexp\Command\Exception\LoadingFileFailedException;
+use TYPO3\CMS\Impexp\Command\Exception\PrerequisitesNotMetException;
use TYPO3\CMS\Impexp\Import;
/**
@@ -81,7 +85,7 @@ class ImportCommand extends Command
$fileName = $input->getArgument('file');
$fileName = GeneralUtility::getFileAbsFileName($fileName);
if (empty($fileName) || !file_exists($fileName)) {
- throw new Exception\InvalidFileException('The given filename "' . ($fileName ?? $input->getArgument('file')) . '" could not be found', 1484483040);
+ throw new InvalidFileException('The given filename "' . ($fileName ?? $input->getArgument('file')) . '" could not be found', 1484483040);
}
$io = new SymfonyStyle($input, $output);
@@ -103,19 +107,19 @@ class ImportCommand extends Command
if (!$import->loadFile($fileName, true)) {
$io->error($import->errorLog);
- throw new Exception\LoadingFileFailedException('Loading of the import file failed.', 1484484619);
+ throw new LoadingFileFailedException('Loading of the import file failed.', 1484484619);
}
$messages = $import->checkImportPrerequisites();
if (!empty($messages)) {
$io->error($messages);
- throw new Exception\PrerequisitesNotMetException('Prerequisites for file import are not met.', 1484484612);
+ throw new PrerequisitesNotMetException('Prerequisites for file import are not met.', 1484484612);
}
$import->importData($pageId);
if (!empty($import->errorLog)) {
$io->error($import->errorLog);
- throw new Exception\ImportFailedException('The import has failed.', 1484484613);
+ throw new ImportFailedException('The import has failed.', 1484484613);
}
$io->success('Imported ' . $input->getArgument('file') . ' to page ' . $pageId . ' successfully');
diff --git a/typo3/sysext/impexp/Classes/Import.php b/typo3/sysext/impexp/Classes/Import.php
index 74636548d5bd768d2231675fbc412077158a803f..47a9ad55abc45c65614cd5cd891b6a3763529a0d 100644
--- a/typo3/sysext/impexp/Classes/Import.php
+++ b/typo3/sysext/impexp/Classes/Import.php
@@ -971,7 +971,6 @@ class Import extends ImportExport
/***************************
* Import / Relations setting
***************************/
-
/**
* At the end of the import process all file and DB relations should be set properly (that is relations
* to imported records are all re-created so imported records are correctly related again)
diff --git a/typo3/sysext/indexed_search/Classes/Controller/AdministrationController.php b/typo3/sysext/indexed_search/Classes/Controller/AdministrationController.php
index 170310a2584e375adb7cdb6a7cabf5256688c1a0..491567aad22733f5ee09ba9fffe4bd6b3ba8bb77 100644
--- a/typo3/sysext/indexed_search/Classes/Controller/AdministrationController.php
+++ b/typo3/sysext/indexed_search/Classes/Controller/AdministrationController.php
@@ -26,6 +26,8 @@ use TYPO3\CMS\Core\Type\Bitmask\Permission;
use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Extbase\Mvc\Controller\ActionController;
use TYPO3\CMS\Extbase\Mvc\Request;
+use TYPO3\CMS\Extbase\Mvc\RequestInterface;
+use TYPO3\CMS\Extbase\Mvc\ResponseInterface;
use TYPO3\CMS\Extbase\Mvc\View\ViewInterface;
use TYPO3\CMS\Extbase\Mvc\Web\Routing\UriBuilder;
use TYPO3\CMS\IndexedSearch\Domain\Repository\AdministrationRepository;
@@ -169,7 +171,7 @@ class AdministrationController extends ActionController
* @param \TYPO3\CMS\Extbase\Mvc\ResponseInterface $response
* @throws \TYPO3\CMS\Extbase\Mvc\Exception\UnsupportedRequestTypeException
*/
- public function processRequest(\TYPO3\CMS\Extbase\Mvc\RequestInterface $request, \TYPO3\CMS\Extbase\Mvc\ResponseInterface $response)
+ public function processRequest(RequestInterface $request, ResponseInterface $response)
{
$vars = GeneralUtility::_GET('tx_indexedsearch_web_indexedsearchisearch');
diff --git a/typo3/sysext/indexed_search/Classes/Controller/SearchController.php b/typo3/sysext/indexed_search/Classes/Controller/SearchController.php
index 7ac1a71f8ba53d53b22ff0aaa8c9c9c35639118d..576932f58ebe9f52b35a11daa78f3019a8415a4e 100644
--- a/typo3/sysext/indexed_search/Classes/Controller/SearchController.php
+++ b/typo3/sysext/indexed_search/Classes/Controller/SearchController.php
@@ -33,7 +33,11 @@ use TYPO3\CMS\Core\Utility\MathUtility;
use TYPO3\CMS\Core\Utility\PathUtility;
use TYPO3\CMS\Core\Utility\RootlineUtility;
use TYPO3\CMS\Extbase\Annotation as Extbase;
+use TYPO3\CMS\Extbase\Mvc\Controller\ActionController;
use TYPO3\CMS\Extbase\Utility\LocalizationUtility;
+use TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer;
+use TYPO3\CMS\IndexedSearch\Domain\Repository\IndexSearchRepository;
+use TYPO3\CMS\IndexedSearch\Lexer;
use TYPO3\CMS\IndexedSearch\Utility\IndexedSearchUtility;
/**
@@ -43,7 +47,7 @@ use TYPO3\CMS\IndexedSearch\Utility\IndexedSearchUtility;
* for this to make sense.
* @internal This class is a specific controller implementation and is not considered part of the Public TYPO3 API.
*/
-class SearchController extends \TYPO3\CMS\Extbase\Mvc\Controller\ActionController
+class SearchController extends ActionController
{
/**
* previously known as $this->piVars['sword']
@@ -167,7 +171,7 @@ class SearchController extends \TYPO3\CMS\Extbase\Mvc\Controller\ActionControlle
/**
* @param \TYPO3\CMS\Core\TypoScript\TypoScriptService $typoScriptService
*/
- public function injectTypoScriptService(\TYPO3\CMS\Core\TypoScript\TypoScriptService $typoScriptService)
+ public function injectTypoScriptService(TypoScriptService $typoScriptService)
{
$this->typoScriptService = $typoScriptService;
}
@@ -242,7 +246,7 @@ class SearchController extends \TYPO3\CMS\Extbase\Mvc\Controller\ActionControlle
if ($this->settings['rootPidList']) {
$this->searchRootPageIdList = implode(',', GeneralUtility::intExplode(',', $this->settings['rootPidList']));
}
- $this->searchRepository = GeneralUtility::makeInstance(\TYPO3\CMS\IndexedSearch\Domain\Repository\IndexSearchRepository::class);
+ $this->searchRepository = GeneralUtility::makeInstance(IndexSearchRepository::class);
$this->searchRepository->initialize($this->settings, $searchData, $this->externalParsers, $this->searchRootPageIdList);
$this->searchData = $searchData;
// Calling hook for modification of initialized content
@@ -660,7 +664,7 @@ class SearchController extends \TYPO3\CMS\Extbase\Mvc\Controller\ActionControlle
// If TypoScript is used to render the flag:
if (is_array($this->settings['flagRendering'])) {
/** @var \TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer $cObj */
- $cObj = GeneralUtility::makeInstance(\TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer::class);
+ $cObj = GeneralUtility::makeInstance(ContentObjectRenderer::class);
$cObj->setCurrentVal($row['sys_language_uid']);
$typoScriptArray = $this->typoScriptService->convertPlainArrayToTypoScriptArray($this->settings['flagRendering']);
$output = $cObj->cObjGetSingle($this->settings['flagRendering']['_typoScriptNodeValue'], $typoScriptArray);
@@ -689,7 +693,7 @@ class SearchController extends \TYPO3\CMS\Extbase\Mvc\Controller\ActionControlle
// If TypoScript is used to render the icon:
if (is_array($this->settings['iconRendering'])) {
/** @var \TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer $cObj */
- $cObj = GeneralUtility::makeInstance(\TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer::class);
+ $cObj = GeneralUtility::makeInstance(ContentObjectRenderer::class);
$cObj->setCurrentVal($imageType);
$typoScriptArray = $this->typoScriptService->convertPlainArrayToTypoScriptArray($this->settings['iconRendering']);
$this->iconFileNameCache[$imageType] = $cObj->cObjGetSingle($this->settings['iconRendering']['_typoScriptNodeValue'], $typoScriptArray);
@@ -950,7 +954,7 @@ class SearchController extends \TYPO3\CMS\Extbase\Mvc\Controller\ActionControlle
[mb_strtolower(LocalizationUtility::translate('localizedOperandOr', 'IndexedSearch'), 'utf-8'), 'OR'],
[mb_strtolower(LocalizationUtility::translate('localizedOperandNot', 'IndexedSearch'), 'utf-8'), 'AND NOT']
];
- $swordArray = \TYPO3\CMS\IndexedSearch\Utility\IndexedSearchUtility::getExplodedSearchString($searchWords, $defaultOperator == 1 ? 'OR' : 'AND', $operatorTranslateTable);
+ $swordArray = IndexedSearchUtility::getExplodedSearchString($searchWords, $defaultOperator == 1 ? 'OR' : 'AND', $operatorTranslateTable);
if (is_array($swordArray)) {
$sWordArray = $this->procSearchWordsByLexer($swordArray);
}
@@ -970,7 +974,7 @@ class SearchController extends \TYPO3\CMS\Extbase\Mvc\Controller\ActionControlle
{
$newSearchWords = [];
// Init lexer (used to post-processing of search words)
- $lexerObjectClassName = $GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['indexed_search']['lexer'] ?: \TYPO3\CMS\IndexedSearch\Lexer::class;
+ $lexerObjectClassName = $GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['indexed_search']['lexer'] ?: Lexer::class;
$this->lexerObj = GeneralUtility::makeInstance($lexerObjectClassName);
// Traverse the search word array
foreach ($searchWords as $wordDef) {
diff --git a/typo3/sysext/indexed_search/Classes/Domain/Repository/IndexSearchRepository.php b/typo3/sysext/indexed_search/Classes/Domain/Repository/IndexSearchRepository.php
index 6c8c4df39310589c7449d7365ce7e25c6693ab7c..9e88d418e79d85f7818a82346bae0be3f56783af 100644
--- a/typo3/sysext/indexed_search/Classes/Domain/Repository/IndexSearchRepository.php
+++ b/typo3/sysext/indexed_search/Classes/Domain/Repository/IndexSearchRepository.php
@@ -25,8 +25,11 @@ use TYPO3\CMS\Core\Database\Query\Restriction\FrontendRestrictionContainer;
use TYPO3\CMS\Core\TimeTracker\TimeTracker;
use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Core\Utility\MathUtility;
+use TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer;
use TYPO3\CMS\IndexedSearch\Indexer;
use TYPO3\CMS\IndexedSearch\Utility;
+use TYPO3\CMS\IndexedSearch\Utility\IndexedSearchUtility;
+use TYPO3\CMS\IndexedSearch\Utility\LikeWildcard;
/**
* Index search abstraction to search through the index
@@ -500,7 +503,7 @@ class IndexSearchRepository
$idList = [];
foreach ($searchRootPageIdList as $rootId) {
/** @var \TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer $cObj */
- $cObj = GeneralUtility::makeInstance(\TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer::class);
+ $cObj = GeneralUtility::makeInstance(ContentObjectRenderer::class);
$idList[] = $cObj->getTreeList(-1 * $rootId, 9999);
}
$idList = GeneralUtility::intExplode(',', implode(',', $idList));
@@ -598,15 +601,15 @@ class IndexSearchRepository
switch ($theType) {
case '1':
// Part of word
- $res = $this->searchWord($sWord, Utility\LikeWildcard::BOTH);
+ $res = $this->searchWord($sWord, LikeWildcard::BOTH);
break;
case '2':
// First part of word
- $res = $this->searchWord($sWord, Utility\LikeWildcard::RIGHT);
+ $res = $this->searchWord($sWord, LikeWildcard::RIGHT);
break;
case '3':
// Last part of word
- $res = $this->searchWord($sWord, Utility\LikeWildcard::LEFT);
+ $res = $this->searchWord($sWord, LikeWildcard::LEFT);
break;
case '10':
// Sounds like
@@ -701,7 +704,7 @@ class IndexSearchRepository
*/
protected function searchWord($sWord, $wildcard)
{
- $likeWildcard = Utility\LikeWildcard::cast($wildcard);
+ $likeWildcard = LikeWildcard::cast($wildcard);
$wSel = $likeWildcard->getLikeQueryPart(
'index_words',
'IW.baseword',
@@ -736,7 +739,7 @@ class IndexSearchRepository
protected function searchSentence($sWord)
{
$this->wSelClauses[] = '1=1';
- $likeWildcard = Utility\LikeWildcard::cast(Utility\LikeWildcard::BOTH);
+ $likeWildcard = LikeWildcard::cast(LikeWildcard::BOTH);
$likePart = $likeWildcard->getLikeQueryPart(
'index_fulltext',
'IFT.fulltextdata',
@@ -1239,7 +1242,7 @@ class IndexSearchRepository
*/
protected function md5inthash($str)
{
- return Utility\IndexedSearchUtility::md5inthash($str);
+ return IndexedSearchUtility::md5inthash($str);
}
/**
@@ -1252,7 +1255,7 @@ class IndexSearchRepository
*/
protected function isTableUsed($table_list)
{
- return Utility\IndexedSearchUtility::isTableUsed($table_list);
+ return IndexedSearchUtility::isTableUsed($table_list);
}
/**
diff --git a/typo3/sysext/indexed_search/Classes/Hook/CrawlerHook.php b/typo3/sysext/indexed_search/Classes/Hook/CrawlerHook.php
index 839e37286f897fce11e024b0b14a146a27dee8b7..f20fb455d7fc993abc010eb07fd5dbf02b18f26a 100644
--- a/typo3/sysext/indexed_search/Classes/Hook/CrawlerHook.php
+++ b/typo3/sysext/indexed_search/Classes/Hook/CrawlerHook.php
@@ -22,8 +22,10 @@ use TYPO3\CMS\Core\Database\ConnectionPool;
use TYPO3\CMS\Core\Database\Query\Restriction\DeletedRestriction;
use TYPO3\CMS\Core\DataHandling\DataHandler;
use TYPO3\CMS\Core\Exception\Page\RootLineException;
+use TYPO3\CMS\Core\TypoScript\ExtendedTemplateService;
use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Core\Utility\MathUtility;
+use TYPO3\CMS\Core\Utility\PathUtility;
use TYPO3\CMS\Core\Utility\RootlineUtility;
use TYPO3\CMS\IndexedSearch\Indexer;
@@ -345,7 +347,7 @@ class CrawlerHook
$indexerObj->hash['phash'] = -1;
// EXPERIMENT - but to avoid phash_t3 being written to file sections (otherwise they are removed when page is reindexed!!!)
// Index document:
- $indexerObj->indexRegularDocument(\TYPO3\CMS\Core\Utility\PathUtility::stripPathSitePrefix($readpath), true);
+ $indexerObj->indexRegularDocument(PathUtility::stripPathSitePrefix($readpath), true);
} elseif (@is_dir($readpath)) {
// If dir, read content and create new pending items for log:
// Select files and directories in path:
@@ -698,7 +700,7 @@ class CrawlerHook
// Gets the rootLine
$rootLine = GeneralUtility::makeInstance(RootlineUtility::class, $id)->get();
// This generates the constants/config + hierarchy info for the template.
- $tmpl = GeneralUtility::makeInstance(\TYPO3\CMS\Core\TypoScript\ExtendedTemplateService::class);
+ $tmpl = GeneralUtility::makeInstance(ExtendedTemplateService::class);
$tmpl->runThroughTemplates($rootLine);
// Root line uids
foreach ($tmpl->rootLine as $rlkey => $rldat) {
diff --git a/typo3/sysext/indexed_search/Classes/Indexer.php b/typo3/sysext/indexed_search/Classes/Indexer.php
index dc08f9decaaa6399f0a426e3018b471dbffcfa03..e7ff582adb395eeb81dfd531045277c03c8e19c7 100644
--- a/typo3/sysext/indexed_search/Classes/Indexer.php
+++ b/typo3/sysext/indexed_search/Classes/Indexer.php
@@ -19,12 +19,15 @@ use TYPO3\CMS\Core\Configuration\ExtensionConfiguration;
use TYPO3\CMS\Core\Core\Environment;
use TYPO3\CMS\Core\Database\Connection;
use TYPO3\CMS\Core\Database\ConnectionPool;
+use TYPO3\CMS\Core\Html\HtmlParser;
use TYPO3\CMS\Core\Http\RequestFactory;
use TYPO3\CMS\Core\TimeTracker\TimeTracker;
+use TYPO3\CMS\Core\Utility\ExtensionManagementUtility;
use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Core\Utility\MathUtility;
use TYPO3\CMS\Core\Utility\PathUtility;
use TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController;
+use TYPO3\CMS\IndexedSearch\Hook\CrawlerFilesHook;
use TYPO3\CMS\IndexedSearch\Utility\IndexedSearchUtility;
/**
@@ -531,7 +534,7 @@ class Indexer
$crawler = null;
// Get links:
$list = $this->extractHyperLinks($content);
- if ($this->indexerConfig['useCrawlerForExternalFiles'] && \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::isLoaded('crawler')) {
+ if ($this->indexerConfig['useCrawlerForExternalFiles'] && ExtensionManagementUtility::isLoaded('crawler')) {
/**
* todo: remove dependency to class tx_crawler_lib
* @link https://forge.typo3.org/issues/83603
@@ -579,7 +582,7 @@ class Indexer
'conf' => $this->conf
];
unset($params['conf']['content']);
- $crawler->addQueueEntry_callBack(0, $params, Hook\CrawlerFilesHook::class, $this->conf['id']);
+ $crawler->addQueueEntry_callBack(0, $params, CrawlerFilesHook::class, $this->conf['id']);
$this->log_setTSlogMessage('media "' . $params['document'] . '" added to "crawler" queue.', 1);
} else {
$this->indexRegularDocument($linkInfo['href'], false, $linkSource, $ext);
@@ -591,7 +594,7 @@ class Indexer
'conf' => $this->conf
];
unset($params['conf']['content']);
- $crawler->addQueueEntry_callBack(0, $params, Hook\CrawlerFilesHook::class, $this->conf['id']);
+ $crawler->addQueueEntry_callBack(0, $params, CrawlerFilesHook::class, $this->conf['id']);
$this->log_setTSlogMessage('media "' . $params['document'] . '" added to "crawler" queue.', 1);
} else {
$this->indexRegularDocument($linkSource);
@@ -611,7 +614,7 @@ class Indexer
*/
public function extractHyperLinks($html)
{
- $htmlParser = GeneralUtility::makeInstance(\TYPO3\CMS\Core\Html\HtmlParser::class);
+ $htmlParser = GeneralUtility::makeInstance(HtmlParser::class);
$htmlParts = $htmlParser->splitTags('a', $html);
$hyperLinksData = [];
foreach ($htmlParts as $index => $tagData) {
@@ -641,7 +644,7 @@ class Indexer
public function extractBaseHref($html)
{
$href = '';
- $htmlParser = GeneralUtility::makeInstance(\TYPO3\CMS\Core\Html\HtmlParser::class);
+ $htmlParser = GeneralUtility::makeInstance(HtmlParser::class);
$htmlParts = $htmlParser->splitTags('base', $html);
foreach ($htmlParts as $index => $tagData) {
if ($index % 2 !== 0) {
diff --git a/typo3/sysext/indexed_search/Classes/Utility/IndexedSearchUtility.php b/typo3/sysext/indexed_search/Classes/Utility/IndexedSearchUtility.php
index ea5f3cb5ddad2e4ab9a172d8ddda146937405875..b28888c90450050e2b60991d0a7e2655e056aae9 100644
--- a/typo3/sysext/indexed_search/Classes/Utility/IndexedSearchUtility.php
+++ b/typo3/sysext/indexed_search/Classes/Utility/IndexedSearchUtility.php
@@ -15,6 +15,8 @@
namespace TYPO3\CMS\IndexedSearch\Utility;
+use TYPO3\CMS\Core\Utility\GeneralUtility;
+
/**
* Class with common methods used across various classes in the indexed search.
* Implementation is provided by various people from the TYPO3 community.
@@ -33,7 +35,7 @@ class IndexedSearchUtility
public static function isTableUsed($tableName)
{
$tableList = $GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['indexed_search']['use_tables'];
- return \TYPO3\CMS\Core\Utility\GeneralUtility::inList($tableList, $tableName);
+ return GeneralUtility::inList($tableList, $tableName);
}
/**
diff --git a/typo3/sysext/indexed_search/Tests/Unit/IndexerTest.php b/typo3/sysext/indexed_search/Tests/Unit/IndexerTest.php
index 9a5d911fd8b74615ec0deed2e0bf3d96d5ce9d79..8ba4e18c9f740d4660308f95d74354545bdd8e5f 100644
--- a/typo3/sysext/indexed_search/Tests/Unit/IndexerTest.php
+++ b/typo3/sysext/indexed_search/Tests/Unit/IndexerTest.php
@@ -18,6 +18,7 @@ declare(strict_types=1);
namespace TYPO3\CMS\IndexedSearch\Tests\Unit;
use TYPO3\CMS\Core\Core\Environment;
+use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Core\Utility\StringUtility;
use TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController;
use TYPO3\CMS\IndexedSearch\Indexer;
@@ -50,7 +51,7 @@ class IndexerTest extends UnitTestCase
*/
public function extractHyperLinksReturnsCorrectPathWithBaseUrl()
{
- $baseURL = \TYPO3\CMS\Core\Utility\GeneralUtility::getIndpEnv('TYPO3_SITE_URL');
+ $baseURL = GeneralUtility::getIndpEnv('TYPO3_SITE_URL');
$html = 'test <a href="' . $baseURL . 'index.php">test</a> test';
$subject = $this->getMockBuilder(Indexer::class)->disableOriginalConstructor()->addMethods(['dummy'])->getMock();
$result = $subject->extractHyperLinks($html);
diff --git a/typo3/sysext/install/Classes/Configuration/Cache/CacheFeature.php b/typo3/sysext/install/Classes/Configuration/Cache/CacheFeature.php
index ce8c3af9b07f0d9fb378cda58786a8d9d55d6db9..86eceeab3e6612f784504cde020f385b8bfa2244 100644
--- a/typo3/sysext/install/Classes/Configuration/Cache/CacheFeature.php
+++ b/typo3/sysext/install/Classes/Configuration/Cache/CacheFeature.php
@@ -15,13 +15,14 @@
namespace TYPO3\CMS\Install\Configuration\Cache;
-use TYPO3\CMS\Install\Configuration;
+use TYPO3\CMS\Install\Configuration\AbstractFeature;
+use TYPO3\CMS\Install\Configuration\FeatureInterface;
/**
* Cache feature sets best practices
* @internal only to be used within EXT:install
*/
-class CacheFeature extends Configuration\AbstractFeature implements Configuration\FeatureInterface
+class CacheFeature extends AbstractFeature implements FeatureInterface
{
/**
* @var string Name of feature
diff --git a/typo3/sysext/install/Classes/Configuration/Cache/CustomCachePreset.php b/typo3/sysext/install/Classes/Configuration/Cache/CustomCachePreset.php
index cdad95bb31fdbd6b2a46edb303eb6fb27fe6306b..90755683024fe15dfebd62b5f0e7fe47e0e87a35 100644
--- a/typo3/sysext/install/Classes/Configuration/Cache/CustomCachePreset.php
+++ b/typo3/sysext/install/Classes/Configuration/Cache/CustomCachePreset.php
@@ -17,12 +17,14 @@ namespace TYPO3\CMS\Install\Configuration\Cache;
use TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend;
use TYPO3\CMS\Install\Configuration;
+use TYPO3\CMS\Install\Configuration\AbstractCustomPreset;
+use TYPO3\CMS\Install\Configuration\CustomPresetInterface;
/**
* Custom preset is a fallback if no other preset fits
* @internal only to be used within EXT:install
*/
-class CustomCachePreset extends Configuration\AbstractCustomPreset implements Configuration\CustomPresetInterface
+class CustomCachePreset extends AbstractCustomPreset implements CustomPresetInterface
{
/**
* @var array Configuration values handled by this preset
diff --git a/typo3/sysext/install/Classes/Configuration/Context/ContextFeature.php b/typo3/sysext/install/Classes/Configuration/Context/ContextFeature.php
index 386d03fdb86d21a05910e3902c701d1fb7648a47..256a7183cda8a55cf0ba334dab4352c43231b4e4 100644
--- a/typo3/sysext/install/Classes/Configuration/Context/ContextFeature.php
+++ b/typo3/sysext/install/Classes/Configuration/Context/ContextFeature.php
@@ -15,13 +15,14 @@
namespace TYPO3\CMS\Install\Configuration\Context;
-use TYPO3\CMS\Install\Configuration;
+use TYPO3\CMS\Install\Configuration\AbstractFeature;
+use TYPO3\CMS\Install\Configuration\FeatureInterface;
/**
* Context feature sets development / production settings
* @internal only to be used within EXT:install
*/
-class ContextFeature extends Configuration\AbstractFeature implements Configuration\FeatureInterface
+class ContextFeature extends AbstractFeature implements FeatureInterface
{
/**
* @var string Name of feature
@@ -32,8 +33,8 @@ class ContextFeature extends Configuration\AbstractFeature implements Configurat
* @var array List of preset classes
*/
protected $presetRegistry = [
- \TYPO3\CMS\Install\Configuration\Context\LivePreset::class,
- \TYPO3\CMS\Install\Configuration\Context\DebugPreset::class,
- \TYPO3\CMS\Install\Configuration\Context\CustomPreset::class,
+ LivePreset::class,
+ DebugPreset::class,
+ CustomPreset::class,
];
}
diff --git a/typo3/sysext/install/Classes/Configuration/Context/CustomPreset.php b/typo3/sysext/install/Classes/Configuration/Context/CustomPreset.php
index 7b2679844b3c694c44e3cd0339427f6626cfd65b..4782d0f5d6d4b260fad5c076ef7d489cb78b1247 100644
--- a/typo3/sysext/install/Classes/Configuration/Context/CustomPreset.php
+++ b/typo3/sysext/install/Classes/Configuration/Context/CustomPreset.php
@@ -16,12 +16,14 @@
namespace TYPO3\CMS\Install\Configuration\Context;
use TYPO3\CMS\Install\Configuration;
+use TYPO3\CMS\Install\Configuration\AbstractCustomPreset;
+use TYPO3\CMS\Install\Configuration\CustomPresetInterface;
/**
* Custom preset is a fallback if no other preset fits
* @internal only to be used within EXT:install
*/
-class CustomPreset extends Configuration\AbstractCustomPreset implements Configuration\CustomPresetInterface
+class CustomPreset extends AbstractCustomPreset implements CustomPresetInterface
{
/**
* @var array Configuration values handled by this preset
diff --git a/typo3/sysext/install/Classes/Configuration/Context/DebugPreset.php b/typo3/sysext/install/Classes/Configuration/Context/DebugPreset.php
index 059b323dc187dc005070b29a392cccbc7c321fb5..c7141cf53a451ea99653dfb65885938b01fb8a1c 100644
--- a/typo3/sysext/install/Classes/Configuration/Context/DebugPreset.php
+++ b/typo3/sysext/install/Classes/Configuration/Context/DebugPreset.php
@@ -17,12 +17,13 @@ namespace TYPO3\CMS\Install\Configuration\Context;
use TYPO3\CMS\Core\Core\Environment;
use TYPO3\CMS\Install\Configuration;
+use TYPO3\CMS\Install\Configuration\AbstractPreset;
/**
* Debug preset
* @internal only to be used within EXT:install
*/
-class DebugPreset extends Configuration\AbstractPreset
+class DebugPreset extends AbstractPreset
{
/**
* @var string Name of preset
diff --git a/typo3/sysext/install/Classes/Configuration/Context/LivePreset.php b/typo3/sysext/install/Classes/Configuration/Context/LivePreset.php
index 0f174ca8d11ead37bd7cf6ec9a165f78c2486d9f..840533f8f8165046ad0afe68991713c9bfc72457 100644
--- a/typo3/sysext/install/Classes/Configuration/Context/LivePreset.php
+++ b/typo3/sysext/install/Classes/Configuration/Context/LivePreset.php
@@ -17,12 +17,13 @@ namespace TYPO3\CMS\Install\Configuration\Context;
use TYPO3\CMS\Core\Core\Environment;
use TYPO3\CMS\Install\Configuration;
+use TYPO3\CMS\Install\Configuration\AbstractPreset;
/**
* Live preset
* @internal only to be used within EXT:install
*/
-class LivePreset extends Configuration\AbstractPreset
+class LivePreset extends AbstractPreset
{
/**
* @var string Name of preset
diff --git a/typo3/sysext/install/Classes/Configuration/Image/AbstractImagePreset.php b/typo3/sysext/install/Classes/Configuration/Image/AbstractImagePreset.php
index 3a8a011af0b8f5948bb9ecc9e75156c3e04872f5..ed7c0e442223d95ecb9efdda9a90fe3164054a79 100644
--- a/typo3/sysext/install/Classes/Configuration/Image/AbstractImagePreset.php
+++ b/typo3/sysext/install/Classes/Configuration/Image/AbstractImagePreset.php
@@ -15,13 +15,15 @@
namespace TYPO3\CMS\Install\Configuration\Image;
+use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Install\Configuration;
+use TYPO3\CMS\Install\Configuration\AbstractPreset;
/**
* Abstract class implements common image preset code
* @internal only to be used within EXT:install
*/
-abstract class AbstractImagePreset extends Configuration\AbstractPreset
+abstract class AbstractImagePreset extends AbstractPreset
{
/**
* @var array Default paths to search for executable, with trailing slash
@@ -152,7 +154,7 @@ abstract class AbstractImagePreset extends Configuration\AbstractPreset
*/
protected function cleanUpPath($path)
{
- $path = \TYPO3\CMS\Core\Utility\GeneralUtility::fixWindowsFilePath($path);
+ $path = GeneralUtility::fixWindowsFilePath($path);
// Add trailing slash if missing
if (!preg_match('/[\\/]$/', $path)) {
$path .= '/';
diff --git a/typo3/sysext/install/Classes/Configuration/Image/CustomPreset.php b/typo3/sysext/install/Classes/Configuration/Image/CustomPreset.php
index 67a5c764eac32081f6a86d2ac85416665f99d30f..6f0b1fa07e456f14da85d512aecbc70560f96197 100644
--- a/typo3/sysext/install/Classes/Configuration/Image/CustomPreset.php
+++ b/typo3/sysext/install/Classes/Configuration/Image/CustomPreset.php
@@ -16,12 +16,14 @@
namespace TYPO3\CMS\Install\Configuration\Image;
use TYPO3\CMS\Install\Configuration;
+use TYPO3\CMS\Install\Configuration\AbstractCustomPreset;
+use TYPO3\CMS\Install\Configuration\CustomPresetInterface;
/**
* Custom preset is a fallback if no other preset fits
* @internal only to be used within EXT:install
*/
-class CustomPreset extends Configuration\AbstractCustomPreset implements Configuration\CustomPresetInterface
+class CustomPreset extends AbstractCustomPreset implements CustomPresetInterface
{
/**
* @var array Configuration values handled by this preset
diff --git a/typo3/sysext/install/Classes/Configuration/Image/GraphicsMagickPreset.php b/typo3/sysext/install/Classes/Configuration/Image/GraphicsMagickPreset.php
index 955c79bb347935c136fd85c1ab884722c9a1e02b..ff40e1817fbb09dc558bf74aba61e491505bbe55 100644
--- a/typo3/sysext/install/Classes/Configuration/Image/GraphicsMagickPreset.php
+++ b/typo3/sysext/install/Classes/Configuration/Image/GraphicsMagickPreset.php
@@ -16,6 +16,7 @@
namespace TYPO3\CMS\Install\Configuration\Image;
use TYPO3\CMS\Core\Core\Environment;
+use TYPO3\CMS\Core\Utility\CommandUtility;
/**
* Preset for GraphicsMagick
@@ -76,7 +77,7 @@ class GraphicsMagickPreset extends AbstractImagePreset
if (@is_file($path . $executable)) {
$command = escapeshellarg($path . $executable) . ' -version';
$executingResult = false;
- \TYPO3\CMS\Core\Utility\CommandUtility::exec($command, $executingResult);
+ CommandUtility::exec($command, $executingResult);
// First line of exec command should contain string GraphicsMagick
$firstResultLine = array_shift($executingResult);
if (strpos($firstResultLine, 'GraphicsMagick') !== false) {
diff --git a/typo3/sysext/install/Classes/Configuration/Image/ImageFeature.php b/typo3/sysext/install/Classes/Configuration/Image/ImageFeature.php
index 3f49e6663d512adb1cb25e5c69865fa7fec6ea90..539c081e0a12c581f38ffdcd21df0a8dfa758a25 100644
--- a/typo3/sysext/install/Classes/Configuration/Image/ImageFeature.php
+++ b/typo3/sysext/install/Classes/Configuration/Image/ImageFeature.php
@@ -15,13 +15,14 @@
namespace TYPO3\CMS\Install\Configuration\Image;
-use TYPO3\CMS\Install\Configuration;
+use TYPO3\CMS\Install\Configuration\AbstractFeature;
+use TYPO3\CMS\Install\Configuration\FeatureInterface;
/**
* Image feature detects imagemagick / graphicsmagick versions
* @internal only to be used within EXT:install
*/
-class ImageFeature extends Configuration\AbstractFeature implements Configuration\FeatureInterface
+class ImageFeature extends AbstractFeature implements FeatureInterface
{
/**
* @var string Name of feature
@@ -32,9 +33,9 @@ class ImageFeature extends Configuration\AbstractFeature implements Configuratio
* @var array List of preset classes
*/
protected $presetRegistry = [
- \TYPO3\CMS\Install\Configuration\Image\GraphicsMagickPreset::class,
- \TYPO3\CMS\Install\Configuration\Image\ImageMagick6Preset::class,
- \TYPO3\CMS\Install\Configuration\Image\CustomPreset::class,
+ GraphicsMagickPreset::class,
+ ImageMagick6Preset::class,
+ CustomPreset::class,
];
/**
diff --git a/typo3/sysext/install/Classes/Configuration/Image/ImageMagick6Preset.php b/typo3/sysext/install/Classes/Configuration/Image/ImageMagick6Preset.php
index ced97ee3f7b2b0022697c61f0d6396223bf20e51..5cbf3203d6ee373673631d71c738f92658cf0673 100644
--- a/typo3/sysext/install/Classes/Configuration/Image/ImageMagick6Preset.php
+++ b/typo3/sysext/install/Classes/Configuration/Image/ImageMagick6Preset.php
@@ -16,6 +16,7 @@
namespace TYPO3\CMS\Install\Configuration\Image;
use TYPO3\CMS\Core\Core\Environment;
+use TYPO3\CMS\Core\Utility\CommandUtility;
/**
* Preset for ImageMagick version 6 or higher
@@ -80,7 +81,7 @@ class ImageMagick6Preset extends AbstractImagePreset
if (@is_file($path . $executable)) {
$command = escapeshellarg($path . $executable) . ' -version';
$executingResult = false;
- \TYPO3\CMS\Core\Utility\CommandUtility::exec($command, $executingResult);
+ CommandUtility::exec($command, $executingResult);
// First line of exec command should contain string GraphicsMagick
$firstResultLine = array_shift($executingResult);
// Example: "Version: ImageMagick 6.6.0-4 2012-05-02 Q16 http://www.imagemagick.org"
diff --git a/typo3/sysext/install/Classes/Configuration/Mail/CustomPreset.php b/typo3/sysext/install/Classes/Configuration/Mail/CustomPreset.php
index cb1bdd2b8a7b36207008ef8bf5141bb493e30d6c..9807541794effb4b7429df6efbc9051be3319767 100644
--- a/typo3/sysext/install/Classes/Configuration/Mail/CustomPreset.php
+++ b/typo3/sysext/install/Classes/Configuration/Mail/CustomPreset.php
@@ -16,12 +16,14 @@
namespace TYPO3\CMS\Install\Configuration\Mail;
use TYPO3\CMS\Install\Configuration;
+use TYPO3\CMS\Install\Configuration\AbstractCustomPreset;
+use TYPO3\CMS\Install\Configuration\CustomPresetInterface;
/**
* Custom preset is a fallback if no other preset fits
* @internal only to be used within EXT:install
*/
-class CustomPreset extends Configuration\AbstractCustomPreset implements Configuration\CustomPresetInterface
+class CustomPreset extends AbstractCustomPreset implements CustomPresetInterface
{
/**
* @var array Configuration values handled by this preset
diff --git a/typo3/sysext/install/Classes/Configuration/Mail/MailFeature.php b/typo3/sysext/install/Classes/Configuration/Mail/MailFeature.php
index 4678cf3fdac0b431e1d8f3dcb189d9a0ac231a8e..56f281a328a8ab93194d13d164a8cef31beaf37b 100644
--- a/typo3/sysext/install/Classes/Configuration/Mail/MailFeature.php
+++ b/typo3/sysext/install/Classes/Configuration/Mail/MailFeature.php
@@ -15,13 +15,14 @@
namespace TYPO3\CMS\Install\Configuration\Mail;
-use TYPO3\CMS\Install\Configuration;
+use TYPO3\CMS\Install\Configuration\AbstractFeature;
+use TYPO3\CMS\Install\Configuration\FeatureInterface;
/**
* Mail feature detects sendmail settings
* @internal only to be used within EXT:install
*/
-class MailFeature extends Configuration\AbstractFeature implements Configuration\FeatureInterface
+class MailFeature extends AbstractFeature implements FeatureInterface
{
/**
* @var string Name of feature
diff --git a/typo3/sysext/install/Classes/Configuration/Mail/SendmailPreset.php b/typo3/sysext/install/Classes/Configuration/Mail/SendmailPreset.php
index 55d63ce41400649ad34401c5e934fcc7897fe60a..d9ec26840a23ac781ccbb7a1069bb777ed8d6119 100644
--- a/typo3/sysext/install/Classes/Configuration/Mail/SendmailPreset.php
+++ b/typo3/sysext/install/Classes/Configuration/Mail/SendmailPreset.php
@@ -16,12 +16,13 @@
namespace TYPO3\CMS\Install\Configuration\Mail;
use TYPO3\CMS\Install\Configuration;
+use TYPO3\CMS\Install\Configuration\AbstractPreset;
/**
* Sendmail path handling preset
* @internal only to be used within EXT:install
*/
-class SendmailPreset extends Configuration\AbstractPreset
+class SendmailPreset extends AbstractPreset
{
/**
* @var string Name of preset
diff --git a/typo3/sysext/install/Classes/Configuration/Mail/SmtpPreset.php b/typo3/sysext/install/Classes/Configuration/Mail/SmtpPreset.php
index a7431e4a7cbb13e3ffd3a2e90bf97314a2f33707..f8b4dcfbe960c4bd4e692ad430d0289651d3da51 100644
--- a/typo3/sysext/install/Classes/Configuration/Mail/SmtpPreset.php
+++ b/typo3/sysext/install/Classes/Configuration/Mail/SmtpPreset.php
@@ -16,12 +16,13 @@
namespace TYPO3\CMS\Install\Configuration\Mail;
use TYPO3\CMS\Install\Configuration;
+use TYPO3\CMS\Install\Configuration\AbstractPreset;
/**
* SMTP settings handling preset
* @internal only to be used within EXT:install
*/
-class SmtpPreset extends Configuration\AbstractPreset
+class SmtpPreset extends AbstractPreset
{
/**
* @var string Name of preset
diff --git a/typo3/sysext/install/Classes/Controller/EnvironmentController.php b/typo3/sysext/install/Classes/Controller/EnvironmentController.php
index 05db0f086499a674dfb43ba39792b95c2c519a66..364228dc80668cd004cb61edc7981f419fac5566 100644
--- a/typo3/sysext/install/Classes/Controller/EnvironmentController.php
+++ b/typo3/sysext/install/Classes/Controller/EnvironmentController.php
@@ -20,6 +20,7 @@ namespace TYPO3\CMS\Install\Controller;
use Psr\Http\Message\ResponseInterface;
use Psr\Http\Message\ServerRequestInterface;
use Symfony\Component\Mime\Address;
+use Symfony\Component\Mime\Exception\RfcComplianceException;
use TYPO3\CMS\Backend\Toolbar\Enumeration\InformationStatus;
use TYPO3\CMS\Core\Core\Environment;
use TYPO3\CMS\Core\Database\ConnectionPool;
@@ -281,7 +282,7 @@ class EnvironmentController extends AbstractController
'Recipient: ' . $recipient,
'Test mail sent'
));
- } catch (\Symfony\Component\Mime\Exception\RfcComplianceException $exception) {
+ } catch (RfcComplianceException $exception) {
$messages->enqueue(new FlashMessage(
'Please verify $GLOBALS[\'TYPO3_CONF_VARS\'][\'MAIL\'][\'defaultMailFromAddress\'] is a valid mail address.'
. ' Error message: ' . $exception->getMessage(),
diff --git a/typo3/sysext/install/Classes/Controller/MaintenanceController.php b/typo3/sysext/install/Classes/Controller/MaintenanceController.php
index e4e73e5c4100a5082cfde65e2c78e949eb06f093..0b733387c8176a7a408a9781ea554b160f74b21a 100644
--- a/typo3/sysext/install/Classes/Controller/MaintenanceController.php
+++ b/typo3/sysext/install/Classes/Controller/MaintenanceController.php
@@ -19,6 +19,7 @@ namespace TYPO3\CMS\Install\Controller;
use Psr\Http\Message\ResponseInterface;
use Psr\Http\Message\ServerRequestInterface;
+use TYPO3\CMS\Core\Cache\CacheManager;
use TYPO3\CMS\Core\Configuration\ConfigurationManager;
use TYPO3\CMS\Core\Core\ClassLoadingInformation;
use TYPO3\CMS\Core\Core\Environment;
@@ -817,7 +818,7 @@ class MaintenanceController extends AbstractController
// cacheManager implements SingletonInterface, so the only way to get a "fresh"
// instance is by circumventing makeInstance and/or the objectManager and
// using new directly!
- $cacheManager = new \TYPO3\CMS\Core\Cache\CacheManager();
+ $cacheManager = new CacheManager();
$cacheManager->setCacheConfigurations($GLOBALS['TYPO3_CONF_VARS']['SYS']['caching']['cacheConfigurations']);
$cacheManager->getCache('l10n')->flush();
diff --git a/typo3/sysext/install/Classes/FolderStructure/AbstractNode.php b/typo3/sysext/install/Classes/FolderStructure/AbstractNode.php
index 3ff93e60efe3da68f58e162bdee0f1fd7ab559a4..a5269d48258c1f7cf3926d8d0398909ff2de5900 100644
--- a/typo3/sysext/install/Classes/FolderStructure/AbstractNode.php
+++ b/typo3/sysext/install/Classes/FolderStructure/AbstractNode.php
@@ -17,6 +17,7 @@ namespace TYPO3\CMS\Install\FolderStructure;
use TYPO3\CMS\Core\Core\Environment;
use TYPO3\CMS\Core\Messaging\FlashMessage;
+use TYPO3\CMS\Install\FolderStructure\Exception\InvalidArgumentException;
/**
* Abstract node implements common methods
@@ -214,7 +215,7 @@ abstract class AbstractNode
}
$projectPath = Environment::getProjectPath();
if (strpos($path, $projectPath, 0) !== 0) {
- throw new Exception\InvalidArgumentException(
+ throw new InvalidArgumentException(
'Public path is not first part of given path',
1366398198
);
diff --git a/typo3/sysext/install/Classes/FolderStructure/DirectoryNode.php b/typo3/sysext/install/Classes/FolderStructure/DirectoryNode.php
index 1a6059487389f904d6ad011970edcb36c41c465c..c8ce396bda4dafb101265b2a70863e80aae6d29c 100644
--- a/typo3/sysext/install/Classes/FolderStructure/DirectoryNode.php
+++ b/typo3/sysext/install/Classes/FolderStructure/DirectoryNode.php
@@ -17,6 +17,7 @@ namespace TYPO3\CMS\Install\FolderStructure;
use TYPO3\CMS\Core\Messaging\FlashMessage;
use TYPO3\CMS\Core\Utility\StringUtility;
+use TYPO3\CMS\Install\FolderStructure\Exception\InvalidArgumentException;
/**
* A directory
@@ -39,7 +40,7 @@ class DirectoryNode extends AbstractNode implements NodeInterface
public function __construct(array $structure, NodeInterface $parent = null)
{
if ($parent === null) {
- throw new Exception\InvalidArgumentException(
+ throw new InvalidArgumentException(
'Node must have parent',
1366222203
);
@@ -48,7 +49,7 @@ class DirectoryNode extends AbstractNode implements NodeInterface
// Ensure name is a single segment, but not a path like foo/bar or an absolute path /foo
if (strpos($structure['name'], '/') !== false) {
- throw new Exception\InvalidArgumentException(
+ throw new InvalidArgumentException(
'Directory name must not contain forward slash',
1366226639
);
@@ -283,13 +284,13 @@ class DirectoryNode extends AbstractNode implements NodeInterface
{
foreach ($structure as $child) {
if (!array_key_exists('type', $child)) {
- throw new Exception\InvalidArgumentException(
+ throw new InvalidArgumentException(
'Child must have type',
1366222204
);
}
if (!array_key_exists('name', $child)) {
- throw new Exception\InvalidArgumentException(
+ throw new InvalidArgumentException(
'Child must have name',
1366222205
);
@@ -298,7 +299,7 @@ class DirectoryNode extends AbstractNode implements NodeInterface
foreach ($this->children as $existingChild) {
/** @var NodeInterface $existingChild */
if ($existingChild->getName() === $name) {
- throw new Exception\InvalidArgumentException(
+ throw new InvalidArgumentException(
'Child name must be unique',
1366222206
);
diff --git a/typo3/sysext/install/Classes/FolderStructure/Exception/InvalidArgumentException.php b/typo3/sysext/install/Classes/FolderStructure/Exception/InvalidArgumentException.php
index bd98111f0298c53686ac24db0c348a03cca0f956..d9b2c6036f537c974df03472b64a69e22f1a31c1 100644
--- a/typo3/sysext/install/Classes/FolderStructure/Exception/InvalidArgumentException.php
+++ b/typo3/sysext/install/Classes/FolderStructure/Exception/InvalidArgumentException.php
@@ -15,9 +15,11 @@
namespace TYPO3\CMS\Install\FolderStructure\Exception;
+use TYPO3\CMS\Install\FolderStructure\Exception;
+
/**
* An invalid argument exception
*/
-class InvalidArgumentException extends \TYPO3\CMS\Install\FolderStructure\Exception
+class InvalidArgumentException extends Exception
{
}
diff --git a/typo3/sysext/install/Classes/FolderStructure/Exception/RootNodeException.php b/typo3/sysext/install/Classes/FolderStructure/Exception/RootNodeException.php
index 58bdd434e60254624007cfe330757b4a302eab55..f3a776f1d38dcf7f581fe49a0bf61733472aadc9 100644
--- a/typo3/sysext/install/Classes/FolderStructure/Exception/RootNodeException.php
+++ b/typo3/sysext/install/Classes/FolderStructure/Exception/RootNodeException.php
@@ -15,9 +15,11 @@
namespace TYPO3\CMS\Install\FolderStructure\Exception;
+use TYPO3\CMS\Install\FolderStructure\Exception;
+
/**
* A root node exception
*/
-class RootNodeException extends \TYPO3\CMS\Install\FolderStructure\Exception
+class RootNodeException extends Exception
{
}
diff --git a/typo3/sysext/install/Classes/FolderStructure/FileNode.php b/typo3/sysext/install/Classes/FolderStructure/FileNode.php
index 7c5887b4ed61cfda56857d01455c39e2cf9ec51e..04a01b241ffa132ad797f3cab7188f4357d59a08 100644
--- a/typo3/sysext/install/Classes/FolderStructure/FileNode.php
+++ b/typo3/sysext/install/Classes/FolderStructure/FileNode.php
@@ -16,6 +16,7 @@
namespace TYPO3\CMS\Install\FolderStructure;
use TYPO3\CMS\Core\Messaging\FlashMessage;
+use TYPO3\CMS\Install\FolderStructure\Exception\InvalidArgumentException;
/**
* A file
@@ -43,7 +44,7 @@ class FileNode extends AbstractNode implements NodeInterface
public function __construct(array $structure, NodeInterface $parent = null)
{
if ($parent === null) {
- throw new Exception\InvalidArgumentException(
+ throw new InvalidArgumentException(
'File node must have parent',
1366927513
);
@@ -52,7 +53,7 @@ class FileNode extends AbstractNode implements NodeInterface
// Ensure name is a single segment, but not a path like foo/bar or an absolute path /foo
if (strpos($structure['name'], '/') !== false) {
- throw new Exception\InvalidArgumentException(
+ throw new InvalidArgumentException(
'File name must not contain forward slash',
1366222207
);
@@ -64,7 +65,7 @@ class FileNode extends AbstractNode implements NodeInterface
}
if (isset($structure['targetContent']) && isset($structure['targetContentFile'])) {
- throw new Exception\InvalidArgumentException(
+ throw new InvalidArgumentException(
'Either targetContent or targetContentFile can be set, but not both',
1380364361
);
@@ -75,7 +76,7 @@ class FileNode extends AbstractNode implements NodeInterface
}
if (isset($structure['targetContentFile'])) {
if (!is_readable($structure['targetContentFile'])) {
- throw new Exception\InvalidArgumentException(
+ throw new InvalidArgumentException(
'targetContentFile ' . $structure['targetContentFile'] . ' does not exist or is not readable',
1380364362
);
diff --git a/typo3/sysext/install/Classes/FolderStructure/LinkNode.php b/typo3/sysext/install/Classes/FolderStructure/LinkNode.php
index 394c50cc84c6d181ed38ed40b1b7db719969418f..6df28d63d3d9b16474ae97e9fc1a6a1f4f37df3c 100644
--- a/typo3/sysext/install/Classes/FolderStructure/LinkNode.php
+++ b/typo3/sysext/install/Classes/FolderStructure/LinkNode.php
@@ -16,6 +16,7 @@
namespace TYPO3\CMS\Install\FolderStructure;
use TYPO3\CMS\Core\Messaging\FlashMessage;
+use TYPO3\CMS\Install\FolderStructure\Exception\InvalidArgumentException;
/**
* A link
@@ -38,7 +39,7 @@ class LinkNode extends AbstractNode implements NodeInterface
public function __construct(array $structure, NodeInterface $parent = null)
{
if ($parent === null) {
- throw new Exception\InvalidArgumentException(
+ throw new InvalidArgumentException(
'Link node must have parent',
1380485700
);
@@ -47,7 +48,7 @@ class LinkNode extends AbstractNode implements NodeInterface
// Ensure name is a single segment, but not a path like foo/bar or an absolute path /foo
if (strpos($structure['name'], '/') !== false) {
- throw new Exception\InvalidArgumentException(
+ throw new InvalidArgumentException(
'File name must not contain forward slash',
1380546061
);
@@ -163,7 +164,7 @@ class LinkNode extends AbstractNode implements NodeInterface
protected function isLink()
{
if (!$this->exists()) {
- throw new Exception\InvalidArgumentException(
+ throw new InvalidArgumentException(
'Link does not exist',
1380556246
);
@@ -180,13 +181,13 @@ class LinkNode extends AbstractNode implements NodeInterface
protected function isTargetCorrect()
{
if (!$this->exists()) {
- throw new Exception\InvalidArgumentException(
+ throw new InvalidArgumentException(
'Link does not exist',
1380556245
);
}
if (!$this->isLink()) {
- throw new Exception\InvalidArgumentException(
+ throw new InvalidArgumentException(
'Node is not a link',
1380556247
);
diff --git a/typo3/sysext/install/Classes/FolderStructure/RootNode.php b/typo3/sysext/install/Classes/FolderStructure/RootNode.php
index 48c27451d6e62db73c86c3dc2d3f61633d4284f2..389fc2cf4adc1475c8b8fe4c545a8f0e88ff177d 100644
--- a/typo3/sysext/install/Classes/FolderStructure/RootNode.php
+++ b/typo3/sysext/install/Classes/FolderStructure/RootNode.php
@@ -16,6 +16,8 @@
namespace TYPO3\CMS\Install\FolderStructure;
use TYPO3\CMS\Core\Messaging\FlashMessage;
+use TYPO3\CMS\Install\FolderStructure\Exception\InvalidArgumentException;
+use TYPO3\CMS\Install\FolderStructure\Exception\RootNodeException;
/**
* Root node of structure
@@ -34,7 +36,7 @@ class RootNode extends DirectoryNode implements RootNodeInterface
public function __construct(array $structure, NodeInterface $parent = null)
{
if ($parent !== null) {
- throw new Exception\RootNodeException(
+ throw new RootNodeException(
'Root node must not have parent',
1366140117
);
@@ -44,7 +46,7 @@ class RootNode extends DirectoryNode implements RootNodeInterface
|| ($this->isWindowsOs() && substr($structure['name'], 1, 2) !== ':/')
|| (!$this->isWindowsOs() && $structure['name'][0] !== '/')
) {
- throw new Exception\InvalidArgumentException(
+ throw new InvalidArgumentException(
'Root node expects absolute path as name',
1366141329
);
diff --git a/typo3/sysext/install/Classes/Report/InstallStatusReport.php b/typo3/sysext/install/Classes/Report/InstallStatusReport.php
index 076de51253ece4ebc8de905e43a0992ab877a629..c4d6b85f9e386213d7e9bfc5d8381ee85069dbe7 100644
--- a/typo3/sysext/install/Classes/Report/InstallStatusReport.php
+++ b/typo3/sysext/install/Classes/Report/InstallStatusReport.php
@@ -15,19 +15,22 @@
namespace TYPO3\CMS\Install\Report;
+use TYPO3\CMS\Backend\Routing\UriBuilder;
use TYPO3\CMS\Core\Core\Environment;
use TYPO3\CMS\Core\Information\Typo3Version;
use TYPO3\CMS\Core\Localization\LanguageService;
use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Install\Service\Exception;
+use TYPO3\CMS\Install\Service\CoreVersionService;
+use TYPO3\CMS\Install\Service\Exception\RemoteFetchException;
use TYPO3\CMS\Install\Service\UpgradeWizardsService;
use TYPO3\CMS\Reports\Status;
+use TYPO3\CMS\Reports\StatusProviderInterface;
/**
* Provides an installation status report.
* @internal This class is only meant to be used within EXT:install and is not part of the TYPO3 Core API.
*/
-class InstallStatusReport implements \TYPO3\CMS\Reports\StatusProviderInterface
+class InstallStatusReport implements StatusProviderInterface
{
/**
* Compiles a collection of system status checks as a status report.
@@ -176,7 +179,7 @@ class InstallStatusReport implements \TYPO3\CMS\Reports\StatusProviderInterface
$message = '';
$severity = Status::OK;
/** @var \TYPO3\CMS\Backend\Routing\UriBuilder $uriBuilder */
- $uriBuilder = GeneralUtility::makeInstance(\TYPO3\CMS\Backend\Routing\UriBuilder::class);
+ $uriBuilder = GeneralUtility::makeInstance(UriBuilder::class);
// check if there are update wizards left to perform
$incompleteWizards = $this->getIncompleteWizards();
if (count($incompleteWizards)) {
@@ -200,7 +203,7 @@ class InstallStatusReport implements \TYPO3\CMS\Reports\StatusProviderInterface
$typoVersion = GeneralUtility::makeInstance(Typo3Version::class);
$languageService = $this->getLanguageService();
/** @var \TYPO3\CMS\Install\Service\CoreVersionService $coreVersionService */
- $coreVersionService = GeneralUtility::makeInstance(\TYPO3\CMS\Install\Service\CoreVersionService::class);
+ $coreVersionService = GeneralUtility::makeInstance(CoreVersionService::class);
// No updates for development versions
if (!$coreVersionService->isInstalledVersionAReleasedVersion()) {
@@ -210,7 +213,7 @@ class InstallStatusReport implements \TYPO3\CMS\Reports\StatusProviderInterface
try {
$isUpdateAvailable = $coreVersionService->isYoungerPatchReleaseAvailable();
$isMaintainedVersion = $coreVersionService->isVersionActivelyMaintained();
- } catch (Exception\RemoteFetchException $remoteFetchException) {
+ } catch (RemoteFetchException $remoteFetchException) {
return GeneralUtility::makeInstance(
Status::class,
'TYPO3',
diff --git a/typo3/sysext/install/Classes/Report/SecurityStatusReport.php b/typo3/sysext/install/Classes/Report/SecurityStatusReport.php
index f75a63b7dc0fe078207835ca4f71d2ac34a8c445..a25471906fca085419ef49a3b6f5e6be8ea793d7 100644
--- a/typo3/sysext/install/Classes/Report/SecurityStatusReport.php
+++ b/typo3/sysext/install/Classes/Report/SecurityStatusReport.php
@@ -15,6 +15,7 @@
namespace TYPO3\CMS\Install\Report;
+use TYPO3\CMS\Backend\Routing\UriBuilder;
use TYPO3\CMS\Core\Core\Environment;
use TYPO3\CMS\Core\Crypto\PasswordHashing\InvalidPasswordHashException;
use TYPO3\CMS\Core\Crypto\PasswordHashing\PasswordHashFactory;
@@ -22,12 +23,13 @@ use TYPO3\CMS\Core\Localization\LanguageService;
use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Install\Service\EnableFileService;
use TYPO3\CMS\Reports\Status;
+use TYPO3\CMS\Reports\StatusProviderInterface;
/**
* Provides a status report of the security of the install tool
* @internal This class is only meant to be used within EXT:install and is not part of the TYPO3 Core API.
*/
-class SecurityStatusReport implements \TYPO3\CMS\Reports\StatusProviderInterface
+class SecurityStatusReport implements StatusProviderInterface
{
/**
* Compiles a collection of system status checks as a status report.
@@ -75,7 +77,7 @@ class SecurityStatusReport implements \TYPO3\CMS\Reports\StatusProviderInterface
$value = $this->getLanguageService()->getLL('status_insecure');
$severity = Status::ERROR;
/** @var \TYPO3\CMS\Backend\Routing\UriBuilder $uriBuilder */
- $uriBuilder = GeneralUtility::makeInstance(\TYPO3\CMS\Backend\Routing\UriBuilder::class);
+ $uriBuilder = GeneralUtility::makeInstance(UriBuilder::class);
$changeInstallToolPasswordUrl = (string)$uriBuilder->buildUriFromRoute('tools_toolssettings');
$message = sprintf(
$this->getLanguageService()->sL('LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:warning.installtool_default_password'),
diff --git a/typo3/sysext/install/Classes/Service/ClearCacheService.php b/typo3/sysext/install/Classes/Service/ClearCacheService.php
index 833381e3369c2e3820adc545b0369501e54d8bf7..9eba056caadc67c67b80a9a16669c8ce41eebd3c 100644
--- a/typo3/sysext/install/Classes/Service/ClearCacheService.php
+++ b/typo3/sysext/install/Classes/Service/ClearCacheService.php
@@ -15,6 +15,7 @@
namespace TYPO3\CMS\Install\Service;
+use TYPO3\CMS\Core\Cache\CacheManager;
use TYPO3\CMS\Core\Database\ConnectionPool;
use TYPO3\CMS\Core\Utility\GeneralUtility;
@@ -92,7 +93,7 @@ class ClearCacheService
*/
private function flushCaches(array $cacheConfiguration): void
{
- $cacheManager = new \TYPO3\CMS\Core\Cache\CacheManager();
+ $cacheManager = new CacheManager();
$cacheManager->setCacheConfigurations($cacheConfiguration);
$cacheManager->flushCaches();
}
diff --git a/typo3/sysext/install/Classes/Service/CoreVersionService.php b/typo3/sysext/install/Classes/Service/CoreVersionService.php
index 1150d919d0943a7e6cc1625c1b91043502f15294..f526c0718718161296f2e18960e3107191699081 100644
--- a/typo3/sysext/install/Classes/Service/CoreVersionService.php
+++ b/typo3/sysext/install/Classes/Service/CoreVersionService.php
@@ -19,6 +19,7 @@ namespace TYPO3\CMS\Install\Service;
use TYPO3\CMS\Core\Information\Typo3Version;
use TYPO3\CMS\Core\Utility\GeneralUtility;
+use TYPO3\CMS\Install\Service\Exception\RemoteFetchException;
/**
* Core version service
@@ -163,7 +164,7 @@ class CoreVersionService
*/
protected function throwFetchException(string $url): void
{
- throw new Exception\RemoteFetchException(
+ throw new RemoteFetchException(
'Fetching ' .
$url .
' failed. Maybe this instance can not connect to the remote system properly.',
diff --git a/typo3/sysext/install/Classes/Service/LanguagePackService.php b/typo3/sysext/install/Classes/Service/LanguagePackService.php
index 59fc0d15d75159bec2ecef0c1f0bc51f240b4078..310c321f8a98999ad7974933eaec33a25e9702b9 100644
--- a/typo3/sysext/install/Classes/Service/LanguagePackService.php
+++ b/typo3/sysext/install/Classes/Service/LanguagePackService.php
@@ -31,6 +31,7 @@ use TYPO3\CMS\Core\Service\Archive\ZipService;
use TYPO3\CMS\Core\Utility\ExtensionManagementUtility;
use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Core\Utility\PathUtility;
+use TYPO3\CMS\Install\Service\Event\ModifyLanguagePackRemoteBaseUrlEvent;
/**
* Service class handling language pack details
@@ -275,7 +276,7 @@ class LanguagePackService implements LoggerAwareInterface
}
// Allow to modify the base url on the fly
- $event = $this->eventDispatcher->dispatch(new Event\ModifyLanguagePackRemoteBaseUrlEvent(new Uri($languagePackBaseUrl), $key));
+ $event = $this->eventDispatcher->dispatch(new ModifyLanguagePackRemoteBaseUrlEvent(new Uri($languagePackBaseUrl), $key));
$languagePackBaseUrl = $event->getBaseUrl();
$path = ExtensionManagementUtility::extPath($key);
$majorVersion = explode('.', TYPO3_branch)[0];
diff --git a/typo3/sysext/install/Classes/Service/LoadTcaService.php b/typo3/sysext/install/Classes/Service/LoadTcaService.php
index 4439c83e77d96106f3eee2493e22517eac9078f8..4ba8cd7af27b422eb1aba1c6efc6fce0902a5718 100644
--- a/typo3/sysext/install/Classes/Service/LoadTcaService.php
+++ b/typo3/sysext/install/Classes/Service/LoadTcaService.php
@@ -16,6 +16,7 @@
namespace TYPO3\CMS\Install\Service;
use TYPO3\CMS\Core\Category\CategoryRegistry;
+use TYPO3\CMS\Core\Package\Exception\UnknownPackageException;
use TYPO3\CMS\Core\Package\PackageManager;
/**
@@ -110,7 +111,7 @@ class LoadTcaService
$packageManager = $container->get(PackageManager::class);
try {
$package = $packageManager->getPackage($extensionKey);
- } catch (\TYPO3\CMS\Core\Package\Exception\UnknownPackageException $e) {
+ } catch (UnknownPackageException $e) {
throw new \RuntimeException(
'Extension ' . $extensionKey . ' is not active',
1477217619
diff --git a/typo3/sysext/install/Classes/Service/SessionService.php b/typo3/sysext/install/Classes/Service/SessionService.php
index 7c04deb2cdba52607ddc9c8ee98147b037aa4a7f..fe6768e8a703b59b0e20db42dd5b1ccb7af592bb 100644
--- a/typo3/sysext/install/Classes/Service/SessionService.php
+++ b/typo3/sysext/install/Classes/Service/SessionService.php
@@ -21,6 +21,7 @@ use TYPO3\CMS\Core\Http\CookieHeaderTrait;
use TYPO3\CMS\Core\Messaging\FlashMessage;
use TYPO3\CMS\Core\SingletonInterface;
use TYPO3\CMS\Core\Utility\GeneralUtility;
+use TYPO3\CMS\Install\Exception;
use TYPO3\CMS\Install\Service\Session\FileSessionHandler;
/**
@@ -80,12 +81,12 @@ class SessionService implements SingletonInterface
$sessionCreationError = 'Error: session.auto-start is enabled.<br />';
$sessionCreationError .= 'The PHP option session.auto-start is enabled. Disable this option in php.ini or .htaccess:<br />';
$sessionCreationError .= '<pre>php_value session.auto_start Off</pre>';
- throw new \TYPO3\CMS\Install\Exception($sessionCreationError, 1294587485);
+ throw new Exception($sessionCreationError, 1294587485);
}
if (defined('SID')) {
$sessionCreationError = 'Session already started by session_start().<br />';
$sessionCreationError .= 'Make sure no installed extension is starting a session in its ext_localconf.php or ext_tables.php.';
- throw new \TYPO3\CMS\Install\Exception($sessionCreationError, 1294587486);
+ throw new Exception($sessionCreationError, 1294587486);
}
session_start();
if (!$this->hasSameSiteCookieSupport()) {
diff --git a/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/Matcher/ConstructorArgumentMatcherTest.php b/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/Matcher/ConstructorArgumentMatcherTest.php
index 1b90a4372b170f1749a9fbfa55cd5678e51097c6..31c44a79cbc14a6a2192decb568290d911bdc972 100644
--- a/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/Matcher/ConstructorArgumentMatcherTest.php
+++ b/typo3/sysext/install/Tests/Unit/ExtensionScanner/Php/Matcher/ConstructorArgumentMatcherTest.php
@@ -20,6 +20,7 @@ namespace TYPO3\CMS\Install\Tests\Unit\ExtensionScanner\Php\Matcher;
use PhpParser\NodeTraverser;
use PhpParser\NodeVisitor\NameResolver;
use PhpParser\ParserFactory;
+use PHPUnit\Framework\TestCase;
use TYPO3\CMS\Install\ExtensionScanner\Php\GeneratorClassesResolver;
use TYPO3\CMS\Install\ExtensionScanner\Php\Matcher\ConstructorArgumentMatcher;
use TYPO3\CMS\Install\Tests\Unit\ExtensionScanner\Php\Matcher\Fixtures\Subject;
@@ -27,7 +28,7 @@ use TYPO3\CMS\Install\Tests\Unit\ExtensionScanner\Php\Matcher\Fixtures\Subject;
/**
* Test case
*/
-class ConstructorArgumentMatcherTest extends \PHPUnit\Framework\TestCase
+class ConstructorArgumentMatcherTest extends TestCase
{
public function hitsFromFixtureAreFoundDataProvider(): array
{
diff --git a/typo3/sysext/install/Tests/Unit/FolderStructure/AbstractNodeTest.php b/typo3/sysext/install/Tests/Unit/FolderStructure/AbstractNodeTest.php
index 63fe231a6cce312ddf5f64e7a56ae98e962cfdb9..178c61c080c773b3aea7a0a66d92cb7a1f0a9654 100644
--- a/typo3/sysext/install/Tests/Unit/FolderStructure/AbstractNodeTest.php
+++ b/typo3/sysext/install/Tests/Unit/FolderStructure/AbstractNodeTest.php
@@ -21,6 +21,8 @@ use TYPO3\CMS\Core\Utility\StringUtility;
use TYPO3\CMS\Install\FolderStructure\AbstractNode;
use TYPO3\CMS\Install\FolderStructure\Exception;
use TYPO3\CMS\Install\FolderStructure\Exception\InvalidArgumentException;
+use TYPO3\CMS\Install\FolderStructure\NodeInterface;
+use TYPO3\CMS\Install\FolderStructure\RootNodeInterface;
use TYPO3\CMS\Install\Tests\Unit\FolderStructureTestCase;
use TYPO3\TestingFramework\Core\AccessibleObjectInterface;
@@ -72,7 +74,7 @@ class AbstractNodeTest extends FolderStructureTestCase
{
/** @var $node AbstractNode|AccessibleObjectInterface|\PHPUnit\Framework\MockObject\MockObject */
$node = $this->getAccessibleMock(AbstractNode::class, ['dummy'], [], '', false);
- $parent = $this->createMock(\TYPO3\CMS\Install\FolderStructure\RootNodeInterface::class);
+ $parent = $this->createMock(RootNodeInterface::class);
$node->_set('parent', $parent);
self::assertSame($parent, $node->_call('getParent'));
}
@@ -84,7 +86,7 @@ class AbstractNodeTest extends FolderStructureTestCase
{
/** @var $node AbstractNode|AccessibleObjectInterface|\PHPUnit\Framework\MockObject\MockObject */
$node = $this->getAccessibleMock(AbstractNode::class, ['dummy'], [], '', false);
- $parent = $this->createMock(\TYPO3\CMS\Install\FolderStructure\RootNodeInterface::class);
+ $parent = $this->createMock(RootNodeInterface::class);
$parentPath = '/foo/bar';
$parent->expects(self::once())->method('getAbsolutePath')->willReturn($parentPath);
$name = StringUtility::getUniqueId('test_');
@@ -100,7 +102,7 @@ class AbstractNodeTest extends FolderStructureTestCase
{
/** @var $node AbstractNode|AccessibleObjectInterface|\PHPUnit\Framework\MockObject\MockObject */
$node = $this->getAccessibleMock(AbstractNode::class, ['dummy'], [], '', false);
- $parentMock = $this->createMock(\TYPO3\CMS\Install\FolderStructure\NodeInterface::class);
+ $parentMock = $this->createMock(NodeInterface::class);
$parentMock->expects(self::once())->method('isWritable');
$node->_set('parent', $parentMock);
$node->isWritable();
@@ -113,7 +115,7 @@ class AbstractNodeTest extends FolderStructureTestCase
{
/** @var $node AbstractNode|AccessibleObjectInterface|\PHPUnit\Framework\MockObject\MockObject */
$node = $this->getAccessibleMock(AbstractNode::class, ['dummy'], [], '', false);
- $parentMock = $this->createMock(\TYPO3\CMS\Install\FolderStructure\NodeInterface::class);
+ $parentMock = $this->createMock(NodeInterface::class);
$parentMock->expects(self::once())->method('isWritable')->willReturn(true);
$node->_set('parent', $parentMock);
self::assertTrue($node->isWritable());
diff --git a/typo3/sysext/install/Tests/Unit/FolderStructure/DirectoryNodeTest.php b/typo3/sysext/install/Tests/Unit/FolderStructure/DirectoryNodeTest.php
index afcbddcb25f0c9af32e42d102ec51d543afe9814..3710f96a648bb7f06349178262032ae20c6421cf 100644
--- a/typo3/sysext/install/Tests/Unit/FolderStructure/DirectoryNodeTest.php
+++ b/typo3/sysext/install/Tests/Unit/FolderStructure/DirectoryNodeTest.php
@@ -17,6 +17,7 @@ namespace TYPO3\CMS\Install\Tests\Unit\FolderStructure;
use TYPO3\CMS\Core\Core\Environment;
use TYPO3\CMS\Core\Messaging\FlashMessage;
+use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Core\Utility\StringUtility;
use TYPO3\CMS\Install\FolderStructure\DirectoryNode;
use TYPO3\CMS\Install\FolderStructure\Exception;
@@ -623,7 +624,7 @@ class DirectoryNodeTest extends FolderStructureTestCase
/** @var $node DirectoryNode|AccessibleObjectInterface|\PHPUnit\Framework\MockObject\MockObject */
$node = $this->getAccessibleMock(DirectoryNode::class, ['getAbsolutePath'], [], '', false);
$path = Environment::getVarPath() . '/tests/' . StringUtility::getUniqueId('root_');
- \TYPO3\CMS\Core\Utility\GeneralUtility::mkdir_deep($path);
+ GeneralUtility::mkdir_deep($path);
$this->testFilesToDelete[] = $path;
$link = StringUtility::getUniqueId('link_');
$dir = StringUtility::getUniqueId('dir_');
diff --git a/typo3/sysext/install/Tests/Unit/FolderStructure/FileNodeTest.php b/typo3/sysext/install/Tests/Unit/FolderStructure/FileNodeTest.php
index 99233d1601cc34697238163f464b4d92a0a548d9..00145ec35b4a486d0764724b002776b49063de81 100644
--- a/typo3/sysext/install/Tests/Unit/FolderStructure/FileNodeTest.php
+++ b/typo3/sysext/install/Tests/Unit/FolderStructure/FileNodeTest.php
@@ -17,10 +17,13 @@ namespace TYPO3\CMS\Install\Tests\Unit\FolderStructure;
use TYPO3\CMS\Core\Core\Environment;
use TYPO3\CMS\Core\Messaging\FlashMessage;
+use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Core\Utility\StringUtility;
use TYPO3\CMS\Install\FolderStructure\Exception;
use TYPO3\CMS\Install\FolderStructure\Exception\InvalidArgumentException;
use TYPO3\CMS\Install\FolderStructure\FileNode;
+use TYPO3\CMS\Install\FolderStructure\NodeInterface;
+use TYPO3\CMS\Install\FolderStructure\RootNodeInterface;
use TYPO3\CMS\Install\Tests\Unit\FolderStructureTestCase;
use TYPO3\TestingFramework\Core\AccessibleObjectInterface;
@@ -48,7 +51,7 @@ class FileNodeTest extends FolderStructureTestCase
{
$this->expectException(InvalidArgumentException::class);
$this->expectExceptionCode(1366222207);
- $parent = $this->createMock(\TYPO3\CMS\Install\FolderStructure\NodeInterface::class);
+ $parent = $this->createMock(NodeInterface::class);
/** @var $node FileNode|AccessibleObjectInterface|\PHPUnit\Framework\MockObject\MockObject */
$node = $this->getAccessibleMock(FileNode::class, ['dummy'], [], '', false);
$structure = [
@@ -62,7 +65,7 @@ class FileNodeTest extends FolderStructureTestCase
*/
public function constructorSetsParent()
{
- $parent = $this->createMock(\TYPO3\CMS\Install\FolderStructure\NodeInterface::class);
+ $parent = $this->createMock(NodeInterface::class);
/** @var $node FileNode|AccessibleObjectInterface|\PHPUnit\Framework\MockObject\MockObject */
$node = $this->getAccessibleMock(FileNode::class, ['dummy'], [], '', false);
$structure = [
@@ -77,7 +80,7 @@ class FileNodeTest extends FolderStructureTestCase
*/
public function constructorSetsTargetPermission()
{
- $parent = $this->createMock(\TYPO3\CMS\Install\FolderStructure\NodeInterface::class);
+ $parent = $this->createMock(NodeInterface::class);
/** @var $node FileNode|AccessibleObjectInterface|\PHPUnit\Framework\MockObject\MockObject */
$node = $this->getAccessibleMock(FileNode::class, ['dummy'], [], '', false);
$targetPermission = '0660';
@@ -96,7 +99,7 @@ class FileNodeTest extends FolderStructureTestCase
{
/** @var $node FileNode|AccessibleObjectInterface|\PHPUnit\Framework\MockObject\MockObject */
$node = $this->getAccessibleMock(FileNode::class, ['dummy'], [], '', false);
- $parent = $this->createMock(\TYPO3\CMS\Install\FolderStructure\RootNodeInterface::class);
+ $parent = $this->createMock(RootNodeInterface::class);
$name = StringUtility::getUniqueId('test_');
$node->__construct(['name' => $name], $parent);
self::assertSame($name, $node->getName());
@@ -111,7 +114,7 @@ class FileNodeTest extends FolderStructureTestCase
$this->expectExceptionCode(1380364361);
/** @var $node FileNode|AccessibleObjectInterface|\PHPUnit\Framework\MockObject\MockObject */
$node = $this->getAccessibleMock(FileNode::class, ['dummy'], [], '', false);
- $parent = $this->createMock(\TYPO3\CMS\Install\FolderStructure\RootNodeInterface::class);
+ $parent = $this->createMock(RootNodeInterface::class);
$structure = [
'name' => 'foo',
'targetContent' => 'foo',
@@ -127,7 +130,7 @@ class FileNodeTest extends FolderStructureTestCase
{
/** @var $node FileNode|AccessibleObjectInterface|\PHPUnit\Framework\MockObject\MockObject */
$node = $this->getAccessibleMock(FileNode::class, ['dummy'], [], '', false);
- $parent = $this->createMock(\TYPO3\CMS\Install\FolderStructure\RootNodeInterface::class);
+ $parent = $this->createMock(RootNodeInterface::class);
$targetContent = StringUtility::getUniqueId('content_');
$structure = [
'name' => 'foo',
@@ -144,7 +147,7 @@ class FileNodeTest extends FolderStructureTestCase
{
/** @var $node FileNode|AccessibleObjectInterface|\PHPUnit\Framework\MockObject\MockObject */
$node = $this->getAccessibleMock(FileNode::class, ['dummy'], [], '', false);
- $parent = $this->createMock(\TYPO3\CMS\Install\FolderStructure\RootNodeInterface::class);
+ $parent = $this->createMock(RootNodeInterface::class);
$targetFile = $this->getVirtualTestFilePath('test_');
$targetContent = StringUtility::getUniqueId('content_');
file_put_contents($targetFile, $targetContent);
@@ -165,7 +168,7 @@ class FileNodeTest extends FolderStructureTestCase
$this->expectExceptionCode(1380364362);
/** @var $node FileNode|AccessibleObjectInterface|\PHPUnit\Framework\MockObject\MockObject */
$node = $this->getAccessibleMock(FileNode::class, ['dummy'], [], '', false);
- $parent = $this->createMock(\TYPO3\CMS\Install\FolderStructure\RootNodeInterface::class);
+ $parent = $this->createMock(RootNodeInterface::class);
$targetFile = $this->getVirtualTestFilePath('test_');
$structure = [
'name' => 'foo',
@@ -181,7 +184,7 @@ class FileNodeTest extends FolderStructureTestCase
{
/** @var $node FileNode|AccessibleObjectInterface|\PHPUnit\Framework\MockObject\MockObject */
$node = $this->getAccessibleMock(FileNode::class, ['dummy'], [], '', false);
- $parent = $this->createMock(\TYPO3\CMS\Install\FolderStructure\RootNodeInterface::class);
+ $parent = $this->createMock(RootNodeInterface::class);
$structure = [
'name' => 'foo',
];
@@ -662,7 +665,7 @@ class FileNodeTest extends FolderStructureTestCase
*/
public function isPermissionCorrectReturnsTrueIfTargetPermissionAndCurrentPermissionAreIdentical()
{
- $parent = $this->createMock(\TYPO3\CMS\Install\FolderStructure\NodeInterface::class);
+ $parent = $this->createMock(NodeInterface::class);
/** @var $node FileNode|AccessibleObjectInterface|\PHPUnit\Framework\MockObject\MockObject */
$node = $this->getAccessibleMock(FileNode::class, ['getCurrentPermission', 'isWindowsOs'], [], '', false);
$node->expects(self::any())->method('isWindowsOs')->willReturn(false);
@@ -781,7 +784,7 @@ class FileNodeTest extends FolderStructureTestCase
/** @var $node FileNode|AccessibleObjectInterface|\PHPUnit\Framework\MockObject\MockObject */
$node = $this->getAccessibleMock(FileNode::class, ['getAbsolutePath'], [], '', false);
$path = Environment::getVarPath() . '/tests/' . StringUtility::getUniqueId('root_');
- \TYPO3\CMS\Core\Utility\GeneralUtility::mkdir_deep($path);
+ GeneralUtility::mkdir_deep($path);
$this->testFilesToDelete[] = $path;
$link = StringUtility::getUniqueId('link_');
$file = StringUtility::getUniqueId('file_');
diff --git a/typo3/sysext/install/Tests/Unit/FolderStructure/RootNodeTest.php b/typo3/sysext/install/Tests/Unit/FolderStructure/RootNodeTest.php
index ebff7680db1ce6578bbc46f257cf77255a072807..4795ecc9013f044594b5fe5547d7d2f4d83e8050 100644
--- a/typo3/sysext/install/Tests/Unit/FolderStructure/RootNodeTest.php
+++ b/typo3/sysext/install/Tests/Unit/FolderStructure/RootNodeTest.php
@@ -23,6 +23,7 @@ use TYPO3\CMS\Install\FolderStructure\DirectoryNode;
use TYPO3\CMS\Install\FolderStructure\Exception\InvalidArgumentException;
use TYPO3\CMS\Install\FolderStructure\Exception\RootNodeException;
use TYPO3\CMS\Install\FolderStructure\RootNode;
+use TYPO3\CMS\Install\FolderStructure\RootNodeInterface;
use TYPO3\TestingFramework\Core\AccessibleObjectInterface;
use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
@@ -40,7 +41,7 @@ class RootNodeTest extends UnitTestCase
$this->expectExceptionCode(1366140117);
/** @var $node RootNode|AccessibleObjectInterface|\PHPUnit\Framework\MockObject\MockObject */
$node = $this->getAccessibleMock(RootNode::class, ['isWindowsOs'], [], '', false);
- $falseParent = $this->createMock(\TYPO3\CMS\Install\FolderStructure\RootNodeInterface::class);
+ $falseParent = $this->createMock(RootNodeInterface::class);
$node->__construct([], $falseParent);
}
diff --git a/typo3/sysext/install/Tests/Unit/FolderStructureTestCase.php b/typo3/sysext/install/Tests/Unit/FolderStructureTestCase.php
index 12e0f55a7cabb5067544c95a61fe4acd63e985ba..47f32e9181588c2d5f5ad51b009626f43d2a86c9 100644
--- a/typo3/sysext/install/Tests/Unit/FolderStructureTestCase.php
+++ b/typo3/sysext/install/Tests/Unit/FolderStructureTestCase.php
@@ -16,6 +16,7 @@
namespace TYPO3\CMS\Install\Tests\Unit;
use org\bovigo\vfs\vfsStream;
+use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Core\Utility\StringUtility;
use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
@@ -34,7 +35,7 @@ abstract class FolderStructureTestCase extends UnitTestCase
{
$root = vfsStream::setup();
$path = $root->url() . '/typo3temp/var/tests/' . StringUtility::getUniqueId($prefix);
- \TYPO3\CMS\Core\Utility\GeneralUtility::mkdir_deep($path);
+ GeneralUtility::mkdir_deep($path);
return $path;
}
diff --git a/typo3/sysext/install/Tests/Unit/Service/CoreUpdateServiceTest.php b/typo3/sysext/install/Tests/Unit/Service/CoreUpdateServiceTest.php
index 9ef1fdaa321864484393f907f9c69c4076a245ad..56563516a0765a86684f315936493cac955adb36 100644
--- a/typo3/sysext/install/Tests/Unit/Service/CoreUpdateServiceTest.php
+++ b/typo3/sysext/install/Tests/Unit/Service/CoreUpdateServiceTest.php
@@ -16,6 +16,7 @@
namespace TYPO3\CMS\Install\Tests\Unit\Service;
use TYPO3\CMS\Core\Messaging\FlashMessageQueue;
+use TYPO3\CMS\Install\Service\CoreUpdateService;
use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
/**
@@ -29,7 +30,7 @@ class CoreUpdateServiceTest extends UnitTestCase
public function getMessagesReturnsPreviouslySetMessage()
{
/** @var $instance \TYPO3\CMS\Install\Service\CoreUpdateService|\TYPO3\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit\Framework\MockObject\MockObject */
- $instance = $this->getAccessibleMock(\TYPO3\CMS\Install\Service\CoreUpdateService::class, ['dummy'], [], '', false);
+ $instance = $this->getAccessibleMock(CoreUpdateService::class, ['dummy'], [], '', false);
$aMessage = new FlashMessageQueue('install');
$instance->_set('messages', $aMessage);
self::assertSame($aMessage, $instance->getMessages());
@@ -44,7 +45,7 @@ class CoreUpdateServiceTest extends UnitTestCase
self::markTestSkipped('This test is only available in Non-Composer mode.');
}
/** @var $instance \TYPO3\CMS\Install\Service\CoreUpdateService|\TYPO3\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit\Framework\MockObject\MockObject */
- $instance = $this->getAccessibleMock(\TYPO3\CMS\Install\Service\CoreUpdateService::class, ['dummy'], [], '', false);
+ $instance = $this->getAccessibleMock(CoreUpdateService::class, ['dummy'], [], '', false);
putenv('TYPO3_DISABLE_CORE_UPDATER');
putenv('REDIRECT_TYPO3_DISABLE_CORE_UPDATER');
self::assertTrue($instance->isCoreUpdateEnabled());
@@ -56,7 +57,7 @@ class CoreUpdateServiceTest extends UnitTestCase
public function isCoreUpdateEnabledReturnsFalseFor_TYPO3_DISABLE_CORE_UPDATER_EnvironmentVariableSet()
{
/** @var $instance \TYPO3\CMS\Install\Service\CoreUpdateService|\TYPO3\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit\Framework\MockObject\MockObject */
- $instance = $this->getAccessibleMock(\TYPO3\CMS\Install\Service\CoreUpdateService::class, ['dummy'], [], '', false);
+ $instance = $this->getAccessibleMock(CoreUpdateService::class, ['dummy'], [], '', false);
putenv('TYPO3_DISABLE_CORE_UPDATER=1');
putenv('REDIRECT_TYPO3_DISABLE_CORE_UPDATER');
self::assertFalse($instance->isCoreUpdateEnabled());
@@ -68,7 +69,7 @@ class CoreUpdateServiceTest extends UnitTestCase
public function isCoreUpdateEnabledReturnsFalseFor_REDIRECT_TYPO3_DISABLE_CORE_UPDATER_EnvironmentVariableSet()
{
/** @var $instance \TYPO3\CMS\Install\Service\CoreUpdateService|\TYPO3\TestingFramework\Core\AccessibleObjectInterface|\PHPUnit\Framework\MockObject\MockObject */
- $instance = $this->getAccessibleMock(\TYPO3\CMS\Install\Service\CoreUpdateService::class, ['dummy'], [], '', false);
+ $instance = $this->getAccessibleMock(CoreUpdateService::class, ['dummy'], [], '', false);
putenv('TYPO3_DISABLE_CORE_UPDATER');
putenv('REDIRECT_TYPO3_DISABLE_CORE_UPDATER=1');
self::assertFalse($instance->isCoreUpdateEnabled());
diff --git a/typo3/sysext/install/Tests/Unit/Service/SilentConfigurationUpgradeServiceTest.php b/typo3/sysext/install/Tests/Unit/Service/SilentConfigurationUpgradeServiceTest.php
index 992c3bf6830e276fb090e4e0e4630c1a63d015b6..03f76c1b361c0f79cf0a604028d12786e7c93b84 100644
--- a/typo3/sysext/install/Tests/Unit/Service/SilentConfigurationUpgradeServiceTest.php
+++ b/typo3/sysext/install/Tests/Unit/Service/SilentConfigurationUpgradeServiceTest.php
@@ -19,6 +19,9 @@ namespace TYPO3\CMS\Install\Tests\Unit\Service;
use Prophecy\Argument;
use Prophecy\Prophecy\ObjectProphecy;
+use TYPO3\CMS\Core\Cache\Backend\SimpleFileBackend;
+use TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend;
+use TYPO3\CMS\Core\Cache\Frontend\VariableFrontend;
use TYPO3\CMS\Core\Configuration\ConfigurationManager;
use TYPO3\CMS\Core\Crypto\PasswordHashing\Argon2idPasswordHash;
use TYPO3\CMS\Core\Crypto\PasswordHashing\Argon2iPasswordHash;
@@ -28,6 +31,7 @@ use TYPO3\CMS\Core\Tests\Unit\Utility\AccessibleProxies\ExtensionManagementUtili
use TYPO3\CMS\Core\Utility\Exception\MissingArrayPathException;
use TYPO3\CMS\Core\Utility\ExtensionManagementUtility;
use TYPO3\CMS\Core\Utility\GeneralUtility;
+use TYPO3\CMS\Fluid\Core\Cache\FluidTemplateCache;
use TYPO3\CMS\Install\Service\Exception\ConfigurationChangedException;
use TYPO3\CMS\Install\Service\SilentConfigurationUpgradeService;
use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
@@ -973,31 +977,31 @@ class SilentConfigurationUpgradeServiceTest extends UnitTestCase
{
$oldCacheConfigurations = [
'cache_rootline' => [
- 'frontend' => \TYPO3\CMS\Core\Cache\Frontend\VariableFrontend::class,
- 'backend' => \TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend::class,
+ 'frontend' => VariableFrontend::class,
+ 'backend' => Typo3DatabaseBackend::class,
'options' => [
'defaultLifetime' => 2592000,
],
'groups' => ['pages']
],
'fluid_template' => [
- 'backend' => \TYPO3\CMS\Core\Cache\Backend\SimpleFileBackend::class,
- 'frontend' => \TYPO3\CMS\Fluid\Core\Cache\FluidTemplateCache::class,
+ 'backend' => SimpleFileBackend::class,
+ 'frontend' => FluidTemplateCache::class,
'groups' => ['system'],
],
];
$newCacheConfigurations = [
'rootline' => [
- 'frontend' => \TYPO3\CMS\Core\Cache\Frontend\VariableFrontend::class,
- 'backend' => \TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend::class,
+ 'frontend' => VariableFrontend::class,
+ 'backend' => Typo3DatabaseBackend::class,
'options' => [
'defaultLifetime' => 2592000,
],
'groups' => ['pages']
],
'fluid_template' => [
- 'backend' => \TYPO3\CMS\Core\Cache\Backend\SimpleFileBackend::class,
- 'frontend' => \TYPO3\CMS\Fluid\Core\Cache\FluidTemplateCache::class,
+ 'backend' => SimpleFileBackend::class,
+ 'frontend' => FluidTemplateCache::class,
'groups' => ['system'],
],
];
@@ -1032,16 +1036,16 @@ class SilentConfigurationUpgradeServiceTest extends UnitTestCase
{
$oldCacheConfigurations = [
'rootline' => [
- 'frontend' => \TYPO3\CMS\Core\Cache\Frontend\VariableFrontend::class,
- 'backend' => \TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend::class,
+ 'frontend' => VariableFrontend::class,
+ 'backend' => Typo3DatabaseBackend::class,
'options' => [
'defaultLifetime' => 2592000,
],
'groups' => ['pages']
],
'fluid_template' => [
- 'backend' => \TYPO3\CMS\Core\Cache\Backend\SimpleFileBackend::class,
- 'frontend' => \TYPO3\CMS\Fluid\Core\Cache\FluidTemplateCache::class,
+ 'backend' => SimpleFileBackend::class,
+ 'frontend' => FluidTemplateCache::class,
'groups' => ['system'],
],
];
diff --git a/typo3/sysext/linkvalidator/Classes/LinkAnalyzer.php b/typo3/sysext/linkvalidator/Classes/LinkAnalyzer.php
index a3f5468d5476fd87d8618550af2e24a3810eb014..ff2c87dd4cae25c77388df5b95353e0966ac85f2 100644
--- a/typo3/sysext/linkvalidator/Classes/LinkAnalyzer.php
+++ b/typo3/sysext/linkvalidator/Classes/LinkAnalyzer.php
@@ -25,6 +25,7 @@ use TYPO3\CMS\Core\Database\Query\Restriction\HiddenRestriction;
use TYPO3\CMS\Core\Html\HtmlParser;
use TYPO3\CMS\Core\Localization\LanguageService;
use TYPO3\CMS\Core\Utility\GeneralUtility;
+use TYPO3\CMS\Linkvalidator\Event\BeforeRecordIsAnalyzedEvent;
use TYPO3\CMS\Linkvalidator\Linktype\AbstractLinktype;
use TYPO3\CMS\Linkvalidator\Repository\BrokenLinkRepository;
@@ -309,7 +310,7 @@ class LinkAnalyzer
*/
public function analyzeRecord(array &$results, $table, array $fields, array $record)
{
- $event = new Event\BeforeRecordIsAnalyzedEvent($table, $record, $fields, $this, $results);
+ $event = new BeforeRecordIsAnalyzedEvent($table, $record, $fields, $this, $results);
$this->eventDispatcher->dispatch($event);
$results = $event->getResults();
$record = $event->getRecord();
diff --git a/typo3/sysext/linkvalidator/Classes/Linktype/ExternalLinktype.php b/typo3/sysext/linkvalidator/Classes/Linktype/ExternalLinktype.php
index 4d19861a94d2eff006eae1c0f9ce0d99f344863b..933fc0bbb587b3823a461640bac5e3f7ce7ae9da 100644
--- a/typo3/sysext/linkvalidator/Classes/Linktype/ExternalLinktype.php
+++ b/typo3/sysext/linkvalidator/Classes/Linktype/ExternalLinktype.php
@@ -16,6 +16,9 @@
namespace TYPO3\CMS\Linkvalidator\Linktype;
use GuzzleHttp\Cookie\CookieJar;
+use GuzzleHttp\Exception\ClientException;
+use GuzzleHttp\Exception\RequestException;
+use GuzzleHttp\Exception\TooManyRedirectsException;
use TYPO3\CMS\Core\Http\RequestFactory;
use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Core\Utility\HttpUtility;
@@ -175,13 +178,13 @@ class ExternalLinktype extends AbstractLinktype
} else {
$isValidUrl = true;
}
- } catch (\GuzzleHttp\Exception\TooManyRedirectsException $e) {
+ } catch (TooManyRedirectsException $e) {
// redirect loop or too many redirects
// todo: change errorType to 'redirect' (breaking change)
$this->errorParams['errorType'] = 'loop';
$this->errorParams['exception'] = $e->getMessage();
$this->errorParams['message'] = $this->getErrorMessage($this->errorParams);
- } catch (\GuzzleHttp\Exception\ClientException $e) {
+ } catch (ClientException $e) {
if ($e->hasResponse()) {
$this->errorParams['errorType'] = $e->getResponse()->getStatusCode();
} else {
@@ -189,7 +192,7 @@ class ExternalLinktype extends AbstractLinktype
}
$this->errorParams['exception'] = $e->getMessage();
$this->errorParams['message'] = $this->getErrorMessage($this->errorParams);
- } catch (\GuzzleHttp\Exception\RequestException $e) {
+ } catch (RequestException $e) {
$this->errorParams['errorType'] = 'network';
$this->errorParams['exception'] = $e->getMessage();
$this->errorParams['message'] = $this->getErrorMessage($this->errorParams);
diff --git a/typo3/sysext/linkvalidator/Classes/Repository/BrokenLinkRepository.php b/typo3/sysext/linkvalidator/Classes/Repository/BrokenLinkRepository.php
index f036ed47bfd1e170fc070dca3cd1217c07fdbbb5..4ea63d70f0162197312b72a57787cdfb44e7cdbb 100644
--- a/typo3/sysext/linkvalidator/Classes/Repository/BrokenLinkRepository.php
+++ b/typo3/sysext/linkvalidator/Classes/Repository/BrokenLinkRepository.php
@@ -17,6 +17,7 @@ declare(strict_types=1);
namespace TYPO3\CMS\Linkvalidator\Repository;
+use Doctrine\DBAL\Exception\TableNotFoundException;
use TYPO3\CMS\Core\Database\Connection;
use TYPO3\CMS\Core\Database\ConnectionPool;
use TYPO3\CMS\Core\Utility\GeneralUtility;
@@ -56,7 +57,7 @@ class BrokenLinkRepository
return (int)$queryBuilder
->execute()
->fetchColumn(0);
- } catch (\Doctrine\DBAL\Exception\TableNotFoundException $e) {
+ } catch (TableNotFoundException $e) {
return 0;
}
}
@@ -82,7 +83,7 @@ class BrokenLinkRepository
return (bool)$queryBuilder
->execute()
->fetchColumn(0);
- } catch (\Doctrine\DBAL\Exception\TableNotFoundException $e) {
+ } catch (TableNotFoundException $e) {
return false;
}
}
diff --git a/typo3/sysext/lowlevel/Classes/Controller/ConfigurationController.php b/typo3/sysext/lowlevel/Classes/Controller/ConfigurationController.php
index 01f4c015a83d43aa55df3a382ace29b85cb8a97f..9cfb9c57dae2821e4fcd3ddc95aab4d38043dc65 100644
--- a/typo3/sysext/lowlevel/Classes/Controller/ConfigurationController.php
+++ b/typo3/sysext/lowlevel/Classes/Controller/ConfigurationController.php
@@ -22,6 +22,7 @@ use Psr\Http\Message\ResponseInterface;
use Psr\Http\Message\ServerRequestInterface;
use TYPO3\CMS\Backend\Configuration\SiteTcaConfiguration;
use TYPO3\CMS\Backend\Routing\Router;
+use TYPO3\CMS\Backend\Routing\UriBuilder;
use TYPO3\CMS\Backend\Template\ModuleTemplate;
use TYPO3\CMS\Backend\View\ArrayBrowser;
use TYPO3\CMS\Core\Authentication\BackendUserAuthentication;
@@ -320,7 +321,7 @@ class ConfigurationController
foreach ($this->treeSetup as $treeKey => $treeDetails) {
$menuItem = $menu->makeMenuItem();
/** @var \TYPO3\CMS\Backend\Routing\UriBuilder $uriBuilder */
- $uriBuilder = GeneralUtility::makeInstance(\TYPO3\CMS\Backend\Routing\UriBuilder::class);
+ $uriBuilder = GeneralUtility::makeInstance(UriBuilder::class);
$menuItem->setHref((string)$uriBuilder->buildUriFromRoute('system_config', ['tree' => $treeKey]))
->setTitle($languageService->sL(
'LLL:EXT:lowlevel/Resources/Private/Language/locallang.xlf:' . $treeDetails['label']
diff --git a/typo3/sysext/recordlist/Classes/Browser/FileBrowser.php b/typo3/sysext/recordlist/Classes/Browser/FileBrowser.php
index 1a2b7ba547759603f22f104607585d56c83c2a4e..27c7a4a702f065081ed81037ca0f65406d6b4c17 100644
--- a/typo3/sysext/recordlist/Classes/Browser/FileBrowser.php
+++ b/typo3/sysext/recordlist/Classes/Browser/FileBrowser.php
@@ -15,6 +15,7 @@
namespace TYPO3\CMS\Recordlist\Browser;
+use TYPO3\CMS\Backend\Routing\UriBuilder;
use TYPO3\CMS\Backend\Tree\View\ElementBrowserFolderTreeView;
use TYPO3\CMS\Backend\Utility\BackendUtility;
use TYPO3\CMS\Core\Imaging\Icon;
@@ -311,7 +312,7 @@ class FileBrowser extends AbstractElementBrowser implements ElementBrowserInterf
$bulkCheckBox = '';
}
/** @var \TYPO3\CMS\Backend\Routing\UriBuilder $uriBuilder */
- $uriBuilder = GeneralUtility::makeInstance(\TYPO3\CMS\Backend\Routing\UriBuilder::class);
+ $uriBuilder = GeneralUtility::makeInstance(UriBuilder::class);
// Create link to showing details about the file in a window:
$Ahref = (string)$uriBuilder->buildUriFromRoute('show_item', [
'type' => 'file',
diff --git a/typo3/sysext/recordlist/Classes/LinkHandler/AbstractLinkHandler.php b/typo3/sysext/recordlist/Classes/LinkHandler/AbstractLinkHandler.php
index 709dc72734a7046ee0efbe5a5f07b9244dc2028c..62db2feaf420f63e69e961af7937dbec05d170a1 100644
--- a/typo3/sysext/recordlist/Classes/LinkHandler/AbstractLinkHandler.php
+++ b/typo3/sysext/recordlist/Classes/LinkHandler/AbstractLinkHandler.php
@@ -19,6 +19,7 @@ use TYPO3\CMS\Core\Authentication\BackendUserAuthentication;
use TYPO3\CMS\Core\Imaging\IconFactory;
use TYPO3\CMS\Core\Localization\LanguageService;
use TYPO3\CMS\Core\Utility\GeneralUtility;
+use TYPO3\CMS\Fluid\View\StandaloneView;
use TYPO3\CMS\Recordlist\Controller\AbstractLinkBrowserController;
/**
@@ -75,7 +76,7 @@ abstract class AbstractLinkHandler
{
$this->linkBrowser = $linkBrowser;
$this->iconFactory = GeneralUtility::makeInstance(IconFactory::class);
- $this->view = GeneralUtility::makeInstance(\TYPO3\CMS\Fluid\View\StandaloneView::class);
+ $this->view = GeneralUtility::makeInstance(StandaloneView::class);
$this->view->getRequest()->setControllerExtensionName('recordlist');
$this->view->setTemplateRootPaths([GeneralUtility::getFileAbsFileName('EXT:recordlist/Resources/Private/Templates/LinkBrowser')]);
$this->view->setPartialRootPaths([GeneralUtility::getFileAbsFileName('EXT:recordlist/Resources/Private/Partials/LinkBrowser')]);
diff --git a/typo3/sysext/recycler/Classes/Task/CleanerTask.php b/typo3/sysext/recycler/Classes/Task/CleanerTask.php
index e680babeb13187c8bcc08d24846b23ae2aeed256..225b5b31be5a861629c51a4601d3497938b5ca05 100644
--- a/typo3/sysext/recycler/Classes/Task/CleanerTask.php
+++ b/typo3/sysext/recycler/Classes/Task/CleanerTask.php
@@ -15,6 +15,7 @@
namespace TYPO3\CMS\Recycler\Task;
+use Doctrine\DBAL\DBALException;
use TYPO3\CMS\Core\Database\ConnectionPool;
use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Scheduler\Task\AbstractTask;
@@ -86,7 +87,7 @@ class CleanerTask extends AbstractTask
$queryBuilder->delete($tableName)
->where(...$constraints)
->execute();
- } catch (\Doctrine\DBAL\DBALException $e) {
+ } catch (DBALException $e) {
return false;
}
}
diff --git a/typo3/sysext/recycler/Tests/Functional/Recycle/AbstractRecycleTestCase.php b/typo3/sysext/recycler/Tests/Functional/Recycle/AbstractRecycleTestCase.php
index 664df295618822d2398ca33baf7875d81d06b4ab..f70999df0d93134bbcc80a355e7178d4a0bbba57 100644
--- a/typo3/sysext/recycler/Tests/Functional/Recycle/AbstractRecycleTestCase.php
+++ b/typo3/sysext/recycler/Tests/Functional/Recycle/AbstractRecycleTestCase.php
@@ -15,12 +15,15 @@
namespace TYPO3\CMS\Recycler\Tests\Functional\Recycle;
+use TYPO3\CMS\Core\Core\Bootstrap;
use TYPO3\CMS\Core\Utility\GeneralUtility;
+use TYPO3\CMS\Recycler\Domain\Model\DeletedRecords;
+use TYPO3\TestingFramework\Core\Functional\FunctionalTestCase;
/**
* Functional test for the Export
*/
-abstract class AbstractRecycleTestCase extends \TYPO3\TestingFramework\Core\Functional\FunctionalTestCase
+abstract class AbstractRecycleTestCase extends FunctionalTestCase
{
/**
* @var array
@@ -42,7 +45,7 @@ abstract class AbstractRecycleTestCase extends \TYPO3\TestingFramework\Core\Func
{
parent::setUp();
$this->importDataSet(__DIR__ . '/../Fixtures/Database/be_groups.xml');
- \TYPO3\CMS\Core\Core\Bootstrap::initializeLanguageObject();
+ Bootstrap::initializeLanguageObject();
}
/**
@@ -55,7 +58,7 @@ abstract class AbstractRecycleTestCase extends \TYPO3\TestingFramework\Core\Func
protected function getDeletedPages($pageUid, $depth = 0)
{
/** @var $deletedRecords \TYPO3\CMS\Recycler\Domain\Model\DeletedRecords */
- $deletedRecords = GeneralUtility::makeInstance(\TYPO3\CMS\Recycler\Domain\Model\DeletedRecords::class);
+ $deletedRecords = GeneralUtility::makeInstance(DeletedRecords::class);
$deletedRecords->loadData($pageUid, 'pages', $depth);
return $deletedRecords->getDeletedRows();
}
@@ -69,7 +72,7 @@ abstract class AbstractRecycleTestCase extends \TYPO3\TestingFramework\Core\Func
protected function getDeletedContent($contentUid)
{
/** @var $deletedRecords \TYPO3\CMS\Recycler\Domain\Model\DeletedRecords */
- $deletedRecords = GeneralUtility::makeInstance(\TYPO3\CMS\Recycler\Domain\Model\DeletedRecords::class);
+ $deletedRecords = GeneralUtility::makeInstance(DeletedRecords::class);
$deletedRecords->loadData($contentUid, 'tt_content', 0);
return $deletedRecords->getDeletedRows();
}
diff --git a/typo3/sysext/recycler/Tests/Functional/Recycle/Pages/AdminRecycleTest.php b/typo3/sysext/recycler/Tests/Functional/Recycle/Pages/AdminRecycleTest.php
index 7d9a2a033d88b7cf9fce862aa63fa73b27bc70b5..7f4b1b217a4d6e2d6464460f388e8c098179f7f2 100644
--- a/typo3/sysext/recycler/Tests/Functional/Recycle/Pages/AdminRecycleTest.php
+++ b/typo3/sysext/recycler/Tests/Functional/Recycle/Pages/AdminRecycleTest.php
@@ -15,10 +15,12 @@
namespace TYPO3\CMS\Recycler\Tests\Functional\Recycle\Pages;
+use TYPO3\CMS\Recycler\Tests\Functional\Recycle\AbstractRecycleTestCase;
+
/**
* Functional test for the Recycler
*/
-class AdminRecycleTest extends \TYPO3\CMS\Recycler\Tests\Functional\Recycle\AbstractRecycleTestCase
+class AdminRecycleTest extends AbstractRecycleTestCase
{
/**
* Directory which contains data sets for assertions
diff --git a/typo3/sysext/recycler/Tests/Functional/Recycle/Pages/UserRecycleTest.php b/typo3/sysext/recycler/Tests/Functional/Recycle/Pages/UserRecycleTest.php
index cdce7cf5f6b452c4f749d6ef5092d84d8b03625a..2c930d2fa9baca6fd26ecc5c7403a4a978f41228 100644
--- a/typo3/sysext/recycler/Tests/Functional/Recycle/Pages/UserRecycleTest.php
+++ b/typo3/sysext/recycler/Tests/Functional/Recycle/Pages/UserRecycleTest.php
@@ -15,10 +15,12 @@
namespace TYPO3\CMS\Recycler\Tests\Functional\Recycle\Pages;
+use TYPO3\CMS\Recycler\Tests\Functional\Recycle\AbstractRecycleTestCase;
+
/**
* Functional test for the Recycler
*/
-class UserRecycleTest extends \TYPO3\CMS\Recycler\Tests\Functional\Recycle\AbstractRecycleTestCase
+class UserRecycleTest extends AbstractRecycleTestCase
{
/**
* Directory which contains data sets for assertions
diff --git a/typo3/sysext/recycler/Tests/Unit/Task/CleanerTaskTest.php b/typo3/sysext/recycler/Tests/Unit/Task/CleanerTaskTest.php
index e0b7906657fae30029155dde9cd38d968262f3b5..74d90a417a3d5d7965a050dcb4fad54ded5afc67 100644
--- a/typo3/sysext/recycler/Tests/Unit/Task/CleanerTaskTest.php
+++ b/typo3/sysext/recycler/Tests/Unit/Task/CleanerTaskTest.php
@@ -15,6 +15,8 @@
namespace TYPO3\CMS\Recycler\Tests\Unit\Task;
+use Doctrine\DBAL\DBALException;
+use Doctrine\DBAL\Driver\Statement;
use Prophecy\Argument;
use Prophecy\Prophecy\ObjectProphecy;
use TYPO3\CMS\Core\Database\Connection;
@@ -96,7 +98,7 @@ class CleanerTaskTest extends UnitTestCase
// TODO: This should rather be a functional test if we need a query builder
// or we should clean up the code itself to not need to mock internal behavior here
- $statementProphet = $this->prophesize(\Doctrine\DBAL\Driver\Statement::class);
+ $statementProphet = $this->prophesize(Statement::class);
$restrictionProphet = $this->prophesize(DefaultRestrictionContainer::class);
$restrictionProphet->removeAll()->willReturn($restrictionProphet->reveal());
@@ -148,7 +150,7 @@ class CleanerTaskTest extends UnitTestCase
$connection->executeUpdate(Argument::cetera())
->shouldBeCalled()
- ->willThrow(new \Doctrine\DBAL\DBALException('testing', 1476122315));
+ ->willThrow(new DBALException('testing', 1476122315));
self::assertFalse($this->subject->execute());
}
diff --git a/typo3/sysext/redirects/Classes/EventListener/RecordHistoryRollbackEventsListener.php b/typo3/sysext/redirects/Classes/EventListener/RecordHistoryRollbackEventsListener.php
index 8989ff71e801e4cfd6700f750a0647dab152b37e..302131fb86e3fa22ff03bf51938dc9dbc947cb15 100644
--- a/typo3/sysext/redirects/Classes/EventListener/RecordHistoryRollbackEventsListener.php
+++ b/typo3/sysext/redirects/Classes/EventListener/RecordHistoryRollbackEventsListener.php
@@ -17,13 +17,15 @@ declare(strict_types=1);
namespace TYPO3\CMS\Redirects\EventListener;
+use TYPO3\CMS\Redirects\Hooks\DataHandlerSlugUpdateHook;
+
class RecordHistoryRollbackEventsListener
{
public function afterHistoryRollbackFinishedEvent(): void
{
// Re-Enable hook to after rollback finished
$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['t3lib/class.t3lib_tcemain.php']['processDatamapClass']['redirects'] =
- \TYPO3\CMS\Redirects\Hooks\DataHandlerSlugUpdateHook::class;
+ DataHandlerSlugUpdateHook::class;
}
public function beforeHistoryRollbackStartEvent(): void
diff --git a/typo3/sysext/redirects/Classes/Service/SlugService.php b/typo3/sysext/redirects/Classes/Service/SlugService.php
index 3b9260c7177a75abf287c160e1b3440d9b1519b9..ec5c0d8e8f55c5fd4282c77d052fb28ea9306123 100644
--- a/typo3/sysext/redirects/Classes/Service/SlugService.php
+++ b/typo3/sysext/redirects/Classes/Service/SlugService.php
@@ -38,6 +38,7 @@ use TYPO3\CMS\Core\Page\PageRenderer;
use TYPO3\CMS\Core\Site\Entity\SiteInterface;
use TYPO3\CMS\Core\Site\SiteFinder;
use TYPO3\CMS\Core\Utility\GeneralUtility;
+use TYPO3\CMS\Redirects\Hooks\DataHandlerSlugUpdateHook;
/**
* @internal Due to some possible refactorings in TYPO3 v10
@@ -340,7 +341,7 @@ class SlugService implements LoggerAwareInterface
protected function enabledHook(): void
{
$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['t3lib/class.t3lib_tcemain.php']['processDatamapClass']['redirects'] =
- \TYPO3\CMS\Redirects\Hooks\DataHandlerSlugUpdateHook::class;
+ DataHandlerSlugUpdateHook::class;
}
protected function disableHook(): void
diff --git a/typo3/sysext/reports/Classes/Report/Status/ConfigurationStatus.php b/typo3/sysext/reports/Classes/Report/Status/ConfigurationStatus.php
index c991aafad89309645484af4bb8eec4ff1ec7f68c..822568eb6f79b66e03099861f05dd1c9cc3cd25e 100644
--- a/typo3/sysext/reports/Classes/Report/Status/ConfigurationStatus.php
+++ b/typo3/sysext/reports/Classes/Report/Status/ConfigurationStatus.php
@@ -15,7 +15,9 @@
namespace TYPO3\CMS\Reports\Report\Status;
+use TYPO3\CMS\Backend\Routing\UriBuilder;
use TYPO3\CMS\Backend\Utility\BackendUtility;
+use TYPO3\CMS\Core\Cache\Backend\MemcachedBackend;
use TYPO3\CMS\Core\Core\Environment;
use TYPO3\CMS\Core\Database\ConnectionPool;
use TYPO3\CMS\Core\Database\Query\QueryBuilder;
@@ -74,7 +76,7 @@ class ConfigurationStatus implements StatusProviderInterface
$registry = GeneralUtility::makeInstance(Registry::class);
$lastRefIndexUpdate = $registry->get('core', 'sys_refindex_lastUpdate');
/** @var \TYPO3\CMS\Backend\Routing\UriBuilder $uriBuilder */
- $uriBuilder = GeneralUtility::makeInstance(\TYPO3\CMS\Backend\Routing\UriBuilder::class);
+ $uriBuilder = GeneralUtility::makeInstance(UriBuilder::class);
if (!$count && $lastRefIndexUpdate) {
$value = $this->getLanguageService()->getLL('status_empty');
$severity = ReportStatus::WARNING;
@@ -111,7 +113,7 @@ class ConfigurationStatus implements StatusProviderInterface
foreach ($configurations as $table => $conf) {
if (is_array($conf)) {
foreach ($conf as $key => $value) {
- if ($value === \TYPO3\CMS\Core\Cache\Backend\MemcachedBackend::class) {
+ if ($value === MemcachedBackend::class) {
$memcachedServers = $configurations[$table]['options']['servers'];
break;
}
diff --git a/typo3/sysext/reports/Tests/Unit/Report/Status/Typo3StatusTest.php b/typo3/sysext/reports/Tests/Unit/Report/Status/Typo3StatusTest.php
index c2012313de2753fb1834b807b827b120bcb21dff..4deb2e1a78279dcce45e0192d7ebc0fe97be7a79 100644
--- a/typo3/sysext/reports/Tests/Unit/Report/Status/Typo3StatusTest.php
+++ b/typo3/sysext/reports/Tests/Unit/Report/Status/Typo3StatusTest.php
@@ -15,6 +15,9 @@
namespace TYPO3\CMS\Reports\Tests\Unit\Report\Status;
+use TYPO3\CMS\Core\Localization\LanguageService;
+use TYPO3\CMS\Reports\Report\Status\Typo3Status;
+use TYPO3\CMS\Reports\Status;
use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
/**
@@ -28,7 +31,7 @@ class Typo3StatusTest extends UnitTestCase
protected function setUp(): void
{
parent::setUp();
- $GLOBALS['LANG'] = $this->createMock(\TYPO3\CMS\Core\Localization\LanguageService::class);
+ $GLOBALS['LANG'] = $this->createMock(LanguageService::class);
}
/**
@@ -37,10 +40,10 @@ class Typo3StatusTest extends UnitTestCase
public function getStatusReturnsXclassStatusObjectWithSeverityOkIfNoXclassExists()
{
$GLOBALS['TYPO3_CONF_VARS']['SYS']['Objects'] = [];
- $fixture = new \TYPO3\CMS\Reports\Report\Status\Typo3Status();
+ $fixture = new Typo3Status();
$result = $fixture->getStatus();
$statusObject = $result['registeredXclass'];
- self::assertSame(\TYPO3\CMS\Reports\Status::OK, $statusObject->getSeverity());
+ self::assertSame(Status::OK, $statusObject->getSeverity());
}
/**
@@ -53,9 +56,9 @@ class Typo3StatusTest extends UnitTestCase
'className' => 'bar',
]
];
- $fixture = new \TYPO3\CMS\Reports\Report\Status\Typo3Status();
+ $fixture = new Typo3Status();
$result = $fixture->getStatus();
$statusObject = $result['registeredXclass'];
- self::assertSame(\TYPO3\CMS\Reports\Status::NOTICE, $statusObject->getSeverity());
+ self::assertSame(Status::NOTICE, $statusObject->getSeverity());
}
}
diff --git a/typo3/sysext/scheduler/Classes/AdditionalFieldProviderInterface.php b/typo3/sysext/scheduler/Classes/AdditionalFieldProviderInterface.php
index 20d093c0cc7470c13ab5b955fe7ff02d91f1f758..b0430312e8a3fcaa924110886694e9748df4e367 100644
--- a/typo3/sysext/scheduler/Classes/AdditionalFieldProviderInterface.php
+++ b/typo3/sysext/scheduler/Classes/AdditionalFieldProviderInterface.php
@@ -15,6 +15,9 @@
namespace TYPO3\CMS\Scheduler;
+use TYPO3\CMS\Scheduler\Controller\SchedulerModuleController;
+use TYPO3\CMS\Scheduler\Task\AbstractTask;
+
/**
* Interface for classes who want to provide additional fields when adding a task
*/
@@ -28,7 +31,7 @@ interface AdditionalFieldProviderInterface
* @param \TYPO3\CMS\Scheduler\Controller\SchedulerModuleController $schedulerModule Reference to the scheduler backend module
* @return array A two dimensional array: array('fieldId' => array('code' => '', 'label' => '', 'cshKey' => '', 'cshLabel' => ''))
*/
- public function getAdditionalFields(array &$taskInfo, $task, \TYPO3\CMS\Scheduler\Controller\SchedulerModuleController $schedulerModule);
+ public function getAdditionalFields(array &$taskInfo, $task, SchedulerModuleController $schedulerModule);
/**
* Validates the additional fields' values
@@ -37,7 +40,7 @@ interface AdditionalFieldProviderInterface
* @param \TYPO3\CMS\Scheduler\Controller\SchedulerModuleController $schedulerModule Reference to the scheduler backend module
* @return bool TRUE if validation was ok (or selected class is not relevant), FALSE otherwise
*/
- public function validateAdditionalFields(array &$submittedData, \TYPO3\CMS\Scheduler\Controller\SchedulerModuleController $schedulerModule);
+ public function validateAdditionalFields(array &$submittedData, SchedulerModuleController $schedulerModule);
/**
* Takes care of saving the additional fields' values in the task's object
@@ -45,5 +48,5 @@ interface AdditionalFieldProviderInterface
* @param array $submittedData An array containing the data submitted by the add/edit task form
* @param \TYPO3\CMS\Scheduler\Task\AbstractTask $task Reference to the scheduler backend module
*/
- public function saveAdditionalFields(array $submittedData, \TYPO3\CMS\Scheduler\Task\AbstractTask $task);
+ public function saveAdditionalFields(array $submittedData, AbstractTask $task);
}
diff --git a/typo3/sysext/scheduler/Classes/CronCommand/CronCommand.php b/typo3/sysext/scheduler/Classes/CronCommand/CronCommand.php
index 0b245281f7e94e9356795c77c0b790b048cbf7da..ff67264dc6565599bffdc441bf0a85e1f94f2132 100644
--- a/typo3/sysext/scheduler/Classes/CronCommand/CronCommand.php
+++ b/typo3/sysext/scheduler/Classes/CronCommand/CronCommand.php
@@ -15,6 +15,8 @@
namespace TYPO3\CMS\Scheduler\CronCommand;
+use TYPO3\CMS\Core\Utility\GeneralUtility;
+
/**
* This class provides calculations for the cron command format.
*/
@@ -55,7 +57,7 @@ class CronCommand
{
$cronCommand = NormalizeCommand::normalize($cronCommand);
// Explode cron command to sections
- $this->cronCommandSections = \TYPO3\CMS\Core\Utility\GeneralUtility::trimExplode(' ', $cronCommand);
+ $this->cronCommandSections = GeneralUtility::trimExplode(' ', $cronCommand);
// Initialize the values with the starting time
// This takes care that the calculated time is always in the future
if ($timestamp === false) {
@@ -188,7 +190,7 @@ class CronCommand
if ((string)$commandExpression === '*') {
$inList = true;
} else {
- $inList = \TYPO3\CMS\Core\Utility\GeneralUtility::inList($commandExpression, $numberToMatch);
+ $inList = GeneralUtility::inList($commandExpression, $numberToMatch);
}
return $inList;
}
diff --git a/typo3/sysext/scheduler/Classes/Example/SleepTask.php b/typo3/sysext/scheduler/Classes/Example/SleepTask.php
index 9be6934c42c2ff8062c6240e85de45f5861b7604..a6a9e276f8629b03f090771993f5c8a904dbdcb1 100644
--- a/typo3/sysext/scheduler/Classes/Example/SleepTask.php
+++ b/typo3/sysext/scheduler/Classes/Example/SleepTask.php
@@ -15,12 +15,14 @@
namespace TYPO3\CMS\Scheduler\Example;
+use TYPO3\CMS\Scheduler\Task\AbstractTask;
+
/**
* Provides a task that sleeps for some time
* This is useful for testing parallel executions
* @internal This class is an example is not considered part of the Public TYPO3 API.
*/
-class SleepTask extends \TYPO3\CMS\Scheduler\Task\AbstractTask
+class SleepTask extends AbstractTask
{
/**
* Number of seconds the task should be sleeping for
diff --git a/typo3/sysext/scheduler/Classes/Example/TestTask.php b/typo3/sysext/scheduler/Classes/Example/TestTask.php
index f50c0ac967ed8e1c55178bef68db5bbd614280bc..7a4bde8729d041538769615c5eb08ae4ea020a3b 100644
--- a/typo3/sysext/scheduler/Classes/Example/TestTask.php
+++ b/typo3/sysext/scheduler/Classes/Example/TestTask.php
@@ -22,12 +22,13 @@ use TYPO3\CMS\Core\Mail\FluidEmail;
use TYPO3\CMS\Core\Mail\Mailer;
use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Fluid\View\TemplatePaths;
+use TYPO3\CMS\Scheduler\Task\AbstractTask;
/**
* Provides testing procedures
* @internal This class is an example is not considered part of the Public TYPO3 API.
*/
-class TestTask extends \TYPO3\CMS\Scheduler\Task\AbstractTask
+class TestTask extends AbstractTask
{
/**
* An email address to be used during the process
diff --git a/typo3/sysext/scheduler/Classes/Execution.php b/typo3/sysext/scheduler/Classes/Execution.php
index 0d4e24cc5bc65c40ea1f5a303dbf2c900426f597..4d2752972bd49e058aa5fdc1c79b8f2af4ad1d9b 100644
--- a/typo3/sysext/scheduler/Classes/Execution.php
+++ b/typo3/sysext/scheduler/Classes/Execution.php
@@ -15,6 +15,9 @@
namespace TYPO3\CMS\Scheduler;
+use TYPO3\CMS\Core\Utility\GeneralUtility;
+use TYPO3\CMS\Scheduler\CronCommand\CronCommand;
+
/**
* This class manages the logic of a particular execution of a task
* @internal
@@ -248,7 +251,7 @@ class Execution
public function getNextCronExecution()
{
/** @var \TYPO3\CMS\Scheduler\CronCommand\CronCommand $cronCmd */
- $cronCmd = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\TYPO3\CMS\Scheduler\CronCommand\CronCommand::class, $this->getCronCmd());
+ $cronCmd = GeneralUtility::makeInstance(CronCommand::class, $this->getCronCmd());
$cronCmd->calculateNextValue();
return $cronCmd->getTimestamp();
}
diff --git a/typo3/sysext/scheduler/Classes/Scheduler.php b/typo3/sysext/scheduler/Classes/Scheduler.php
index 2bcc9d13e578f1b3402e72191732603cbf9f9129..c4003f8ceb1c6a108173492873a454c8b82b6a2b 100644
--- a/typo3/sysext/scheduler/Classes/Scheduler.php
+++ b/typo3/sysext/scheduler/Classes/Scheduler.php
@@ -15,6 +15,7 @@
namespace TYPO3\CMS\Scheduler;
+use Doctrine\DBAL\DBALException;
use Psr\Log\LoggerAwareInterface;
use Psr\Log\LoggerAwareTrait;
use Psr\Log\LoggerInterface;
@@ -26,6 +27,7 @@ use TYPO3\CMS\Core\Log\LogManager;
use TYPO3\CMS\Core\Registry;
use TYPO3\CMS\Core\SingletonInterface;
use TYPO3\CMS\Core\Utility\GeneralUtility;
+use TYPO3\CMS\Scheduler\Task\AbstractTask;
/**
* TYPO3 Scheduler. This class handles scheduling and execution of tasks.
@@ -59,7 +61,7 @@ class Scheduler implements SingletonInterface, LoggerAwareInterface
* @param Task\AbstractTask $task The object representing the task to add
* @return bool TRUE if the task was successfully added, FALSE otherwise
*/
- public function addTask(Task\AbstractTask $task)
+ public function addTask(AbstractTask $task)
{
$taskUid = $task->getTaskUid();
if (empty($taskUid)) {
@@ -152,7 +154,7 @@ class Scheduler implements SingletonInterface, LoggerAwareInterface
* @return bool Whether the task was saved successfully to the database or not
* @throws \Throwable
*/
- public function executeTask(Task\AbstractTask $task)
+ public function executeTask(AbstractTask $task)
{
$task->setRunOnNextCronJob(false);
// Trigger the saving of the task, as this will calculate its next execution time
@@ -223,7 +225,7 @@ class Scheduler implements SingletonInterface, LoggerAwareInterface
* @param Task\AbstractTask $task The object representing the task to delete
* @return bool TRUE if task was successfully deleted, FALSE otherwise
*/
- public function removeTask(Task\AbstractTask $task)
+ public function removeTask(AbstractTask $task)
{
$taskUid = $task->getTaskUid();
if (!empty($taskUid)) {
@@ -242,7 +244,7 @@ class Scheduler implements SingletonInterface, LoggerAwareInterface
* @param Task\AbstractTask $task Scheduler task object
* @return bool False if submitted task was not of proper class
*/
- public function saveTask(Task\AbstractTask $task)
+ public function saveTask(AbstractTask $task)
{
$result = true;
$taskUid = $task->getTaskUid();
@@ -275,7 +277,7 @@ class Scheduler implements SingletonInterface, LoggerAwareInterface
['uid' => $taskUid],
['serialized_task_object' => Connection::PARAM_LOB]
);
- } catch (\Doctrine\DBAL\DBALException $e) {
+ } catch (DBALException $e) {
$result = false;
}
} else {
@@ -451,7 +453,7 @@ class Scheduler implements SingletonInterface, LoggerAwareInterface
*/
public function isValidTaskObject($task)
{
- return $task instanceof Task\AbstractTask && get_class($task->getExecution()) !== \__PHP_Incomplete_Class::class;
+ return $task instanceof AbstractTask && get_class($task->getExecution()) !== \__PHP_Incomplete_Class::class;
}
/**
diff --git a/typo3/sysext/scheduler/Classes/Task/AbstractTask.php b/typo3/sysext/scheduler/Classes/Task/AbstractTask.php
index 179cdf6c15fa57e5664fa14438a32a444ecfa421..c98a95155b6563269efc72f1440699eb114e5605 100644
--- a/typo3/sysext/scheduler/Classes/Task/AbstractTask.php
+++ b/typo3/sysext/scheduler/Classes/Task/AbstractTask.php
@@ -24,6 +24,7 @@ use TYPO3\CMS\Core\Localization\LanguageService;
use TYPO3\CMS\Core\Log\LogManager;
use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Scheduler\Execution;
+use TYPO3\CMS\Scheduler\Scheduler;
/**
* This is the base class for all Scheduler tasks
@@ -99,7 +100,7 @@ abstract class AbstractTask implements LoggerAwareInterface
public function __construct()
{
// Using makeInstance instead of setScheduler() here as the logger is injected due to LoggerAwareTrait
- $this->scheduler = GeneralUtility::makeInstance(\TYPO3\CMS\Scheduler\Scheduler::class);
+ $this->scheduler = GeneralUtility::makeInstance(Scheduler::class);
$this->execution = GeneralUtility::makeInstance(Execution::class);
}
@@ -287,7 +288,7 @@ abstract class AbstractTask implements LoggerAwareInterface
*/
public function setScheduler()
{
- $this->scheduler = GeneralUtility::makeInstance(\TYPO3\CMS\Scheduler\Scheduler::class);
+ $this->scheduler = GeneralUtility::makeInstance(Scheduler::class);
$this->logger = GeneralUtility::makeInstance(LogManager::class)->getLogger(__CLASS__);
}
diff --git a/typo3/sysext/scheduler/Classes/Task/CachingFrameworkGarbageCollectionTask.php b/typo3/sysext/scheduler/Classes/Task/CachingFrameworkGarbageCollectionTask.php
index 6907d4950833416a3c6fb8562387470698c1a8f7..f232e2c66088fdfe80c3c03fa66d60e0fa101262 100644
--- a/typo3/sysext/scheduler/Classes/Task/CachingFrameworkGarbageCollectionTask.php
+++ b/typo3/sysext/scheduler/Classes/Task/CachingFrameworkGarbageCollectionTask.php
@@ -15,6 +15,9 @@
namespace TYPO3\CMS\Scheduler\Task;
+use TYPO3\CMS\Core\Cache\CacheManager;
+use TYPO3\CMS\Core\Utility\GeneralUtility;
+
/**
* Garbage collection of caching framework cache backends.
*
@@ -23,7 +26,7 @@ namespace TYPO3\CMS\Scheduler\Task;
* is configured to be cleaned.
* @internal This class is a specific scheduler task implementation is not considered part of the Public TYPO3 API.
*/
-class CachingFrameworkGarbageCollectionTask extends \TYPO3\CMS\Scheduler\Task\AbstractTask
+class CachingFrameworkGarbageCollectionTask extends AbstractTask
{
/**
* Backend types that should be cleaned up,
@@ -49,7 +52,7 @@ class CachingFrameworkGarbageCollectionTask extends \TYPO3\CMS\Scheduler\Task\Ab
// The cache backend used for this cache
$usedCacheBackend = $cacheConfiguration['backend'];
if (in_array($usedCacheBackend, $this->selectedBackends)) {
- \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\TYPO3\CMS\Core\Cache\CacheManager::class)->getCache($cacheName)->collectGarbage();
+ GeneralUtility::makeInstance(CacheManager::class)->getCache($cacheName)->collectGarbage();
}
}
}
diff --git a/typo3/sysext/scheduler/Classes/Task/ExecuteSchedulableCommandTask.php b/typo3/sysext/scheduler/Classes/Task/ExecuteSchedulableCommandTask.php
index 4498831e806dc950a74025c8a78b0415e0fc83d0..fd71a69c17839c301eb98e4204b5632790de8d55 100644
--- a/typo3/sysext/scheduler/Classes/Task/ExecuteSchedulableCommandTask.php
+++ b/typo3/sysext/scheduler/Classes/Task/ExecuteSchedulableCommandTask.php
@@ -17,6 +17,7 @@ declare(strict_types=1);
namespace TYPO3\CMS\Scheduler\Task;
+use Symfony\Component\Console\Exception\InvalidArgumentException;
use Symfony\Component\Console\Exception\InvalidOptionException;
use Symfony\Component\Console\Input\ArrayInput;
use Symfony\Component\Console\Output\NullOutput;
@@ -125,7 +126,7 @@ class ExecuteSchedulableCommandTask extends AbstractTask
try {
$input = new ArrayInput($this->getParameters(true), $schedulableCommand->getDefinition());
$arguments = $input->__toString();
- } catch (\Symfony\Component\Console\Exception\RuntimeException|\Symfony\Component\Console\Exception\InvalidArgumentException $e) {
+ } catch (\Symfony\Component\Console\Exception\RuntimeException|InvalidArgumentException $e) {
return $label . "\n"
. sprintf(
$this->getLanguageService()->sL('LLL:EXT:scheduler/Resources/Private/Language/locallang.xlf:msg.errorParsingArguments'),
diff --git a/typo3/sysext/scheduler/Classes/Task/FileStorageExtractionAdditionalFieldProvider.php b/typo3/sysext/scheduler/Classes/Task/FileStorageExtractionAdditionalFieldProvider.php
index 80c005605a34ace9faf97db06fa42410529e6078..0b65deb9c62ff47b7b474fdb0acbb974f7d0e2dc 100644
--- a/typo3/sysext/scheduler/Classes/Task/FileStorageExtractionAdditionalFieldProvider.php
+++ b/typo3/sysext/scheduler/Classes/Task/FileStorageExtractionAdditionalFieldProvider.php
@@ -18,6 +18,7 @@ namespace TYPO3\CMS\Scheduler\Task;
use TYPO3\CMS\Core\Resource\Index\ExtractorInterface;
use TYPO3\CMS\Core\Resource\Index\ExtractorRegistry;
use TYPO3\CMS\Core\Resource\ResourceFactory;
+use TYPO3\CMS\Core\Resource\StorageRepository;
use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Core\Utility\MathUtility;
use TYPO3\CMS\Scheduler\AdditionalFieldProviderInterface;
@@ -59,7 +60,7 @@ class FileStorageExtractionAdditionalFieldProvider implements AdditionalFieldPro
protected function getAllStoragesField(FileStorageExtractionTask $task = null)
{
/** @var \TYPO3\CMS\Core\Resource\ResourceStorage[] $storages */
- $storages = GeneralUtility::makeInstance(\TYPO3\CMS\Core\Resource\StorageRepository::class)->findAll();
+ $storages = GeneralUtility::makeInstance(StorageRepository::class)->findAll();
$options = [];
foreach ($storages as $storage) {
if ($task !== null && $task->storageUid === $storage->getUid()) {
diff --git a/typo3/sysext/scheduler/Classes/Task/FileStorageExtractionTask.php b/typo3/sysext/scheduler/Classes/Task/FileStorageExtractionTask.php
index 297a5768f4e6b1890419023f620aadae168abc90..1ad0059a807d2130da06672ffc3307135a717154 100644
--- a/typo3/sysext/scheduler/Classes/Task/FileStorageExtractionTask.php
+++ b/typo3/sysext/scheduler/Classes/Task/FileStorageExtractionTask.php
@@ -15,14 +15,16 @@
namespace TYPO3\CMS\Scheduler\Task;
+use TYPO3\CMS\Core\Resource\Index\Indexer;
use TYPO3\CMS\Core\Resource\ResourceFactory;
+use TYPO3\CMS\Core\Resource\ResourceStorage;
use TYPO3\CMS\Core\Utility\GeneralUtility;
/**
* This task which indexes files in storage
* @internal This class is a specific scheduler task implementation is not considered part of the Public TYPO3 API.
*/
-class FileStorageExtractionTask extends \TYPO3\CMS\Scheduler\Task\AbstractTask
+class FileStorageExtractionTask extends AbstractTask
{
/**
* Storage Uid
@@ -69,8 +71,8 @@ class FileStorageExtractionTask extends \TYPO3\CMS\Scheduler\Task\AbstractTask
* @param \TYPO3\CMS\Core\Resource\ResourceStorage $storage
* @return \TYPO3\CMS\Core\Resource\Index\Indexer
*/
- protected function getIndexer(\TYPO3\CMS\Core\Resource\ResourceStorage $storage)
+ protected function getIndexer(ResourceStorage $storage)
{
- return GeneralUtility::makeInstance(\TYPO3\CMS\Core\Resource\Index\Indexer::class, $storage);
+ return GeneralUtility::makeInstance(Indexer::class, $storage);
}
}
diff --git a/typo3/sysext/scheduler/Classes/Task/FileStorageIndexingAdditionalFieldProvider.php b/typo3/sysext/scheduler/Classes/Task/FileStorageIndexingAdditionalFieldProvider.php
index a38d0fdc3793d4d90add8ec945076065cc82ac18..2d38b08e8518723f096338433c14b5c0b82eb0b6 100644
--- a/typo3/sysext/scheduler/Classes/Task/FileStorageIndexingAdditionalFieldProvider.php
+++ b/typo3/sysext/scheduler/Classes/Task/FileStorageIndexingAdditionalFieldProvider.php
@@ -16,13 +16,17 @@
namespace TYPO3\CMS\Scheduler\Task;
use TYPO3\CMS\Core\Resource\ResourceFactory;
+use TYPO3\CMS\Core\Resource\StorageRepository;
use TYPO3\CMS\Core\Utility\GeneralUtility;
+use TYPO3\CMS\Core\Utility\MathUtility;
+use TYPO3\CMS\Scheduler\AdditionalFieldProviderInterface;
+use TYPO3\CMS\Scheduler\Controller\SchedulerModuleController;
/**
* Additional BE fields for tasks which indexes files in a storage
* @internal This class is a specific scheduler task implementation is not considered part of the Public TYPO3 API.
*/
-class FileStorageIndexingAdditionalFieldProvider implements \TYPO3\CMS\Scheduler\AdditionalFieldProviderInterface
+class FileStorageIndexingAdditionalFieldProvider implements AdditionalFieldProviderInterface
{
/**
* Add additional fields
@@ -33,7 +37,7 @@ class FileStorageIndexingAdditionalFieldProvider implements \TYPO3\CMS\Scheduler
* @return array Array containing all the information pertaining to the additional fields
* @throws \InvalidArgumentException
*/
- public function getAdditionalFields(array &$taskInfo, $task, \TYPO3\CMS\Scheduler\Controller\SchedulerModuleController $parentObject)
+ public function getAdditionalFields(array &$taskInfo, $task, SchedulerModuleController $parentObject)
{
if ($task !== null && !$task instanceof FileStorageIndexingTask) {
throw new \InvalidArgumentException('Task not of type FileStorageExtractionTask', 1384275696);
@@ -53,7 +57,7 @@ class FileStorageIndexingAdditionalFieldProvider implements \TYPO3\CMS\Scheduler
protected function getAllStoragesField(FileStorageIndexingTask $task = null, $taskInfo)
{
/** @var \TYPO3\CMS\Core\Resource\ResourceStorage[] $storages */
- $storages = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\TYPO3\CMS\Core\Resource\StorageRepository::class)->findAll();
+ $storages = GeneralUtility::makeInstance(StorageRepository::class)->findAll();
$options = [];
foreach ($storages as $storage) {
$selected = '';
@@ -85,10 +89,10 @@ class FileStorageIndexingAdditionalFieldProvider implements \TYPO3\CMS\Scheduler
* @param \TYPO3\CMS\Scheduler\Controller\SchedulerModuleController $parentObject Reference to the calling object (Scheduler's BE module)
* @return bool True if validation was ok (or selected class is not relevant), false otherwise
*/
- public function validateAdditionalFields(array &$submittedData, \TYPO3\CMS\Scheduler\Controller\SchedulerModuleController $parentObject)
+ public function validateAdditionalFields(array &$submittedData, SchedulerModuleController $parentObject)
{
$value = $submittedData['scheduler_fileStorageIndexing_storage'];
- if (!\TYPO3\CMS\Core\Utility\MathUtility::canBeInterpretedAsInteger($value)) {
+ if (!MathUtility::canBeInterpretedAsInteger($value)) {
return false;
}
if (GeneralUtility::makeInstance(ResourceFactory::class)->getStorageObject($submittedData['scheduler_fileStorageIndexing_storage']) !== null) {
@@ -104,7 +108,7 @@ class FileStorageIndexingAdditionalFieldProvider implements \TYPO3\CMS\Scheduler
* @param \TYPO3\CMS\Scheduler\Task\AbstractTask $task Reference to the current task object
* @throws \InvalidArgumentException
*/
- public function saveAdditionalFields(array $submittedData, \TYPO3\CMS\Scheduler\Task\AbstractTask $task)
+ public function saveAdditionalFields(array $submittedData, AbstractTask $task)
{
if (!$task instanceof FileStorageIndexingTask) {
throw new \InvalidArgumentException('Task not of type FileStorageExtractionTask', 1384275697);
diff --git a/typo3/sysext/scheduler/Classes/Task/FileStorageIndexingTask.php b/typo3/sysext/scheduler/Classes/Task/FileStorageIndexingTask.php
index 495651b4900f1568075a79aa369dea6a8c5051bb..6ff91cbafd6d22271d917538595ac47147cb5767 100644
--- a/typo3/sysext/scheduler/Classes/Task/FileStorageIndexingTask.php
+++ b/typo3/sysext/scheduler/Classes/Task/FileStorageIndexingTask.php
@@ -15,14 +15,16 @@
namespace TYPO3\CMS\Scheduler\Task;
+use TYPO3\CMS\Core\Resource\Index\Indexer;
use TYPO3\CMS\Core\Resource\ResourceFactory;
+use TYPO3\CMS\Core\Resource\ResourceStorage;
use TYPO3\CMS\Core\Utility\GeneralUtility;
/**
* This task tries to find changes in storage and writes them back to DB
* @internal This class is a specific scheduler task implementation is not considered part of the Public TYPO3 API.
*/
-class FileStorageIndexingTask extends \TYPO3\CMS\Scheduler\Task\AbstractTask
+class FileStorageIndexingTask extends AbstractTask
{
/**
* Storage Uid
@@ -55,8 +57,8 @@ class FileStorageIndexingTask extends \TYPO3\CMS\Scheduler\Task\AbstractTask
* @param \TYPO3\CMS\Core\Resource\ResourceStorage $storage
* @return \TYPO3\CMS\Core\Resource\Index\Indexer
*/
- protected function getIndexer(\TYPO3\CMS\Core\Resource\ResourceStorage $storage)
+ protected function getIndexer(ResourceStorage $storage)
{
- return GeneralUtility::makeInstance(\TYPO3\CMS\Core\Resource\Index\Indexer::class, $storage);
+ return GeneralUtility::makeInstance(Indexer::class, $storage);
}
}
diff --git a/typo3/sysext/scheduler/Classes/Task/RecyclerGarbageCollectionTask.php b/typo3/sysext/scheduler/Classes/Task/RecyclerGarbageCollectionTask.php
index 22000b916ca0fbede6518f6cee2a6e371a65aa4d..aeec46f37f995be90db1f65c4efb806ce6325ca5 100644
--- a/typo3/sysext/scheduler/Classes/Task/RecyclerGarbageCollectionTask.php
+++ b/typo3/sysext/scheduler/Classes/Task/RecyclerGarbageCollectionTask.php
@@ -30,7 +30,7 @@ use TYPO3\CMS\Core\Utility\GeneralUtility;
* does a "touch()" after the file is moved into the recycler folder.
* @internal This class is a specific scheduler task implementation is not considered part of the Public TYPO3 API.
*/
-class RecyclerGarbageCollectionTask extends \TYPO3\CMS\Scheduler\Task\AbstractTask
+class RecyclerGarbageCollectionTask extends AbstractTask
{
/**
* Elapsed period since last modification before a file will
diff --git a/typo3/sysext/scheduler/Tests/Functional/Tca/TaskGroupVisibleFieldsTest.php b/typo3/sysext/scheduler/Tests/Functional/Tca/TaskGroupVisibleFieldsTest.php
index 3cdb1c6e89bb69562c083e5da6102166a5b65d7e..329ab373a8b5c75798f6d64c3e4938cdabf35593 100644
--- a/typo3/sysext/scheduler/Tests/Functional/Tca/TaskGroupVisibleFieldsTest.php
+++ b/typo3/sysext/scheduler/Tests/Functional/Tca/TaskGroupVisibleFieldsTest.php
@@ -18,8 +18,9 @@ namespace TYPO3\CMS\Scheduler\Tests\Functional\Tca;
use TYPO3\CMS\Backend\Tests\Functional\Form\FormTestService;
use TYPO3\CMS\Core\Localization\LanguageService;
use TYPO3\CMS\Core\Utility\GeneralUtility;
+use TYPO3\TestingFramework\Core\Functional\FunctionalTestCase;
-class TaskGroupVisibleFieldsTest extends \TYPO3\TestingFramework\Core\Functional\FunctionalTestCase
+class TaskGroupVisibleFieldsTest extends FunctionalTestCase
{
/**
* @var array
diff --git a/typo3/sysext/scheduler/Tests/Unit/Task/CachingFrameworkGarbageCollectionTest.php b/typo3/sysext/scheduler/Tests/Unit/Task/CachingFrameworkGarbageCollectionTest.php
index 2a1d4d8809254268e1362d72588ecb0c06f38b9d..f9a50964812a4f4040d4346d372b17e4a68729bb 100644
--- a/typo3/sysext/scheduler/Tests/Unit/Task/CachingFrameworkGarbageCollectionTest.php
+++ b/typo3/sysext/scheduler/Tests/Unit/Task/CachingFrameworkGarbageCollectionTest.php
@@ -15,7 +15,12 @@
namespace TYPO3\CMS\Scheduler\Tests\Unit\Task;
+use TYPO3\CMS\Core\Cache\Backend\AbstractBackend;
+use TYPO3\CMS\Core\Cache\Backend\NullBackend;
+use TYPO3\CMS\Core\Cache\CacheManager;
+use TYPO3\CMS\Core\Cache\Frontend\VariableFrontend;
use TYPO3\CMS\Core\Utility\GeneralUtility;
+use TYPO3\CMS\Scheduler\Task\CachingFrameworkGarbageCollectionTask;
use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
/**
@@ -33,24 +38,24 @@ class CachingFrameworkGarbageCollectionTest extends UnitTestCase
*/
public function executeCallsCollectGarbageOfConfiguredBackend()
{
- $cache = $this->createMock(\TYPO3\CMS\Core\Cache\Frontend\VariableFrontend::class);
+ $cache = $this->createMock(VariableFrontend::class);
$cache->expects(self::any())->method('getIdentifier')->willReturn('cache');
$cache->expects(self::atLeastOnce())->method('collectGarbage');
- $mockCacheManager = new \TYPO3\CMS\Core\Cache\CacheManager();
+ $mockCacheManager = new CacheManager();
$mockCacheManager->registerCache($cache);
- GeneralUtility::setSingletonInstance(\TYPO3\CMS\Core\Cache\CacheManager::class, $mockCacheManager);
+ GeneralUtility::setSingletonInstance(CacheManager::class, $mockCacheManager);
$GLOBALS['TYPO3_CONF_VARS']['SYS']['caching']['cacheConfigurations'] = [
'cache' => [
- 'frontend' => \TYPO3\CMS\Core\Cache\Frontend\VariableFrontend::class,
- 'backend' => \TYPO3\CMS\Core\Cache\Backend\AbstractBackend::class,
+ 'frontend' => VariableFrontend::class,
+ 'backend' => AbstractBackend::class,
]
];
/** @var \TYPO3\CMS\Scheduler\Task\CachingFrameworkGarbageCollectionTask|\PHPUnit\Framework\MockObject\MockObject $subject */
- $subject = $this->getMockBuilder(\TYPO3\CMS\Scheduler\Task\CachingFrameworkGarbageCollectionTask::class)
+ $subject = $this->getMockBuilder(CachingFrameworkGarbageCollectionTask::class)
->setMethods(['dummy'])
->disableOriginalConstructor()
->getMock();
- $subject->selectedBackends = [\TYPO3\CMS\Core\Cache\Backend\AbstractBackend::class];
+ $subject->selectedBackends = [AbstractBackend::class];
$subject->execute();
}
@@ -59,24 +64,24 @@ class CachingFrameworkGarbageCollectionTest extends UnitTestCase
*/
public function executeDoesNotCallCollectGarbageOfNotConfiguredBackend()
{
- $cache = $this->createMock(\TYPO3\CMS\Core\Cache\Frontend\VariableFrontend::class);
+ $cache = $this->createMock(VariableFrontend::class);
$cache->expects(self::any())->method('getIdentifier')->willReturn('cache');
$cache->expects(self::never())->method('collectGarbage');
- $mockCacheManager = new \TYPO3\CMS\Core\Cache\CacheManager();
+ $mockCacheManager = new CacheManager();
$mockCacheManager->registerCache($cache);
- GeneralUtility::setSingletonInstance(\TYPO3\CMS\Core\Cache\CacheManager::class, $mockCacheManager);
+ GeneralUtility::setSingletonInstance(CacheManager::class, $mockCacheManager);
$GLOBALS['TYPO3_CONF_VARS']['SYS']['caching']['cacheConfigurations'] = [
'cache' => [
- 'frontend' => \TYPO3\CMS\Core\Cache\Frontend\VariableFrontend::class,
- 'backend' => \TYPO3\CMS\Core\Cache\Backend\AbstractBackend::class,
+ 'frontend' => VariableFrontend::class,
+ 'backend' => AbstractBackend::class,
]
];
/** @var \TYPO3\CMS\Scheduler\Task\CachingFrameworkGarbageCollectionTask|\PHPUnit\Framework\MockObject\MockObject $subject */
- $subject = $this->getMockBuilder(\TYPO3\CMS\Scheduler\Task\CachingFrameworkGarbageCollectionTask::class)
+ $subject = $this->getMockBuilder(CachingFrameworkGarbageCollectionTask::class)
->setMethods(['dummy'])
->disableOriginalConstructor()
->getMock();
- $subject->selectedBackends = [\TYPO3\CMS\Core\Cache\Backend\NullBackend::class];
+ $subject->selectedBackends = [NullBackend::class];
$subject->execute();
}
}
diff --git a/typo3/sysext/seo/Classes/XmlSitemap/Exception/InvalidConfigurationException.php b/typo3/sysext/seo/Classes/XmlSitemap/Exception/InvalidConfigurationException.php
index 496eba9e0ca65339088926dccb50ccb2555e49c3..2a9544046586fb90e448244b9b8fa151fed1deac 100644
--- a/typo3/sysext/seo/Classes/XmlSitemap/Exception/InvalidConfigurationException.php
+++ b/typo3/sysext/seo/Classes/XmlSitemap/Exception/InvalidConfigurationException.php
@@ -17,6 +17,8 @@ declare(strict_types=1);
namespace TYPO3\CMS\Seo\XmlSitemap\Exception;
-class InvalidConfigurationException extends \TYPO3\CMS\Core\Resource\Exception
+use TYPO3\CMS\Core\Resource\Exception;
+
+class InvalidConfigurationException extends Exception
{
}
diff --git a/typo3/sysext/seo/Classes/XmlSitemap/Exception/MissingConfigurationException.php b/typo3/sysext/seo/Classes/XmlSitemap/Exception/MissingConfigurationException.php
index cb1784da30090ae8c558379ac11a0c97fab5c17b..069364a6c919972e8d7d639af918125ceeed2132 100644
--- a/typo3/sysext/seo/Classes/XmlSitemap/Exception/MissingConfigurationException.php
+++ b/typo3/sysext/seo/Classes/XmlSitemap/Exception/MissingConfigurationException.php
@@ -17,6 +17,8 @@ declare(strict_types=1);
namespace TYPO3\CMS\Seo\XmlSitemap\Exception;
-class MissingConfigurationException extends \TYPO3\CMS\Core\Resource\Exception
+use TYPO3\CMS\Core\Resource\Exception;
+
+class MissingConfigurationException extends Exception
{
}
diff --git a/typo3/sysext/sys_note/Classes/Hook/PageHook.php b/typo3/sysext/sys_note/Classes/Hook/PageHook.php
index d24b19e234e10d1a88c63fae26f8eefdbfa126cd..ae7247348a6885e3732de255e5f6d6eea0cd6ae1 100644
--- a/typo3/sysext/sys_note/Classes/Hook/PageHook.php
+++ b/typo3/sysext/sys_note/Classes/Hook/PageHook.php
@@ -17,6 +17,7 @@ declare(strict_types=1);
namespace TYPO3\CMS\SysNote\Hook;
+use TYPO3\CMS\Backend\Controller\PageLayoutController;
use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\SysNote\Controller\NoteController;
use TYPO3\CMS\SysNote\Domain\Repository\SysNoteRepository;
@@ -35,7 +36,7 @@ class PageHook
* @param \TYPO3\CMS\Backend\Controller\PageLayoutController $parentObject
* @return string
*/
- public function renderInHeader(array $params = [], \TYPO3\CMS\Backend\Controller\PageLayoutController $parentObject)
+ public function renderInHeader(array $params = [], PageLayoutController $parentObject)
{
$controller = GeneralUtility::makeInstance(NoteController::class);
return $controller->listAction($parentObject->id, SysNoteRepository::SYS_NOTE_POSITION_TOP);
@@ -48,7 +49,7 @@ class PageHook
* @param \TYPO3\CMS\Backend\Controller\PageLayoutController $parentObject
* @return string
*/
- public function renderInFooter(array $params = [], \TYPO3\CMS\Backend\Controller\PageLayoutController $parentObject)
+ public function renderInFooter(array $params = [], PageLayoutController $parentObject)
{
$controller = GeneralUtility::makeInstance(NoteController::class);
return $controller->listAction($parentObject->id, SysNoteRepository::SYS_NOTE_POSITION_BOTTOM);
diff --git a/typo3/sysext/tstemplate/Classes/Controller/TemplateAnalyzerModuleFunctionController.php b/typo3/sysext/tstemplate/Classes/Controller/TemplateAnalyzerModuleFunctionController.php
index 08d7fc710073557ed701ef10a6e0eb6dd83153c7..81a6dce3cf8292275c274a8df872cf9b9c3fbfea 100644
--- a/typo3/sysext/tstemplate/Classes/Controller/TemplateAnalyzerModuleFunctionController.php
+++ b/typo3/sysext/tstemplate/Classes/Controller/TemplateAnalyzerModuleFunctionController.php
@@ -16,6 +16,7 @@
namespace TYPO3\CMS\Tstemplate\Controller;
use Psr\Http\Message\ServerRequestInterface;
+use TYPO3\CMS\Backend\Routing\UriBuilder;
use TYPO3\CMS\Backend\Utility\BackendUtility;
use TYPO3\CMS\Core\Localization\LanguageService;
use TYPO3\CMS\Core\TypoScript\ExtendedTemplateService;
@@ -161,7 +162,7 @@ class TemplateAnalyzerModuleFunctionController
'template' => 'all'
];
/** @var \TYPO3\CMS\Backend\Routing\UriBuilder $uriBuilder */
- $uriBuilder = GeneralUtility::makeInstance(\TYPO3\CMS\Backend\Routing\UriBuilder::class);
+ $uriBuilder = GeneralUtility::makeInstance(UriBuilder::class);
$assigns['moduleLink'] = (string)$uriBuilder->buildUriFromRoute('web_ts', $urlParameters);
$assigns['template'] = $template = ($this->request->getQueryParams()['template'] ?? null);
diff --git a/typo3/sysext/tstemplate/Classes/Controller/TypoScriptTemplateInformationModuleFunctionController.php b/typo3/sysext/tstemplate/Classes/Controller/TypoScriptTemplateInformationModuleFunctionController.php
index 385e8dc25500586721e159fb50c22e3057a381fa..0eea70be467b199d94bab33b203fdb7956347b64 100644
--- a/typo3/sysext/tstemplate/Classes/Controller/TypoScriptTemplateInformationModuleFunctionController.php
+++ b/typo3/sysext/tstemplate/Classes/Controller/TypoScriptTemplateInformationModuleFunctionController.php
@@ -16,6 +16,7 @@
namespace TYPO3\CMS\Tstemplate\Controller;
use Psr\Http\Message\ServerRequestInterface;
+use TYPO3\CMS\Backend\Routing\UriBuilder;
use TYPO3\CMS\Core\Localization\LanguageService;
use TYPO3\CMS\Core\TypoScript\ExtendedTemplateService;
use TYPO3\CMS\Core\Utility\GeneralUtility;
@@ -91,7 +92,7 @@ class TypoScriptTemplateInformationModuleFunctionController
'returnUrl' => GeneralUtility::getIndpEnv('REQUEST_URI')
];
/** @var \TYPO3\CMS\Backend\Routing\UriBuilder $uriBuilder */
- $uriBuilder = GeneralUtility::makeInstance(\TYPO3\CMS\Backend\Routing\UriBuilder::class);
+ $uriBuilder = GeneralUtility::makeInstance(UriBuilder::class);
$url = (string)$uriBuilder->buildUriFromRoute('record_edit', $urlParameters);
return [
@@ -144,7 +145,7 @@ class TypoScriptTemplateInformationModuleFunctionController
$saveId = $this->templateRow['_ORIG_uid'] ?: $this->templateRow['uid'];
}
/** @var \TYPO3\CMS\Backend\Routing\UriBuilder $uriBuilder */
- $uriBuilder = GeneralUtility::makeInstance(\TYPO3\CMS\Backend\Routing\UriBuilder::class);
+ $uriBuilder = GeneralUtility::makeInstance(UriBuilder::class);
// Create extension template
$newId = $this->pObj->createTemplate($this->id, (int)$saveId);
if ($newId) {
diff --git a/typo3/sysext/tstemplate/Classes/Controller/TypoScriptTemplateModuleController.php b/typo3/sysext/tstemplate/Classes/Controller/TypoScriptTemplateModuleController.php
index 6d00a2b51007f8293c3ce67c84d971a682c11203..3e8a4d18f07a358a4f2caf5c16f0437c69dee666 100644
--- a/typo3/sysext/tstemplate/Classes/Controller/TypoScriptTemplateModuleController.php
+++ b/typo3/sysext/tstemplate/Classes/Controller/TypoScriptTemplateModuleController.php
@@ -396,7 +396,7 @@ class TypoScriptTemplateModuleController
} else {
$urlParameters['e'] = ['constants' => 1];
}
- $urlParameters['SET'] = ['function' => \TYPO3\CMS\Tstemplate\Controller\TypoScriptTemplateInformationModuleFunctionController::class];
+ $urlParameters['SET'] = ['function' => TypoScriptTemplateInformationModuleFunctionController::class];
$uriBuilder = GeneralUtility::makeInstance(UriBuilder::class);
$url = (string)$uriBuilder->buildUriFromRoute('web_ts', $urlParameters);
return '<a href="' . htmlspecialchars($url) . '">' . htmlspecialchars($title) . '</a>';
diff --git a/typo3/sysext/tstemplate/Classes/Controller/TypoScriptTemplateObjectBrowserModuleFunctionController.php b/typo3/sysext/tstemplate/Classes/Controller/TypoScriptTemplateObjectBrowserModuleFunctionController.php
index d6ce8b89acb7e449d45d7028f28f8c589d14a822..2478772d803bf76fac30804b0575bcec132772bc 100644
--- a/typo3/sysext/tstemplate/Classes/Controller/TypoScriptTemplateObjectBrowserModuleFunctionController.php
+++ b/typo3/sysext/tstemplate/Classes/Controller/TypoScriptTemplateObjectBrowserModuleFunctionController.php
@@ -16,6 +16,7 @@
namespace TYPO3\CMS\Tstemplate\Controller;
use Psr\Http\Message\ServerRequestInterface;
+use TYPO3\CMS\Backend\Routing\UriBuilder;
use TYPO3\CMS\Backend\Utility\BackendUtility;
use TYPO3\CMS\Core\Authentication\BackendUserAuthentication;
use TYPO3\CMS\Core\DataHandling\DataHandler;
@@ -294,7 +295,7 @@ class TypoScriptTemplateObjectBrowserModuleFunctionController
'id' => $this->id
];
/** @var \TYPO3\CMS\Backend\Routing\UriBuilder $uriBuilder */
- $uriBuilder = GeneralUtility::makeInstance(\TYPO3\CMS\Backend\Routing\UriBuilder::class);
+ $uriBuilder = GeneralUtility::makeInstance(UriBuilder::class);
$aHref = (string)$uriBuilder->buildUriFromRoute('web_ts', $urlParameters);
$assigns['moduleUrl'] = (string)$uriBuilder->buildUriFromRoute('web_ts', $urlParameters);
$assigns['isNotInTopLevelKeyList'] = !isset($this->pObj->MOD_SETTINGS['ts_browser_TLKeys_' . $bType][$sObj]);
@@ -347,7 +348,7 @@ class TypoScriptTemplateObjectBrowserModuleFunctionController
'id' => $this->id
];
/** @var \TYPO3\CMS\Backend\Routing\UriBuilder $uriBuilder */
- $uriBuilder = GeneralUtility::makeInstance(\TYPO3\CMS\Backend\Routing\UriBuilder::class);
+ $uriBuilder = GeneralUtility::makeInstance(UriBuilder::class);
$aHref = (string)$uriBuilder->buildUriFromRoute('web_ts', $urlParameters);
// Parser Errors:
$pEkey = $bType === 'setup' ? 'config' : 'constants';
diff --git a/typo3/sysext/viewpage/Classes/Controller/ViewModuleController.php b/typo3/sysext/viewpage/Classes/Controller/ViewModuleController.php
index 4a71e66192ef33dd7c43564160ad1d3f3f0bb1ba..43abbb3ffb0626ebdb62d79ce552b1467ec55e57 100644
--- a/typo3/sysext/viewpage/Classes/Controller/ViewModuleController.php
+++ b/typo3/sysext/viewpage/Classes/Controller/ViewModuleController.php
@@ -19,6 +19,7 @@ namespace TYPO3\CMS\Viewpage\Controller;
use Psr\Http\Message\ResponseInterface;
use Psr\Http\Message\ServerRequestInterface;
+use TYPO3\CMS\Backend\Routing\UriBuilder;
use TYPO3\CMS\Backend\Template\Components\ButtonBar;
use TYPO3\CMS\Backend\Template\ModuleTemplate;
use TYPO3\CMS\Backend\Utility\BackendUtility;
@@ -98,7 +99,7 @@ class ViewModuleController
$languageMenu = $this->moduleTemplate->getDocHeaderComponent()->getMenuRegistry()->makeMenu();
$languageMenu->setIdentifier('_langSelector');
/** @var \TYPO3\CMS\Backend\Routing\UriBuilder $uriBuilder */
- $uriBuilder = GeneralUtility::makeInstance(\TYPO3\CMS\Backend\Routing\UriBuilder::class);
+ $uriBuilder = GeneralUtility::makeInstance(UriBuilder::class);
foreach ($languages as $value => $label) {
$href = (string)$uriBuilder->buildUriFromRoute(
'web_ViewpageView',
diff --git a/typo3/sysext/workspaces/Classes/ColumnDataProviderInterface.php b/typo3/sysext/workspaces/Classes/ColumnDataProviderInterface.php
index 21783bbdf9f15831c60079f58f327878ecc69038..b05379caf84f6e28285c0886ab141e97d82b7137 100644
--- a/typo3/sysext/workspaces/Classes/ColumnDataProviderInterface.php
+++ b/typo3/sysext/workspaces/Classes/ColumnDataProviderInterface.php
@@ -15,6 +15,8 @@
namespace TYPO3\CMS\Workspaces;
+use TYPO3\CMS\Workspaces\Domain\Model\CombinedRecord;
+
/**
* Interface for (additional) columns.
*/
@@ -29,5 +31,5 @@ interface ColumnDataProviderInterface
* @param Domain\Model\CombinedRecord $combinedRecord
* @return string|int|array
*/
- public function getData(\TYPO3\CMS\Workspaces\Domain\Model\CombinedRecord $combinedRecord);
+ public function getData(CombinedRecord $combinedRecord);
}
diff --git a/typo3/sysext/workspaces/Classes/Service/Dependency/CollectionService.php b/typo3/sysext/workspaces/Classes/Service/Dependency/CollectionService.php
index 57e11e8e2da33bf5d474aef0c1544e20e2e613ea..2e59a390747dc82fb4f0440fa7ea26a0219cc20e 100644
--- a/typo3/sysext/workspaces/Classes/Service/Dependency/CollectionService.php
+++ b/typo3/sysext/workspaces/Classes/Service/Dependency/CollectionService.php
@@ -18,6 +18,10 @@ namespace TYPO3\CMS\Workspaces\Service\Dependency;
use TYPO3\CMS\Core\SingletonInterface;
use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Workspaces\Dependency;
+use TYPO3\CMS\Workspaces\Dependency\DependencyResolver;
+use TYPO3\CMS\Workspaces\Dependency\ElementEntity;
+use TYPO3\CMS\Workspaces\Dependency\ElementEntityProcessor;
+use TYPO3\CMS\Workspaces\Dependency\EventCallback;
use TYPO3\CMS\Workspaces\Service\GridDataService;
/**
@@ -56,22 +60,22 @@ class CollectionService implements SingletonInterface
public function getDependencyResolver()
{
if (!isset($this->dependencyResolver)) {
- $this->dependencyResolver = GeneralUtility::makeInstance(Dependency\DependencyResolver::class);
+ $this->dependencyResolver = GeneralUtility::makeInstance(DependencyResolver::class);
$this->dependencyResolver->setOuterMostParentsRequireReferences(true);
$this->dependencyResolver->setWorkspace($this->getWorkspace());
$this->dependencyResolver->setEventCallback(
- Dependency\ElementEntity::EVENT_Construct,
+ ElementEntity::EVENT_Construct,
$this->getDependencyCallback('createNewDependentElementCallback')
);
$this->dependencyResolver->setEventCallback(
- Dependency\ElementEntity::EVENT_CreateChildReference,
+ ElementEntity::EVENT_CreateChildReference,
$this->getDependencyCallback('createNewDependentElementChildReferenceCallback')
);
$this->dependencyResolver->setEventCallback(
- Dependency\ElementEntity::EVENT_CreateParentReference,
+ ElementEntity::EVENT_CreateParentReference,
$this->getDependencyCallback('createNewDependentElementParentReferenceCallback')
);
}
@@ -89,7 +93,7 @@ class CollectionService implements SingletonInterface
protected function getDependencyCallback($method, array $targetArguments = [])
{
return GeneralUtility::makeInstance(
- Dependency\EventCallback::class,
+ EventCallback::class,
$this->getElementEntityProcessor(),
$method,
$targetArguments
@@ -104,7 +108,7 @@ class CollectionService implements SingletonInterface
protected function getElementEntityProcessor()
{
if (!isset($this->elementEntityProcessor)) {
- $this->elementEntityProcessor = GeneralUtility::makeInstance(Dependency\ElementEntityProcessor::class);
+ $this->elementEntityProcessor = GeneralUtility::makeInstance(ElementEntityProcessor::class);
$this->elementEntityProcessor->setWorkspace($this->getWorkspace());
}
return $this->elementEntityProcessor;
@@ -188,7 +192,7 @@ class CollectionService implements SingletonInterface
* @param string $nextParentIdentifier
* @param int $collectionLevel
*/
- protected function resolveDataArrayChildDependencies(Dependency\ElementEntity $parent, $collection, $nextParentIdentifier = '', $collectionLevel = 0)
+ protected function resolveDataArrayChildDependencies(ElementEntity $parent, $collection, $nextParentIdentifier = '', $collectionLevel = 0)
{
$parentIdentifier = $parent->__toString();
$parentIsSet = isset($this->dataArray[$parentIdentifier]);
diff --git a/typo3/sysext/workspaces/Classes/Service/GridDataService.php b/typo3/sysext/workspaces/Classes/Service/GridDataService.php
index 9e3693d6000bee6b8fdf769b2ef3b93c7c191e80..4cda2383e0370535a24abda185a0c09cbafb08cc 100644
--- a/typo3/sysext/workspaces/Classes/Service/GridDataService.php
+++ b/typo3/sysext/workspaces/Classes/Service/GridDataService.php
@@ -32,6 +32,7 @@ use TYPO3\CMS\Workspaces\Event\AfterDataGeneratedForWorkspaceEvent;
use TYPO3\CMS\Workspaces\Event\GetVersionedDataEvent;
use TYPO3\CMS\Workspaces\Event\SortVersionedDataEvent;
use TYPO3\CMS\Workspaces\Preview\PreviewUriBuilder;
+use TYPO3\CMS\Workspaces\Service\Dependency\CollectionService;
/**
* Grid data service
@@ -664,7 +665,7 @@ class GridDataService implements LoggerAwareInterface
*/
protected function getDependencyCollectionService()
{
- return GeneralUtility::makeInstance(Dependency\CollectionService::class);
+ return GeneralUtility::makeInstance(CollectionService::class);
}
/**
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Modify/ActionTest.php b/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Modify/ActionTest.php
index 965c2a86c62274d06804bbfd8268387d48c34992..5d4649b938baa55dd30032cd56ed2bc40636c026 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Modify/ActionTest.php
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Modify/ActionTest.php
@@ -15,10 +15,12 @@
namespace TYPO3\CMS\Workspaces\Tests\Functional\DataHandling\FAL\Modify;
+use TYPO3\CMS\Workspaces\Tests\Functional\DataHandling\FAL\AbstractActionTestCase;
+
/**
* Functional test for the DataHandler
*/
-class ActionTest extends \TYPO3\CMS\Workspaces\Tests\Functional\DataHandling\FAL\AbstractActionTestCase
+class ActionTest extends AbstractActionTestCase
{
/**
* @var string
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Publish/ActionTest.php b/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Publish/ActionTest.php
index da54d7d162da6ca021be6a93ec30f75816065572..57a920437aa9cc292435ffdf9037148314930354 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Publish/ActionTest.php
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/Publish/ActionTest.php
@@ -15,10 +15,12 @@
namespace TYPO3\CMS\Workspaces\Tests\Functional\DataHandling\FAL\Publish;
+use TYPO3\CMS\Workspaces\Tests\Functional\DataHandling\FAL\AbstractActionTestCase;
+
/**
* Functional test for the DataHandler
*/
-class ActionTest extends \TYPO3\CMS\Workspaces\Tests\Functional\DataHandling\FAL\AbstractActionTestCase
+class ActionTest extends AbstractActionTestCase
{
/**
* @var string
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/PublishAll/ActionTest.php b/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/PublishAll/ActionTest.php
index e060c393e2daed31c44fc188b77fd4f969b172bf..aeb3efc912c2c0a7b624289397a98b292caacbc9 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/PublishAll/ActionTest.php
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/PublishAll/ActionTest.php
@@ -15,10 +15,12 @@
namespace TYPO3\CMS\Workspaces\Tests\Functional\DataHandling\FAL\PublishAll;
+use TYPO3\CMS\Workspaces\Tests\Functional\DataHandling\FAL\AbstractActionTestCase;
+
/**
* Functional test for the DataHandler
*/
-class ActionTest extends \TYPO3\CMS\Workspaces\Tests\Functional\DataHandling\FAL\AbstractActionTestCase
+class ActionTest extends AbstractActionTestCase
{
/**
* @var string
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Group/Modify/ActionTest.php b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Group/Modify/ActionTest.php
index 9655b0ac5186169478bba1fa6c63d1d699f08503..aea740729f33bce926950531e1b2df0232144b0e 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Group/Modify/ActionTest.php
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Group/Modify/ActionTest.php
@@ -15,10 +15,12 @@
namespace TYPO3\CMS\Workspaces\Tests\Functional\DataHandling\Group\Modify;
+use TYPO3\CMS\Workspaces\Tests\Functional\DataHandling\Group\AbstractActionTestCase;
+
/**
* Functional test for the DataHandler
*/
-class ActionTest extends \TYPO3\CMS\Workspaces\Tests\Functional\DataHandling\Group\AbstractActionTestCase
+class ActionTest extends AbstractActionTestCase
{
/**
* @var string
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Group/Publish/ActionTest.php b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Group/Publish/ActionTest.php
index 2cd5b4555cae25044a83c21525a90dd6a4043f86..c61c7d2e4dff79fd24c57791ca6c6bbba6184690 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Group/Publish/ActionTest.php
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Group/Publish/ActionTest.php
@@ -15,10 +15,12 @@
namespace TYPO3\CMS\Workspaces\Tests\Functional\DataHandling\Group\Publish;
+use TYPO3\CMS\Workspaces\Tests\Functional\DataHandling\Group\AbstractActionTestCase;
+
/**
* Functional test for the DataHandler
*/
-class ActionTest extends \TYPO3\CMS\Workspaces\Tests\Functional\DataHandling\Group\AbstractActionTestCase
+class ActionTest extends AbstractActionTestCase
{
/**
* @var string
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Group/PublishAll/ActionTest.php b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Group/PublishAll/ActionTest.php
index 819c504d3b1293f867d13d7518f5930521c5b492..79a79411c6a1c5e327353d024ffa1c311bd303f5 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Group/PublishAll/ActionTest.php
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Group/PublishAll/ActionTest.php
@@ -15,10 +15,12 @@
namespace TYPO3\CMS\Workspaces\Tests\Functional\DataHandling\Group\PublishAll;
+use TYPO3\CMS\Workspaces\Tests\Functional\DataHandling\Group\AbstractActionTestCase;
+
/**
* Functional test for the DataHandler
*/
-class ActionTest extends \TYPO3\CMS\Workspaces\Tests\Functional\DataHandling\Group\AbstractActionTestCase
+class ActionTest extends AbstractActionTestCase
{
/**
* @var string
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Modify/ActionTest.php b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Modify/ActionTest.php
index aa9e7c26df5e6f2f91fc4c90053e72e4c8449721..7aef4e31414c6716f30d5eddcd32b1b818385f38 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Modify/ActionTest.php
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Modify/ActionTest.php
@@ -15,13 +15,14 @@
namespace TYPO3\CMS\Workspaces\Tests\Functional\DataHandling\IRRE\CSV\Modify;
+use TYPO3\CMS\Workspaces\Tests\Functional\DataHandling\IRRE\CSV\AbstractActionTestCase;
use TYPO3\TestingFramework\Core\Functional\Framework\Frontend\InternalRequest;
use TYPO3\TestingFramework\Core\Functional\Framework\Frontend\InternalRequestContext;
/**
* Functional test for the DataHandler
*/
-class ActionTest extends \TYPO3\CMS\Workspaces\Tests\Functional\DataHandling\IRRE\CSV\AbstractActionTestCase
+class ActionTest extends AbstractActionTestCase
{
/**
* @var string
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Publish/ActionTest.php b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Publish/ActionTest.php
index 83adb2438e0b101571c0d00a9e92c32eb4472e17..ecb54268e8199cc736c9c2826f369ea552d92979 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Publish/ActionTest.php
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Publish/ActionTest.php
@@ -15,12 +15,13 @@
namespace TYPO3\CMS\Workspaces\Tests\Functional\DataHandling\IRRE\CSV\Publish;
+use TYPO3\CMS\Workspaces\Tests\Functional\DataHandling\IRRE\CSV\AbstractActionTestCase;
use TYPO3\TestingFramework\Core\Functional\Framework\Frontend\InternalRequest;
/**
* Functional test for the DataHandler
*/
-class ActionTest extends \TYPO3\CMS\Workspaces\Tests\Functional\DataHandling\IRRE\CSV\AbstractActionTestCase
+class ActionTest extends AbstractActionTestCase
{
/**
* @var string
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/PublishAll/ActionTest.php b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/PublishAll/ActionTest.php
index 19e811ce3c72d08ee9f87b098e276dc3262cfae0..37f9290d3e4c15e7c7097751a72b5a8e7fadb82e 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/PublishAll/ActionTest.php
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/PublishAll/ActionTest.php
@@ -15,12 +15,13 @@
namespace TYPO3\CMS\Workspaces\Tests\Functional\DataHandling\IRRE\CSV\PublishAll;
+use TYPO3\CMS\Workspaces\Tests\Functional\DataHandling\IRRE\CSV\AbstractActionTestCase;
use TYPO3\TestingFramework\Core\Functional\Framework\Frontend\InternalRequest;
/**
* Functional test for the DataHandler
*/
-class ActionTest extends \TYPO3\CMS\Workspaces\Tests\Functional\DataHandling\IRRE\CSV\AbstractActionTestCase
+class ActionTest extends AbstractActionTestCase
{
/**
* @var string
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/ActionTest.php b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/ActionTest.php
index d41890d29f432da7f6281fb5b2695202b82c85b6..af7e9f32c65d5dfaf87a883706c017e3b4266c08 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/ActionTest.php
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/ActionTest.php
@@ -15,13 +15,14 @@
namespace TYPO3\CMS\Workspaces\Tests\Functional\DataHandling\IRRE\ForeignField\Modify;
+use TYPO3\CMS\Workspaces\Tests\Functional\DataHandling\IRRE\ForeignField\AbstractActionTestCase;
use TYPO3\TestingFramework\Core\Functional\Framework\Frontend\InternalRequest;
use TYPO3\TestingFramework\Core\Functional\Framework\Frontend\InternalRequestContext;
/**
* Functional test for the DataHandler
*/
-class ActionTest extends \TYPO3\CMS\Workspaces\Tests\Functional\DataHandling\IRRE\ForeignField\AbstractActionTestCase
+class ActionTest extends AbstractActionTestCase
{
/**
* @var string
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/ActionTest.php b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/ActionTest.php
index dc7cb60a1f97af2378f34089b31c8bdf672fbbd0..74bb602d6e81d384895072ea1b723edb76275d45 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/ActionTest.php
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/ActionTest.php
@@ -15,12 +15,13 @@
namespace TYPO3\CMS\Workspaces\Tests\Functional\DataHandling\IRRE\ForeignField\Publish;
+use TYPO3\CMS\Workspaces\Tests\Functional\DataHandling\IRRE\ForeignField\AbstractActionTestCase;
use TYPO3\TestingFramework\Core\Functional\Framework\Frontend\InternalRequest;
/**
* Functional test for the DataHandler
*/
-class ActionTest extends \TYPO3\CMS\Workspaces\Tests\Functional\DataHandling\IRRE\ForeignField\AbstractActionTestCase
+class ActionTest extends AbstractActionTestCase
{
/**
* @var string
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/ActionTest.php b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/ActionTest.php
index 734f96fcd85afb5bd7c8ac7af151530f076cae76..696be2d1d65b3964a13480436ba6e0efa072f107 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/ActionTest.php
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/ActionTest.php
@@ -15,12 +15,13 @@
namespace TYPO3\CMS\Workspaces\Tests\Functional\DataHandling\IRRE\ForeignField\PublishAll;
+use TYPO3\CMS\Workspaces\Tests\Functional\DataHandling\IRRE\ForeignField\AbstractActionTestCase;
use TYPO3\TestingFramework\Core\Functional\Framework\Frontend\InternalRequest;
/**
* Functional test for the DataHandler
*/
-class ActionTest extends \TYPO3\CMS\Workspaces\Tests\Functional\DataHandling\IRRE\ForeignField\AbstractActionTestCase
+class ActionTest extends AbstractActionTestCase
{
/**
* @var string
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/Modify/ActionTest.php b/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/Modify/ActionTest.php
index 5151a21d7a85500dc156ddb77506fa7bafee05b3..eb37bcc4f0e4f416a48186d676339edb567c13f7 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/Modify/ActionTest.php
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/Modify/ActionTest.php
@@ -15,10 +15,12 @@
namespace TYPO3\CMS\Workspaces\Tests\Functional\DataHandling\ManyToMany\Modify;
+use TYPO3\CMS\Workspaces\Tests\Functional\DataHandling\ManyToMany\AbstractActionTestCase;
+
/**
* Functional test for the DataHandler
*/
-class ActionTest extends \TYPO3\CMS\Workspaces\Tests\Functional\DataHandling\ManyToMany\AbstractActionTestCase
+class ActionTest extends AbstractActionTestCase
{
/**
* @var string
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/Publish/ActionTest.php b/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/Publish/ActionTest.php
index 6578463aae97e22e956eb4c9dcd26825b74ff9e4..dbca75816fa8970a62d7c30adffb8c01b7611c9b 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/Publish/ActionTest.php
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/Publish/ActionTest.php
@@ -15,10 +15,12 @@
namespace TYPO3\CMS\Workspaces\Tests\Functional\DataHandling\ManyToMany\Publish;
+use TYPO3\CMS\Workspaces\Tests\Functional\DataHandling\ManyToMany\AbstractActionTestCase;
+
/**
* Functional test for the DataHandler
*/
-class ActionTest extends \TYPO3\CMS\Workspaces\Tests\Functional\DataHandling\ManyToMany\AbstractActionTestCase
+class ActionTest extends AbstractActionTestCase
{
/**
* @var string
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/PublishAll/ActionTest.php b/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/PublishAll/ActionTest.php
index f5001cd8222c7e469c9933d63c269c7cdf1fdc54..a2f3e9ba8602cf4b113912143ab5f4f367f829b5 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/PublishAll/ActionTest.php
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/PublishAll/ActionTest.php
@@ -15,10 +15,12 @@
namespace TYPO3\CMS\Workspaces\Tests\Functional\DataHandling\ManyToMany\PublishAll;
+use TYPO3\CMS\Workspaces\Tests\Functional\DataHandling\ManyToMany\AbstractActionTestCase;
+
/**
* Functional test for the DataHandler
*/
-class ActionTest extends \TYPO3\CMS\Workspaces\Tests\Functional\DataHandling\ManyToMany\AbstractActionTestCase
+class ActionTest extends AbstractActionTestCase
{
/**
* @var string
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/ActionTest.php b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/ActionTest.php
index f02bda491a839e46876a432594100e61694b0d77..227f63f389f5114b487dc3fe353bf0fac46e935a 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/ActionTest.php
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/ActionTest.php
@@ -15,13 +15,14 @@
namespace TYPO3\CMS\Workspaces\Tests\Functional\DataHandling\Regular\Modify;
+use TYPO3\CMS\Workspaces\Tests\Functional\DataHandling\Regular\AbstractActionTestCase;
use TYPO3\TestingFramework\Core\Functional\Framework\Frontend\InternalRequest;
use TYPO3\TestingFramework\Core\Functional\Framework\Frontend\InternalRequestContext;
/**
* Functional test for the DataHandler
*/
-class ActionTest extends \TYPO3\CMS\Workspaces\Tests\Functional\DataHandling\Regular\AbstractActionTestCase
+class ActionTest extends AbstractActionTestCase
{
/**
* @var string
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/ActionTest.php b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/ActionTest.php
index af3352bf06897d1450cc499425184cfbfafe73b4..5255a8f62d1b6f956dbb1b75712bb2ba98f466bf 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/ActionTest.php
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/ActionTest.php
@@ -15,12 +15,13 @@
namespace TYPO3\CMS\Workspaces\Tests\Functional\DataHandling\Regular\Publish;
+use TYPO3\CMS\Workspaces\Tests\Functional\DataHandling\Regular\AbstractActionTestCase;
use TYPO3\TestingFramework\Core\Functional\Framework\Frontend\InternalRequest;
/**
* Functional test for the DataHandler
*/
-class ActionTest extends \TYPO3\CMS\Workspaces\Tests\Functional\DataHandling\Regular\AbstractActionTestCase
+class ActionTest extends AbstractActionTestCase
{
/**
* @var string
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/ActionTest.php b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/ActionTest.php
index 3e69fa44d35e8c131dee2e7c27495d63fe0193b0..ecdf0098c93f565a606c8ecf910565ce27a3e9eb 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/ActionTest.php
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/ActionTest.php
@@ -15,12 +15,13 @@
namespace TYPO3\CMS\Workspaces\Tests\Functional\DataHandling\Regular\PublishAll;
+use TYPO3\CMS\Workspaces\Tests\Functional\DataHandling\Regular\AbstractActionTestCase;
use TYPO3\TestingFramework\Core\Functional\Framework\Frontend\InternalRequest;
/**
* Functional test for the DataHandler
*/
-class ActionTest extends \TYPO3\CMS\Workspaces\Tests\Functional\DataHandling\Regular\AbstractActionTestCase
+class ActionTest extends AbstractActionTestCase
{
/**
* @var string
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Select/Modify/ActionTest.php b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Select/Modify/ActionTest.php
index cf14dc8376b677fc3875b35a76745957884344c8..10c8db3e0e9c1404dac3302307ba795b8589485f 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Select/Modify/ActionTest.php
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Select/Modify/ActionTest.php
@@ -15,10 +15,12 @@
namespace TYPO3\CMS\Workspaces\Tests\Functional\DataHandling\Select\Modify;
+use TYPO3\CMS\Workspaces\Tests\Functional\DataHandling\Select\AbstractActionTestCase;
+
/**
* Functional test for the DataHandler
*/
-class ActionTest extends \TYPO3\CMS\Workspaces\Tests\Functional\DataHandling\Select\AbstractActionTestCase
+class ActionTest extends AbstractActionTestCase
{
/**
* @var string
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Select/Publish/ActionTest.php b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Select/Publish/ActionTest.php
index 69637e8df1801b826e57da6f4b9cd3f28b762ce6..9ec73424b9a8f678af74a4bf82a334f91ed66450 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Select/Publish/ActionTest.php
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Select/Publish/ActionTest.php
@@ -15,10 +15,12 @@
namespace TYPO3\CMS\Workspaces\Tests\Functional\DataHandling\Select\Publish;
+use TYPO3\CMS\Workspaces\Tests\Functional\DataHandling\Select\AbstractActionTestCase;
+
/**
* Functional test for the DataHandler
*/
-class ActionTest extends \TYPO3\CMS\Workspaces\Tests\Functional\DataHandling\Select\AbstractActionTestCase
+class ActionTest extends AbstractActionTestCase
{
/**
* @var string
diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Select/PublishAll/ActionTest.php b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Select/PublishAll/ActionTest.php
index f3f0136b78eb76e9762a9f67d12460bd9e5eada7..feb254a866a55fb6e2755272ad3f227ba0db9414 100644
--- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Select/PublishAll/ActionTest.php
+++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Select/PublishAll/ActionTest.php
@@ -15,10 +15,12 @@
namespace TYPO3\CMS\Workspaces\Tests\Functional\DataHandling\Select\PublishAll;
+use TYPO3\CMS\Workspaces\Tests\Functional\DataHandling\Select\AbstractActionTestCase;
+
/**
* Functional test for the DataHandler
*/
-class ActionTest extends \TYPO3\CMS\Workspaces\Tests\Functional\DataHandling\Select\AbstractActionTestCase
+class ActionTest extends AbstractActionTestCase
{
/**
* @var string