From 7b045d930b7355a695969c42baa76f86410ccd35 Mon Sep 17 00:00:00 2001
From: Wouter Wolters <typo3@wouterwolters.nl>
Date: Thu, 14 Apr 2016 21:46:35 +0200
Subject: [PATCH] [TASK] Apply CGL compatibility (PSR-1 and PSR-2)
Change-Id: I6fb8b355ceb4f734e4df5aaf2954c624693c11ad
Reviewed-on: https://review.typo3.org/47677
Reviewed-by: Georg Ringer <georg.ringer@gmail.com>
Tested-by: Georg Ringer <georg.ringer@gmail.com>
Reviewed-by: Daniel Goerz <ervaude@gmail.com>
Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
Tested-by: Christian Kuhn <lolli@schwarzbu.ch>
---
.../Classes/Form/Container/SingleFieldContainer.php | 2 +-
.../Form/Element/ImageManipulationElement.php | 1 -
.../Form/FormDataProvider/AbstractItemProvider.php | 1 -
.../Classes/Form/FormDataProvider/TcaFlexProcess.php | 1 -
typo3/sysext/backend/Classes/Module/ModuleLoader.php | 2 --
.../Classes/Tree/Pagetree/ExtdirectTreeCommands.php | 2 +-
.../backend/Classes/ViewHelpers/AvatarViewHelper.php | 2 +-
typo3/sysext/backend/Resources/Private/Php/cli.php | 2 +-
.../Controller/Page/LocalizationControllerTest.php | 2 +-
.../Tests/Unit/Form/Element/InputTextElementTest.php | 1 -
.../Tests/Unit/Form/Wizard/SuggestWizardTest.php | 2 +-
.../Tests/Unit/Utility/BackendUtilityTest.php | 3 ++-
.../Classes/ViewHelpers/Be/PagePathViewHelper.php | 2 +-
.../Classes/ViewHelpers/ErrorIconViewHelper.php | 2 +-
.../Classes/ViewHelpers/FormatDetailsViewHelper.php | 2 +-
.../Classes/ViewHelpers/HistoryEntryViewHelper.php | 2 +-
.../ViewHelpers/IsExtensionLoadedViewHelper.php | 2 +-
.../belog/Classes/ViewHelpers/UsernameViewHelper.php | 2 +-
.../Classes/ViewHelpers/WorkspaceTitleViewHelper.php | 2 +-
.../Classes/ViewHelpers/ArrayElementViewHelper.php | 2 +-
.../Classes/ViewHelpers/Display/PagesViewHelper.php | 2 +-
.../ViewHelpers/Display/SysFileMountsViewHelper.php | 2 +-
.../ViewHelpers/Display/SysLanguageViewHelper.php | 2 +-
.../Classes/ViewHelpers/EditRecordViewHelper.php | 2 +-
.../Classes/ViewHelpers/IssueCommandViewHelper.php | 2 +-
.../Classes/ViewHelpers/PermissionsViewHelper.php | 2 +-
.../Classes/ViewHelpers/RemoveUserViewHelper.php | 2 +-
.../ViewHelpers/SpriteIconForRecordViewHelper.php | 2 +-
.../Classes/ViewHelpers/SwitchUserViewHelper.php | 2 +-
typo3/sysext/compatibility7/ext_localconf.php | 2 +-
typo3/sysext/compatibility7/ext_tables.php | 1 -
typo3/sysext/core/Classes/Crypto/Random.php | 12 +++++++-----
.../sysext/core/Classes/DataHandling/DataHandler.php | 2 --
typo3/sysext/core/Classes/ExtDirect/ExtDirectApi.php | 1 -
.../FormProtection/AbstractFormProtection.php | 2 +-
.../Resource/Processing/AbstractGraphicalTask.php | 1 -
.../core/Classes/Type/Bitmask/JsConfirmation.php | 1 -
typo3/sysext/core/Classes/Utility/ArrayUtility.php | 1 -
typo3/sysext/core/Classes/Utility/GeneralUtility.php | 1 -
.../Acceptance/Backend/Menu/ModuleMenuSliderCest.php | 6 +++---
.../Backend/Page/AddPageInPageModuleCest.php | 2 +-
.../Acceptance/Backend/Search/SearchAdminCest.php | 2 +-
.../core/Tests/Acceptance/Support/Page/PageTree.php | 4 ++--
.../DataHandling/FlexformIrre/ActionTestCase.php | 2 --
typo3/sysext/core/Tests/Unit/Crypto/RandomTest.php | 4 ++--
.../Tests/Unit/Database/Query/QueryHelperTest.php | 1 -
.../Classes/ViewHelpers/FormatViewHelper.php | 2 +-
.../Classes/ViewHelpers/FormatsViewHelper.php | 2 +-
.../sysext/extbase/Classes/Mvc/Cli/ConsoleOutput.php | 3 ++-
.../Classes/Mvc/Controller/CommandController.php | 2 --
.../Classes/ViewHelpers/Format/ImplodeViewHelper.php | 2 +-
.../ViewHelpers/Format/JsonEncodeViewHelper.php | 2 +-
.../InstallationStateCssClassViewHelper.php | 2 +-
.../ViewHelpers/TimeSinceLastUpdateViewHelper.php | 2 +-
.../ViewHelpers/Typo3DependencyViewHelper.php | 2 +-
.../Classes/Controller/FrontendLoginController.php | 2 +-
typo3/sysext/filelist/Classes/FileList.php | 4 ++--
.../ViewHelpers/Uri/EditFileContentViewHelper.php | 2 +-
.../Uri/EditSysFileMetadataRecordViewHelper.php | 2 +-
.../Classes/ViewHelpers/Uri/RenameFileViewHelper.php | 2 +-
.../ViewHelpers/Uri/ReplaceFileViewHelper.php | 2 +-
.../fluid/Classes/ViewHelpers/BaseViewHelper.php | 2 +-
.../Classes/ViewHelpers/Be/Buttons/CshViewHelper.php | 2 +-
.../ViewHelpers/Be/Buttons/ShortcutViewHelper.php | 2 +-
.../Classes/ViewHelpers/Be/InfoboxViewHelper.php | 2 +-
.../fluid/Classes/ViewHelpers/DebugViewHelper.php | 2 +-
.../Classes/ViewHelpers/Format/BytesViewHelper.php | 2 +-
.../Classes/ViewHelpers/Format/CaseViewHelper.php | 2 +-
.../Classes/ViewHelpers/Format/CropViewHelper.php | 2 +-
.../ViewHelpers/Format/CurrencyViewHelper.php | 2 +-
.../Classes/ViewHelpers/Format/DateViewHelper.php | 2 +-
.../Classes/ViewHelpers/Format/HtmlViewHelper.php | 2 +-
.../Classes/ViewHelpers/Format/Nl2brViewHelper.php | 2 +-
.../Classes/ViewHelpers/Format/NumberViewHelper.php | 2 +-
.../Classes/ViewHelpers/Format/PaddingViewHelper.php | 2 +-
.../ViewHelpers/Format/StripTagsViewHelper.php | 2 +-
.../ViewHelpers/Format/UrlencodeViewHelper.php | 2 +-
.../Classes/ViewHelpers/Link/TypolinkViewHelper.php | 2 +-
.../Classes/ViewHelpers/TranslateViewHelper.php | 2 +-
.../Classes/ViewHelpers/Uri/EmailViewHelper.php | 2 +-
.../Classes/ViewHelpers/Uri/ExternalViewHelper.php | 2 +-
.../Classes/ViewHelpers/Uri/ImageViewHelper.php | 2 +-
.../Classes/ViewHelpers/Uri/TypolinkViewHelper.php | 2 +-
.../ViewHelpers/Link/ClickEnlargeViewHelper.php | 2 +-
.../Classes/Domain/Repository/ContentRepository.php | 5 ++---
.../Domain/Validator/FileAllowedTypesValidator.php | 2 +-
.../View/Wizard/Element/FormWizardElement.php | 5 ++---
.../Unit/Utility/TypoScriptToJsonConverterTest.php | 6 +++---
.../Exception/ProductionExceptionHandler.php | 2 +-
typo3/sysext/frontend/Classes/Page/PageGenerator.php | 1 -
.../Unit/ContentObject/CaseContentObjectTest.php | 1 -
.../Unit/ContentObject/FilesContentObjectTest.php | 1 -
.../ViewHelpers/Format/DateTimeViewHelper.php | 2 +-
.../ViewHelpers/Format/FlagValueViewHelper.php | 2 +-
.../ViewHelpers/Format/GroupListViewHelper.php | 2 +-
.../ViewHelpers/PageBrowsingResultsViewHelper.php | 2 +-
.../Classes/ViewHelpers/PageBrowsingViewHelper.php | 2 +-
typo3/sysext/indexed_search/ext_localconf.php | 1 -
typo3/sysext/indexed_search/ext_tables.php | 1 -
.../Classes/ViewHelpers/ConstantViewHelper.php | 2 +-
.../Classes/ViewHelpers/File/ExistsViewHelper.php | 2 +-
.../ViewHelpers/File/ImageDimensionViewHelper.php | 2 +-
.../ViewHelpers/File/RelativePathViewHelper.php | 2 +-
.../Classes/ViewHelpers/File/SizeViewHelper.php | 2 +-
.../Classes/ViewHelpers/Format/CropViewHelper.php | 2 +-
.../Format/ImageMagickCommandsViewHelper.php | 2 +-
.../ViewHelpers/Format/PhpErrorCodeViewHelper.php | 2 +-
.../ViewHelpers/Object/ArrayValueByKeyViewHelper.php | 2 +-
.../Classes/ViewHelpers/PhpInfoViewHelper.php | 2 +-
.../Tests/Unit/FolderStructure/LinkNodeTest.php | 2 +-
.../Updates/ContentTypesToTextMediaUpdateTest.php | 1 -
.../lowlevel/Classes/View/DatabaseIntegrityView.php | 1 -
.../RecordList/AbstractDatabaseRecordList.php | 3 +--
.../reports/Classes/ViewHelpers/IconViewHelper.php | 2 +-
.../rtehtmlarea/Classes/Extension/Spellchecker.php | 1 -
.../Classes/ViewHelpers/ModuleLinkViewHelper.php | 2 +-
typo3/sysext/sys_action/Classes/ActionTask.php | 2 +-
.../Classes/ViewHelpers/DeleteLinkViewHelper.php | 2 +-
.../Classes/ViewHelpers/EditLinkViewHelper.php | 2 +-
.../Classes/Controller/TaskModuleController.php | 5 ++---
.../TypoScriptTemplateModuleController.php | 1 -
121 files changed, 115 insertions(+), 143 deletions(-)
diff --git a/typo3/sysext/backend/Classes/Form/Container/SingleFieldContainer.php b/typo3/sysext/backend/Classes/Form/Container/SingleFieldContainer.php
index 70c1d3545ae1..b83e3d1b769b 100644
--- a/typo3/sysext/backend/Classes/Form/Container/SingleFieldContainer.php
+++ b/typo3/sysext/backend/Classes/Form/Container/SingleFieldContainer.php
@@ -419,7 +419,7 @@ class SingleFieldContainer extends AbstractContainer
<div class="t3-form-original-language-diff">
<div class="t3-form-original-language-diffheader">'
. htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:labels.changeInOrig'))
- . '</div>
+ . '</div>
<div class="t3-form-original-language-diffcontent">
<div class="diff">
<div class="diff-item">
diff --git a/typo3/sysext/backend/Classes/Form/Element/ImageManipulationElement.php b/typo3/sysext/backend/Classes/Form/Element/ImageManipulationElement.php
index 72a619b3a4e2..e0855b8d7244 100644
--- a/typo3/sysext/backend/Classes/Form/Element/ImageManipulationElement.php
+++ b/typo3/sysext/backend/Classes/Form/Element/ImageManipulationElement.php
@@ -15,7 +15,6 @@ namespace TYPO3\CMS\Backend\Form\Element;
*/
use TYPO3\CMS\Backend\Routing\UriBuilder;
-use TYPO3\CMS\Backend\Utility\BackendUtility;
use TYPO3\CMS\Core\Resource\Exception\FileDoesNotExistException;
use TYPO3\CMS\Core\Resource\File;
use TYPO3\CMS\Core\Resource\ResourceFactory;
diff --git a/typo3/sysext/backend/Classes/Form/FormDataProvider/AbstractItemProvider.php b/typo3/sysext/backend/Classes/Form/FormDataProvider/AbstractItemProvider.php
index c1caf2a832ab..7a5751e39741 100644
--- a/typo3/sysext/backend/Classes/Form/FormDataProvider/AbstractItemProvider.php
+++ b/typo3/sysext/backend/Classes/Form/FormDataProvider/AbstractItemProvider.php
@@ -26,7 +26,6 @@ use TYPO3\CMS\Core\Messaging\FlashMessageService;
use TYPO3\CMS\Core\Utility\ArrayUtility;
use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Core\Utility\MathUtility;
-use TYPO3\CMS\Core\Utility\PathUtility;
use TYPO3\CMS\Lang\LanguageService;
/**
diff --git a/typo3/sysext/backend/Classes/Form/FormDataProvider/TcaFlexProcess.php b/typo3/sysext/backend/Classes/Form/FormDataProvider/TcaFlexProcess.php
index dc37f59b8838..35192993c0c2 100644
--- a/typo3/sysext/backend/Classes/Form/FormDataProvider/TcaFlexProcess.php
+++ b/typo3/sysext/backend/Classes/Form/FormDataProvider/TcaFlexProcess.php
@@ -594,5 +594,4 @@ class TcaFlexProcess implements FormDataProviderInterface
{
return $GLOBALS['BE_USER'];
}
-
}
diff --git a/typo3/sysext/backend/Classes/Module/ModuleLoader.php b/typo3/sysext/backend/Classes/Module/ModuleLoader.php
index 55bbe1a6af1a..0f7b541c8ea0 100644
--- a/typo3/sysext/backend/Classes/Module/ModuleLoader.php
+++ b/typo3/sysext/backend/Classes/Module/ModuleLoader.php
@@ -16,7 +16,6 @@ namespace TYPO3\CMS\Backend\Module;
use TYPO3\CMS\Backend\Utility\BackendUtility;
use TYPO3\CMS\Core\Authentication\BackendUserAuthentication;
-use TYPO3\CMS\Core\Utility\ExtensionManagementUtility;
use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Lang\LanguageService;
@@ -398,7 +397,6 @@ class ModuleLoader
'title' => isset($labels[$language]['tabs']['tab']) ? $labels[$language]['tabs']['tab'] : $labels['default']['tabs']['tab'],
];
}
-
}
}
diff --git a/typo3/sysext/backend/Classes/Tree/Pagetree/ExtdirectTreeCommands.php b/typo3/sysext/backend/Classes/Tree/Pagetree/ExtdirectTreeCommands.php
index 98121285e8b4..33a0e35dc312 100644
--- a/typo3/sysext/backend/Classes/Tree/Pagetree/ExtdirectTreeCommands.php
+++ b/typo3/sysext/backend/Classes/Tree/Pagetree/ExtdirectTreeCommands.php
@@ -356,7 +356,7 @@ class ExtdirectTreeCommands
if (empty($mountPoints)) {
$mountPoints = array(0);
}
- if (!empty(static::getBackendUser()->uc['pageTree_temporaryMountPoint'])){
+ if (!empty(static::getBackendUser()->uc['pageTree_temporaryMountPoint'])) {
$mountPoints[] = (int)static::getBackendUser()->uc['pageTree_temporaryMountPoint'];
}
$mountPoints = array_unique($mountPoints);
diff --git a/typo3/sysext/backend/Classes/ViewHelpers/AvatarViewHelper.php b/typo3/sysext/backend/Classes/ViewHelpers/AvatarViewHelper.php
index e7cd2eb1a8e7..e5996c294b24 100644
--- a/typo3/sysext/backend/Classes/ViewHelpers/AvatarViewHelper.php
+++ b/typo3/sysext/backend/Classes/ViewHelpers/AvatarViewHelper.php
@@ -15,8 +15,8 @@ namespace TYPO3\CMS\Backend\ViewHelpers;
*/
use TYPO3\CMS\Backend\Backend\Avatar\Avatar;
use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper;
+use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
/**
* Get avatar for backend user
diff --git a/typo3/sysext/backend/Resources/Private/Php/cli.php b/typo3/sysext/backend/Resources/Private/Php/cli.php
index 051300335df6..b5412ec3ed92 100644
--- a/typo3/sysext/backend/Resources/Private/Php/cli.php
+++ b/typo3/sysext/backend/Resources/Private/Php/cli.php
@@ -25,7 +25,7 @@ if (version_compare(PHP_VERSION, '7.0.0', '<')) {
* Valid cliKeys must be registered in
* $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['GLOBAL']['cliKeys'].
*/
-call_user_func(function() {
+call_user_func(function () {
$classLoader = require __DIR__ . '/../../../../../../vendor/autoload.php';
(new \TYPO3\CMS\Backend\Console\Application($classLoader))->run();
diff --git a/typo3/sysext/backend/Tests/Functional/Controller/Page/LocalizationControllerTest.php b/typo3/sysext/backend/Tests/Functional/Controller/Page/LocalizationControllerTest.php
index 98b4c9bf02ba..50b4127982fc 100644
--- a/typo3/sysext/backend/Tests/Functional/Controller/Page/LocalizationControllerTest.php
+++ b/typo3/sysext/backend/Tests/Functional/Controller/Page/LocalizationControllerTest.php
@@ -273,4 +273,4 @@ class LocalizationControllerTest extends FunctionalTestCase
$results = $this->getDatabaseConnection()->exec_SELECTgetRows('pid, sys_language_uid, l18n_parent, header', 'tt_content', 'pid = 1 AND sys_language_uid = 1', '', 'sorting ASC');
$this->assertSame($expectedResults, $results);
}
-}
\ No newline at end of file
+}
diff --git a/typo3/sysext/backend/Tests/Unit/Form/Element/InputTextElementTest.php b/typo3/sysext/backend/Tests/Unit/Form/Element/InputTextElementTest.php
index f144095c1947..eb19f7ed947a 100644
--- a/typo3/sysext/backend/Tests/Unit/Form/Element/InputTextElementTest.php
+++ b/typo3/sysext/backend/Tests/Unit/Form/Element/InputTextElementTest.php
@@ -48,7 +48,6 @@ class InputTextElementTest extends UnitTestCase
parent::tearDown();
}
-
/**
* Data provider for renderAppliesCorrectTimestampConversion
*
diff --git a/typo3/sysext/backend/Tests/Unit/Form/Wizard/SuggestWizardTest.php b/typo3/sysext/backend/Tests/Unit/Form/Wizard/SuggestWizardTest.php
index b80e222a6cac..83d6815572da 100644
--- a/typo3/sysext/backend/Tests/Unit/Form/Wizard/SuggestWizardTest.php
+++ b/typo3/sysext/backend/Tests/Unit/Form/Wizard/SuggestWizardTest.php
@@ -148,4 +148,4 @@ class SuggestWizardTest extends UnitTestCase
$subject->_call('getFieldConfiguration', $parts, $dataStructure);
}
-}
\ No newline at end of file
+}
diff --git a/typo3/sysext/backend/Tests/Unit/Utility/BackendUtilityTest.php b/typo3/sysext/backend/Tests/Unit/Utility/BackendUtilityTest.php
index cb301adf2e34..109e58696f5d 100644
--- a/typo3/sysext/backend/Tests/Unit/Utility/BackendUtilityTest.php
+++ b/typo3/sysext/backend/Tests/Unit/Utility/BackendUtilityTest.php
@@ -1055,7 +1055,8 @@ class BackendUtilityTest extends UnitTestCase
/**
* @test
*/
- public function dateTimeAgeReturnsCorrectValues() {
+ public function dateTimeAgeReturnsCorrectValues()
+ {
/** @var ObjectProphecy|LanguageService $languageServiceProphecy */
$languageServiceProphecy = $this->prophesize(LanguageService::class);
$languageServiceProphecy->sL(Argument::cetera())->willReturn(' min| hrs| days| yrs| min| hour| day| year');
diff --git a/typo3/sysext/belog/Classes/ViewHelpers/Be/PagePathViewHelper.php b/typo3/sysext/belog/Classes/ViewHelpers/Be/PagePathViewHelper.php
index b5336382543f..0fd2f190ef02 100644
--- a/typo3/sysext/belog/Classes/ViewHelpers/Be/PagePathViewHelper.php
+++ b/typo3/sysext/belog/Classes/ViewHelpers/Be/PagePathViewHelper.php
@@ -14,8 +14,8 @@ namespace TYPO3\CMS\Belog\ViewHelpers\Be;
* The TYPO3 project - inspiring people to share!
*/
-use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
use TYPO3\CMS\Fluid\ViewHelpers\Be\AbstractBackendViewHelper;
+use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
/**
* Get page path string from page id
diff --git a/typo3/sysext/belog/Classes/ViewHelpers/ErrorIconViewHelper.php b/typo3/sysext/belog/Classes/ViewHelpers/ErrorIconViewHelper.php
index 1ca4e0472118..6d85b90c0da0 100644
--- a/typo3/sysext/belog/Classes/ViewHelpers/ErrorIconViewHelper.php
+++ b/typo3/sysext/belog/Classes/ViewHelpers/ErrorIconViewHelper.php
@@ -16,8 +16,8 @@ namespace TYPO3\CMS\Belog\ViewHelpers;
use TYPO3\CMS\Backend\Template\DocumentTemplate;
use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
use TYPO3\CMS\Fluid\ViewHelpers\Be\AbstractBackendViewHelper;
+use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
/**
* Display error icon from error integer value
diff --git a/typo3/sysext/belog/Classes/ViewHelpers/FormatDetailsViewHelper.php b/typo3/sysext/belog/Classes/ViewHelpers/FormatDetailsViewHelper.php
index 6993c761b50d..a9f44b4a06b7 100644
--- a/typo3/sysext/belog/Classes/ViewHelpers/FormatDetailsViewHelper.php
+++ b/typo3/sysext/belog/Classes/ViewHelpers/FormatDetailsViewHelper.php
@@ -15,8 +15,8 @@ namespace TYPO3\CMS\Belog\ViewHelpers;
*/
use TYPO3\CMS\Belog\Domain\Model\LogEntry;
-use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper;
+use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
/**
* Create detail string from log entry
diff --git a/typo3/sysext/belog/Classes/ViewHelpers/HistoryEntryViewHelper.php b/typo3/sysext/belog/Classes/ViewHelpers/HistoryEntryViewHelper.php
index 06a0fbe1d7b5..c5a151fe2cb1 100644
--- a/typo3/sysext/belog/Classes/ViewHelpers/HistoryEntryViewHelper.php
+++ b/typo3/sysext/belog/Classes/ViewHelpers/HistoryEntryViewHelper.php
@@ -22,8 +22,8 @@ use TYPO3\CMS\Core\Imaging\IconFactory;
use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Extbase\Object\ObjectManager;
use TYPO3\CMS\Extbase\Utility\LocalizationUtility;
-use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper;
+use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
/**
* Get history entry from for log entry
diff --git a/typo3/sysext/belog/Classes/ViewHelpers/IsExtensionLoadedViewHelper.php b/typo3/sysext/belog/Classes/ViewHelpers/IsExtensionLoadedViewHelper.php
index edb8071058c1..b04df731a859 100644
--- a/typo3/sysext/belog/Classes/ViewHelpers/IsExtensionLoadedViewHelper.php
+++ b/typo3/sysext/belog/Classes/ViewHelpers/IsExtensionLoadedViewHelper.php
@@ -15,8 +15,8 @@ namespace TYPO3\CMS\Belog\ViewHelpers;
*/
use TYPO3\CMS\Core\Utility\ExtensionManagementUtility;
-use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper;
+use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
/**
* Returns true, if a specific extension is loaded
diff --git a/typo3/sysext/belog/Classes/ViewHelpers/UsernameViewHelper.php b/typo3/sysext/belog/Classes/ViewHelpers/UsernameViewHelper.php
index 7db6f349d531..8ae918770ccf 100644
--- a/typo3/sysext/belog/Classes/ViewHelpers/UsernameViewHelper.php
+++ b/typo3/sysext/belog/Classes/ViewHelpers/UsernameViewHelper.php
@@ -14,8 +14,8 @@ namespace TYPO3\CMS\Belog\ViewHelpers;
* The TYPO3 project - inspiring people to share!
*/
-use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper;
+use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
/**
* Get username from backend user id
diff --git a/typo3/sysext/belog/Classes/ViewHelpers/WorkspaceTitleViewHelper.php b/typo3/sysext/belog/Classes/ViewHelpers/WorkspaceTitleViewHelper.php
index badab06cf3c0..3f90f81857f0 100644
--- a/typo3/sysext/belog/Classes/ViewHelpers/WorkspaceTitleViewHelper.php
+++ b/typo3/sysext/belog/Classes/ViewHelpers/WorkspaceTitleViewHelper.php
@@ -14,8 +14,8 @@ namespace TYPO3\CMS\Belog\ViewHelpers;
* The TYPO3 project - inspiring people to share!
*/
-use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper;
+use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
/**
* Get workspace title from workspace id
diff --git a/typo3/sysext/beuser/Classes/ViewHelpers/ArrayElementViewHelper.php b/typo3/sysext/beuser/Classes/ViewHelpers/ArrayElementViewHelper.php
index 24f405c206ce..3ef14b7da2b5 100644
--- a/typo3/sysext/beuser/Classes/ViewHelpers/ArrayElementViewHelper.php
+++ b/typo3/sysext/beuser/Classes/ViewHelpers/ArrayElementViewHelper.php
@@ -14,8 +14,8 @@ namespace TYPO3\CMS\Beuser\ViewHelpers;
* The TYPO3 project - inspiring people to share!
*/
-use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper;
+use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
/**
* Get a value from an array by given key.
diff --git a/typo3/sysext/beuser/Classes/ViewHelpers/Display/PagesViewHelper.php b/typo3/sysext/beuser/Classes/ViewHelpers/Display/PagesViewHelper.php
index 063109b09207..ba6afad4af0d 100644
--- a/typo3/sysext/beuser/Classes/ViewHelpers/Display/PagesViewHelper.php
+++ b/typo3/sysext/beuser/Classes/ViewHelpers/Display/PagesViewHelper.php
@@ -14,8 +14,8 @@ namespace TYPO3\CMS\Beuser\ViewHelpers\Display;
* The TYPO3 project - inspiring people to share!
*/
-use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper;
+use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
/**
* Converts comma separated list of pages uids to html unordered list (<ul>) with speaking titles
diff --git a/typo3/sysext/beuser/Classes/ViewHelpers/Display/SysFileMountsViewHelper.php b/typo3/sysext/beuser/Classes/ViewHelpers/Display/SysFileMountsViewHelper.php
index d6969d92a17d..f051344e51fe 100644
--- a/typo3/sysext/beuser/Classes/ViewHelpers/Display/SysFileMountsViewHelper.php
+++ b/typo3/sysext/beuser/Classes/ViewHelpers/Display/SysFileMountsViewHelper.php
@@ -14,8 +14,8 @@ namespace TYPO3\CMS\Beuser\ViewHelpers\Display;
* The TYPO3 project - inspiring people to share!
*/
-use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper;
+use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
/**
* Converts comma separated list of sys_filemounts uids to html unordered list (<ul>) with speaking titles
diff --git a/typo3/sysext/beuser/Classes/ViewHelpers/Display/SysLanguageViewHelper.php b/typo3/sysext/beuser/Classes/ViewHelpers/Display/SysLanguageViewHelper.php
index 76a781819175..17f9b76f4760 100644
--- a/typo3/sysext/beuser/Classes/ViewHelpers/Display/SysLanguageViewHelper.php
+++ b/typo3/sysext/beuser/Classes/ViewHelpers/Display/SysLanguageViewHelper.php
@@ -14,8 +14,8 @@ namespace TYPO3\CMS\Beuser\ViewHelpers\Display;
* The TYPO3 project - inspiring people to share!
*/
-use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper;
+use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
/**
* Converts comma separated list of sys_language uids to html unordered list (<ul>) with speaking titles
diff --git a/typo3/sysext/beuser/Classes/ViewHelpers/EditRecordViewHelper.php b/typo3/sysext/beuser/Classes/ViewHelpers/EditRecordViewHelper.php
index 1d2581eefefe..a52a6e1179b5 100644
--- a/typo3/sysext/beuser/Classes/ViewHelpers/EditRecordViewHelper.php
+++ b/typo3/sysext/beuser/Classes/ViewHelpers/EditRecordViewHelper.php
@@ -16,8 +16,8 @@ namespace TYPO3\CMS\Beuser\ViewHelpers;
use TYPO3\CMS\Backend\Utility\BackendUtility;
use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper;
+use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
/**
* Edit Record ViewHelper, see FormEngine logic
diff --git a/typo3/sysext/beuser/Classes/ViewHelpers/IssueCommandViewHelper.php b/typo3/sysext/beuser/Classes/ViewHelpers/IssueCommandViewHelper.php
index ee89147a30d7..bde763d50e10 100644
--- a/typo3/sysext/beuser/Classes/ViewHelpers/IssueCommandViewHelper.php
+++ b/typo3/sysext/beuser/Classes/ViewHelpers/IssueCommandViewHelper.php
@@ -17,8 +17,8 @@ namespace TYPO3\CMS\Beuser\ViewHelpers;
use TYPO3\CMS\Backend\Utility\BackendUtility;
use TYPO3\CMS\Core\Authentication\BackendUserAuthentication;
use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper;
+use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
/**
* Render a link to DataHandler command
diff --git a/typo3/sysext/beuser/Classes/ViewHelpers/PermissionsViewHelper.php b/typo3/sysext/beuser/Classes/ViewHelpers/PermissionsViewHelper.php
index f7d50828d343..5c533db63e78 100644
--- a/typo3/sysext/beuser/Classes/ViewHelpers/PermissionsViewHelper.php
+++ b/typo3/sysext/beuser/Classes/ViewHelpers/PermissionsViewHelper.php
@@ -15,8 +15,8 @@ namespace TYPO3\CMS\Beuser\ViewHelpers;
*/
use TYPO3\CMS\Extbase\Utility\LocalizationUtility;
-use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper;
+use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
/**
* Render permission icon group (user / group / others) of the "Access" module.
diff --git a/typo3/sysext/beuser/Classes/ViewHelpers/RemoveUserViewHelper.php b/typo3/sysext/beuser/Classes/ViewHelpers/RemoveUserViewHelper.php
index f19ef672996b..71d7e86855ad 100644
--- a/typo3/sysext/beuser/Classes/ViewHelpers/RemoveUserViewHelper.php
+++ b/typo3/sysext/beuser/Classes/ViewHelpers/RemoveUserViewHelper.php
@@ -21,8 +21,8 @@ use TYPO3\CMS\Core\Imaging\Icon;
use TYPO3\CMS\Core\Imaging\IconFactory;
use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Extbase\Utility\LocalizationUtility;
-use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper;
+use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
/**
* Displays 'Delete user' link with sprite icon to remove user
diff --git a/typo3/sysext/beuser/Classes/ViewHelpers/SpriteIconForRecordViewHelper.php b/typo3/sysext/beuser/Classes/ViewHelpers/SpriteIconForRecordViewHelper.php
index 6eaf5a5ed8cb..a9eed58b7451 100644
--- a/typo3/sysext/beuser/Classes/ViewHelpers/SpriteIconForRecordViewHelper.php
+++ b/typo3/sysext/beuser/Classes/ViewHelpers/SpriteIconForRecordViewHelper.php
@@ -18,8 +18,8 @@ use TYPO3\CMS\Core\Imaging\Icon;
use TYPO3\CMS\Core\Imaging\IconFactory;
use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Extbase\Domain\Model\BackendUser;
-use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
use TYPO3\CMS\Fluid\ViewHelpers\Be\AbstractBackendViewHelper;
+use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
/**
* Views sprite icon for a record (object)
diff --git a/typo3/sysext/beuser/Classes/ViewHelpers/SwitchUserViewHelper.php b/typo3/sysext/beuser/Classes/ViewHelpers/SwitchUserViewHelper.php
index 73e6699aec1f..309560da41c5 100644
--- a/typo3/sysext/beuser/Classes/ViewHelpers/SwitchUserViewHelper.php
+++ b/typo3/sysext/beuser/Classes/ViewHelpers/SwitchUserViewHelper.php
@@ -19,8 +19,8 @@ use TYPO3\CMS\Core\Imaging\Icon;
use TYPO3\CMS\Core\Imaging\IconFactory;
use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Extbase\Utility\LocalizationUtility;
-use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper;
+use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
/**
* Displays 'SwitchUser' link with sprite icon to change current backend user to target (non-admin) backendUser
diff --git a/typo3/sysext/compatibility7/ext_localconf.php b/typo3/sysext/compatibility7/ext_localconf.php
index 73e7cce4570c..9ce2c0f8bb2e 100644
--- a/typo3/sysext/compatibility7/ext_localconf.php
+++ b/typo3/sysext/compatibility7/ext_localconf.php
@@ -18,4 +18,4 @@ if (\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::isLoaded('indexed_search
'tt_content.list.20.indexed_search =< plugin.tx_indexedsearch',
'defaultContentRendering'
);
-}
\ No newline at end of file
+}
diff --git a/typo3/sysext/compatibility7/ext_tables.php b/typo3/sysext/compatibility7/ext_tables.php
index 4295971182f5..e1e88d31825e 100644
--- a/typo3/sysext/compatibility7/ext_tables.php
+++ b/typo3/sysext/compatibility7/ext_tables.php
@@ -1,7 +1,6 @@
<?php
defined('TYPO3_MODE') or die();
-
if (TYPO3_MODE === 'BE') {
if (\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::isLoaded('indexed_search')) {
$GLOBALS['TBE_MODULES_EXT']['xMOD_db_new_content_el']['addElClasses']['tx_indexed_search_pi_wizicon'] =
diff --git a/typo3/sysext/core/Classes/Crypto/Random.php b/typo3/sysext/core/Classes/Crypto/Random.php
index 8d8c9e249422..a613bad62e38 100644
--- a/typo3/sysext/core/Classes/Crypto/Random.php
+++ b/typo3/sysext/core/Classes/Crypto/Random.php
@@ -1,5 +1,5 @@
<?php
-declare(strict_types=1);
+declare (strict_types=1);
namespace TYPO3\CMS\Core\Crypto;
/*
@@ -26,7 +26,8 @@ class Random
* @param int $length
* @return string
*/
- public function generateRandomBytes(int $length): string {
+ public function generateRandomBytes(int $length): string
+ {
return random_bytes($length);
}
@@ -37,7 +38,8 @@ class Random
* @param int $max
* @return int
*/
- public function generateRandomInteger(int $min, int $max): int {
+ public function generateRandomInteger(int $min, int $max): int
+ {
return random_int($min, $max);
}
@@ -47,8 +49,8 @@ class Random
* @param int $length
* @return string
*/
- public function generateRandomHexString(int $length): string {
+ public function generateRandomHexString(int $length): string
+ {
return substr(bin2hex($this->generateRandomBytes((int)(($length + 1) / 2))), 0, $length);
}
-
}
diff --git a/typo3/sysext/core/Classes/DataHandling/DataHandler.php b/typo3/sysext/core/Classes/DataHandling/DataHandler.php
index d315f3758699..323f67e795e7 100644
--- a/typo3/sysext/core/Classes/DataHandling/DataHandler.php
+++ b/typo3/sysext/core/Classes/DataHandling/DataHandler.php
@@ -30,14 +30,12 @@ use TYPO3\CMS\Core\Resource\ResourceFactory;
use TYPO3\CMS\Core\Service\OpcodeCacheService;
use TYPO3\CMS\Core\Type\Bitmask\Permission;
use TYPO3\CMS\Core\Utility\ArrayUtility;
-use TYPO3\CMS\Core\Utility\ExtensionManagementUtility;
use TYPO3\CMS\Core\Utility\File\BasicFileUtility;
use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Core\Utility\MathUtility;
use TYPO3\CMS\Core\Utility\PathUtility;
use TYPO3\CMS\Core\Utility\StringUtility;
use TYPO3\CMS\Core\Versioning\VersionState;
-use TYPO3\CMS\Install\Service\ClearCacheService;
/**
* The main data handler class which takes care of correctly updating and inserting records.
diff --git a/typo3/sysext/core/Classes/ExtDirect/ExtDirectApi.php b/typo3/sysext/core/Classes/ExtDirect/ExtDirectApi.php
index 2e2c3dd25def..f76b4d371935 100755
--- a/typo3/sysext/core/Classes/ExtDirect/ExtDirectApi.php
+++ b/typo3/sysext/core/Classes/ExtDirect/ExtDirectApi.php
@@ -17,7 +17,6 @@ namespace TYPO3\CMS\Core\ExtDirect;
use Psr\Http\Message\ResponseInterface;
use Psr\Http\Message\ServerRequestInterface;
use TYPO3\CMS\Backend\Routing\UriBuilder;
-use TYPO3\CMS\Backend\Utility\BackendUtility;
use TYPO3\CMS\Core\Utility\GeneralUtility;
/**
diff --git a/typo3/sysext/core/Classes/FormProtection/AbstractFormProtection.php b/typo3/sysext/core/Classes/FormProtection/AbstractFormProtection.php
index 870096c3e9d1..240f76a013e5 100644
--- a/typo3/sysext/core/Classes/FormProtection/AbstractFormProtection.php
+++ b/typo3/sysext/core/Classes/FormProtection/AbstractFormProtection.php
@@ -14,8 +14,8 @@ namespace TYPO3\CMS\Core\FormProtection;
* The TYPO3 project - inspiring people to share!
*/
-use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Core\Crypto\Random;
+use TYPO3\CMS\Core\Utility\GeneralUtility;
/**
* This class provides protection against cross-site request forgery (XSRF/CSRF)
diff --git a/typo3/sysext/core/Classes/Resource/Processing/AbstractGraphicalTask.php b/typo3/sysext/core/Classes/Resource/Processing/AbstractGraphicalTask.php
index 54f4ce4879f9..f9f7f8b285f4 100644
--- a/typo3/sysext/core/Classes/Resource/Processing/AbstractGraphicalTask.php
+++ b/typo3/sysext/core/Classes/Resource/Processing/AbstractGraphicalTask.php
@@ -15,7 +15,6 @@ namespace TYPO3\CMS\Core\Resource\Processing;
*/
use TYPO3\CMS\Core\Resource\AbstractFile;
-use TYPO3\CMS\Core\Utility\GeneralUtility;
/**
* Abstract base implementation of a task.
diff --git a/typo3/sysext/core/Classes/Type/Bitmask/JsConfirmation.php b/typo3/sysext/core/Classes/Type/Bitmask/JsConfirmation.php
index ab571e5c5826..e841c1bea310 100644
--- a/typo3/sysext/core/Classes/Type/Bitmask/JsConfirmation.php
+++ b/typo3/sysext/core/Classes/Type/Bitmask/JsConfirmation.php
@@ -110,5 +110,4 @@ class JsConfirmation extends Enumeration
}
return false;
}
-
}
diff --git a/typo3/sysext/core/Classes/Utility/ArrayUtility.php b/typo3/sysext/core/Classes/Utility/ArrayUtility.php
index ab875b33aecb..390916433bea 100644
--- a/typo3/sysext/core/Classes/Utility/ArrayUtility.php
+++ b/typo3/sysext/core/Classes/Utility/ArrayUtility.php
@@ -696,7 +696,6 @@ class ArrayUtility
return true;
}
-
/**
* Takes a TypoScript array as input and returns an array which contains all integer properties found which had a value (not only properties). The output array will be sorted numerically.
*
diff --git a/typo3/sysext/core/Classes/Utility/GeneralUtility.php b/typo3/sysext/core/Classes/Utility/GeneralUtility.php
index 6d4883ae8027..a97d22b8bf21 100755
--- a/typo3/sysext/core/Classes/Utility/GeneralUtility.php
+++ b/typo3/sysext/core/Classes/Utility/GeneralUtility.php
@@ -21,7 +21,6 @@ use TYPO3\CMS\Core\Crypto\Random;
use TYPO3\CMS\Core\Http\RequestFactory;
use TYPO3\CMS\Core\Service\OpcodeCacheService;
use TYPO3\CMS\Core\SingletonInterface;
-use TYPO3\CMS\Frontend\Page\PageRepository;
/**
* The legendary "t3lib_div" class - Miscellaneous functions for general purpose.
diff --git a/typo3/sysext/core/Tests/Acceptance/Backend/Menu/ModuleMenuSliderCest.php b/typo3/sysext/core/Tests/Acceptance/Backend/Menu/ModuleMenuSliderCest.php
index 8d42d506d28a..2c11d1e7852b 100644
--- a/typo3/sysext/core/Tests/Acceptance/Backend/Menu/ModuleMenuSliderCest.php
+++ b/typo3/sysext/core/Tests/Acceptance/Backend/Menu/ModuleMenuSliderCest.php
@@ -38,9 +38,9 @@ class ModuleMenuSliderCest
$sees = ['Page', 'Extensions'];
$menuItems = [
- ["mainId" => "#web", "menuItem" => "Page"],
- ["mainId" => "#tools", "menuItem" => "Extensions"],
- ["mainId" => "#system", "menuItem" => "Log"]
+ ['mainId' => '#web', 'menuItem' => 'Page'],
+ ['mainId' => '#tools', 'menuItem' => 'Extensions'],
+ ['mainId' => '#system', 'menuItem' => 'Log']
];
$I->wantTo('check the slider in the module menu');
diff --git a/typo3/sysext/core/Tests/Acceptance/Backend/Page/AddPageInPageModuleCest.php b/typo3/sysext/core/Tests/Acceptance/Backend/Page/AddPageInPageModuleCest.php
index 0c495eb0579d..19511e87a4ae 100644
--- a/typo3/sysext/core/Tests/Acceptance/Backend/Page/AddPageInPageModuleCest.php
+++ b/typo3/sysext/core/Tests/Acceptance/Backend/Page/AddPageInPageModuleCest.php
@@ -102,4 +102,4 @@ class AddPageInPageModuleCest
$I->wait(2);
$I->cantSee('Testpage');
}
-}
\ No newline at end of file
+}
diff --git a/typo3/sysext/core/Tests/Acceptance/Backend/Search/SearchAdminCest.php b/typo3/sysext/core/Tests/Acceptance/Backend/Search/SearchAdminCest.php
index 986b89cfe7df..727b843e0f2f 100644
--- a/typo3/sysext/core/Tests/Acceptance/Backend/Search/SearchAdminCest.php
+++ b/typo3/sysext/core/Tests/Acceptance/Backend/Search/SearchAdminCest.php
@@ -43,7 +43,7 @@ class SearchAdminCest
$dropDownHeader = $I->grabTextFrom($searchResultHeader);
$I->assertEquals('Backend user', $dropDownHeader);
$I->click($liveSearchToolBarItem . ' > div > div > div:nth-child(2) > a');
- $I->switchToIFrame("content");
+ $I->switchToIFrame('content');
$I->waitForElement('#EditDocumentController');
$I->see('Edit Backend user "admin" on root level');
$I->switchToIFrame();
diff --git a/typo3/sysext/core/Tests/Acceptance/Support/Page/PageTree.php b/typo3/sysext/core/Tests/Acceptance/Support/Page/PageTree.php
index 820ba6524655..b3fb3acd5fb1 100644
--- a/typo3/sysext/core/Tests/Acceptance/Support/Page/PageTree.php
+++ b/typo3/sysext/core/Tests/Acceptance/Support/Page/PageTree.php
@@ -89,7 +89,7 @@ class PageTree
$I->see($nodeText, self::$treeItemSelector);
/** @var RemoteWebElement $context */
- $context = $I->executeInSelenium(function() use ($nodeText, $context
+ $context = $I->executeInSelenium(function () use ($nodeText, $context
) {
return $context->findElement(\WebDriverBy::linkText($nodeText))->findElement(
WebDriverBy::xpath('ancestor::li[@class="x-tree-node"][1]')
@@ -98,7 +98,7 @@ class PageTree
try {
$context->findElement(\WebDriverBy::cssSelector('.x-tree-elbow-end-plus'))->click();
- } catch(\Facebook\WebDriver\Exception\NoSuchElementException $e) {
+ } catch (\Facebook\WebDriver\Exception\NoSuchElementException $e) {
// element not found so it may be already opened...
}
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/FlexformIrre/ActionTestCase.php b/typo3/sysext/core/Tests/Functional/DataHandling/FlexformIrre/ActionTestCase.php
index f068760fc98e..870cd7f7a7db 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/FlexformIrre/ActionTestCase.php
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/FlexformIrre/ActionTestCase.php
@@ -14,7 +14,6 @@ namespace TYPO3\CMS\Core\Tests\Functional\DataHandling\FlexformIrre;
* The TYPO3 project - inspiring people to share!
*/
-
class ActionTestCase extends \TYPO3\CMS\Core\Tests\Functional\DataHandling\AbstractDataHandlerActionTestCase
{
@@ -55,5 +54,4 @@ class ActionTestCase extends \TYPO3\CMS\Core\Tests\Functional\DataHandling\Abstr
// there should be one relation in the live WS and one in the draft WS pointing to the file field.
$this->assertEquals(2, $this->getDatabaseConnection()->exec_SELECTcountRows('uid', 'sys_file_reference', 'uid_local = 20'));
}
-
}
diff --git a/typo3/sysext/core/Tests/Unit/Crypto/RandomTest.php b/typo3/sysext/core/Tests/Unit/Crypto/RandomTest.php
index 7ecf595a8278..c3eff5c7c343 100644
--- a/typo3/sysext/core/Tests/Unit/Crypto/RandomTest.php
+++ b/typo3/sysext/core/Tests/Unit/Crypto/RandomTest.php
@@ -1,5 +1,5 @@
<?php
-declare(strict_types=1);
+declare (strict_types=1);
namespace TYPO3\CMS\Core\Tests\Unit\Crypto;
/*
@@ -15,8 +15,8 @@ namespace TYPO3\CMS\Core\Tests\Unit\Crypto;
* The TYPO3 project - inspiring people to share!
*/
-use TYPO3\CMS\Core\Tests\UnitTestCase;
use TYPO3\CMS\Core\Crypto\Random;
+use TYPO3\CMS\Core\Tests\UnitTestCase;
/**
* Test case
diff --git a/typo3/sysext/core/Tests/Unit/Database/Query/QueryHelperTest.php b/typo3/sysext/core/Tests/Unit/Database/Query/QueryHelperTest.php
index 2185d70c83da..b5e5d6c2b7f5 100644
--- a/typo3/sysext/core/Tests/Unit/Database/Query/QueryHelperTest.php
+++ b/typo3/sysext/core/Tests/Unit/Database/Query/QueryHelperTest.php
@@ -190,5 +190,4 @@ class QueryHelperTest extends UnitTestCase
{
$this->assertSame($expectedResult, QueryHelper::parseGroupBy($input));
}
-
}
diff --git a/typo3/sysext/cshmanual/Classes/ViewHelpers/FormatViewHelper.php b/typo3/sysext/cshmanual/Classes/ViewHelpers/FormatViewHelper.php
index 9a5d756d69c5..1a7a9eed2b8d 100644
--- a/typo3/sysext/cshmanual/Classes/ViewHelpers/FormatViewHelper.php
+++ b/typo3/sysext/cshmanual/Classes/ViewHelpers/FormatViewHelper.php
@@ -14,8 +14,8 @@ namespace TYPO3\CMS\Cshmanual\ViewHelpers;
* The TYPO3 project - inspiring people to share!
*/
-use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper;
+use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
/**
* Format the given content
diff --git a/typo3/sysext/documentation/Classes/ViewHelpers/FormatsViewHelper.php b/typo3/sysext/documentation/Classes/ViewHelpers/FormatsViewHelper.php
index bb0e78227f23..6feedbe9e781 100644
--- a/typo3/sysext/documentation/Classes/ViewHelpers/FormatsViewHelper.php
+++ b/typo3/sysext/documentation/Classes/ViewHelpers/FormatsViewHelper.php
@@ -17,8 +17,8 @@ namespace TYPO3\CMS\Documentation\ViewHelpers;
use TYPO3\CMS\Core\Imaging\Icon;
use TYPO3\CMS\Core\Imaging\IconFactory;
use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper;
+use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
/**
* ViewHelper to display all download links for a document
diff --git a/typo3/sysext/extbase/Classes/Mvc/Cli/ConsoleOutput.php b/typo3/sysext/extbase/Classes/Mvc/Cli/ConsoleOutput.php
index 06d6d56a8e3c..b9af26237966 100644
--- a/typo3/sysext/extbase/Classes/Mvc/Cli/ConsoleOutput.php
+++ b/typo3/sysext/extbase/Classes/Mvc/Cli/ConsoleOutput.php
@@ -318,7 +318,8 @@ class ConsoleOutput
* @return ArgvInput
* @throws \RuntimeException
*/
- protected function getInput() {
+ protected function getInput()
+ {
if ($this->input === null) {
if (!isset($_SERVER['argv'])) {
throw new \RuntimeException('Cannot initialize ArgvInput object without CLI context.', 1456914444);
diff --git a/typo3/sysext/extbase/Classes/Mvc/Controller/CommandController.php b/typo3/sysext/extbase/Classes/Mvc/Controller/CommandController.php
index df710aa65b1d..1ff57b49614c 100644
--- a/typo3/sysext/extbase/Classes/Mvc/Controller/CommandController.php
+++ b/typo3/sysext/extbase/Classes/Mvc/Controller/CommandController.php
@@ -14,13 +14,11 @@ namespace TYPO3\CMS\Extbase\Mvc\Controller;
* The TYPO3 project - inspiring people to share!
*/
-use TYPO3\CMS\Core\Authentication\AbstractUserAuthentication;
use TYPO3\CMS\Core\Authentication\BackendUserAuthentication;
use TYPO3\CMS\Extbase\Mvc\Cli\CommandArgumentDefinition;
use TYPO3\CMS\Extbase\Mvc\Cli\ConsoleOutput;
use TYPO3\CMS\Extbase\Mvc\Cli\Request;
use TYPO3\CMS\Extbase\Mvc\Cli\Response;
-use TYPO3\CMS\Extbase\Mvc\Controller\Arguments;
use TYPO3\CMS\Extbase\Mvc\Exception\InvalidArgumentTypeException;
use TYPO3\CMS\Extbase\Mvc\Exception\NoSuchCommandException;
use TYPO3\CMS\Extbase\Mvc\Exception\StopActionException;
diff --git a/typo3/sysext/extensionmanager/Classes/ViewHelpers/Format/ImplodeViewHelper.php b/typo3/sysext/extensionmanager/Classes/ViewHelpers/Format/ImplodeViewHelper.php
index 0e8a4c70481d..86e850603549 100644
--- a/typo3/sysext/extensionmanager/Classes/ViewHelpers/Format/ImplodeViewHelper.php
+++ b/typo3/sysext/extensionmanager/Classes/ViewHelpers/Format/ImplodeViewHelper.php
@@ -14,8 +14,8 @@ namespace TYPO3\CMS\Extensionmanager\ViewHelpers\Format;
* The TYPO3 project - inspiring people to share!
*/
-use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper;
+use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
/**
* View Helper for imploding arrays
diff --git a/typo3/sysext/extensionmanager/Classes/ViewHelpers/Format/JsonEncodeViewHelper.php b/typo3/sysext/extensionmanager/Classes/ViewHelpers/Format/JsonEncodeViewHelper.php
index 2dd04c330a3b..254c8f31bd9f 100644
--- a/typo3/sysext/extensionmanager/Classes/ViewHelpers/Format/JsonEncodeViewHelper.php
+++ b/typo3/sysext/extensionmanager/Classes/ViewHelpers/Format/JsonEncodeViewHelper.php
@@ -14,8 +14,8 @@ namespace TYPO3\CMS\Extensionmanager\ViewHelpers\Format;
* The TYPO3 project - inspiring people to share!
*/
-use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper;
+use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
/**
* Wrapper for PHPs json_encode function.
diff --git a/typo3/sysext/extensionmanager/Classes/ViewHelpers/InstallationStateCssClassViewHelper.php b/typo3/sysext/extensionmanager/Classes/ViewHelpers/InstallationStateCssClassViewHelper.php
index 39c7f386d034..2e366d337f7e 100644
--- a/typo3/sysext/extensionmanager/Classes/ViewHelpers/InstallationStateCssClassViewHelper.php
+++ b/typo3/sysext/extensionmanager/Classes/ViewHelpers/InstallationStateCssClassViewHelper.php
@@ -14,8 +14,8 @@ namespace TYPO3\CMS\Extensionmanager\ViewHelpers;
* The TYPO3 project - inspiring people to share!
*/
-use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper;
+use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
/**
* Returns a string meant to be used as css class stating whether an extension is
diff --git a/typo3/sysext/extensionmanager/Classes/ViewHelpers/TimeSinceLastUpdateViewHelper.php b/typo3/sysext/extensionmanager/Classes/ViewHelpers/TimeSinceLastUpdateViewHelper.php
index 2ed59ef00651..f4f1e000c14b 100644
--- a/typo3/sysext/extensionmanager/Classes/ViewHelpers/TimeSinceLastUpdateViewHelper.php
+++ b/typo3/sysext/extensionmanager/Classes/ViewHelpers/TimeSinceLastUpdateViewHelper.php
@@ -14,8 +14,8 @@ namespace TYPO3\CMS\Extensionmanager\ViewHelpers;
* The TYPO3 project - inspiring people to share!
*/
-use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper;
+use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
/**
* Shows the elapsed time since the last update of the extension repository
diff --git a/typo3/sysext/extensionmanager/Classes/ViewHelpers/Typo3DependencyViewHelper.php b/typo3/sysext/extensionmanager/Classes/ViewHelpers/Typo3DependencyViewHelper.php
index d14b729dfd82..a23fcbdf9a2a 100644
--- a/typo3/sysext/extensionmanager/Classes/ViewHelpers/Typo3DependencyViewHelper.php
+++ b/typo3/sysext/extensionmanager/Classes/ViewHelpers/Typo3DependencyViewHelper.php
@@ -18,8 +18,8 @@ use TYPO3\CMS\Core\Utility\MathUtility;
use TYPO3\CMS\Core\Utility\VersionNumberUtility;
use TYPO3\CMS\Extensionmanager\Domain\Model\Dependency;
use TYPO3\CMS\Extensionmanager\Domain\Model\Extension;
-use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper;
+use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
/**
* Shows the version numbers of the TYPO3 dependency, if any
diff --git a/typo3/sysext/felogin/Classes/Controller/FrontendLoginController.php b/typo3/sysext/felogin/Classes/Controller/FrontendLoginController.php
index c26d9362e5ed..9eea3c6cd8b6 100644
--- a/typo3/sysext/felogin/Classes/Controller/FrontendLoginController.php
+++ b/typo3/sysext/felogin/Classes/Controller/FrontendLoginController.php
@@ -14,9 +14,9 @@ namespace TYPO3\CMS\Felogin\Controller;
* The TYPO3 project - inspiring people to share!
*/
+use TYPO3\CMS\Core\Crypto\Random;
use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Core\Utility\StringUtility;
-use TYPO3\CMS\Core\Crypto\Random;
/**
* Plugin 'Website User Login' for the 'felogin' extension.
diff --git a/typo3/sysext/filelist/Classes/FileList.php b/typo3/sysext/filelist/Classes/FileList.php
index 01bcce35c638..df849707827a 100644
--- a/typo3/sysext/filelist/Classes/FileList.php
+++ b/typo3/sysext/filelist/Classes/FileList.php
@@ -381,7 +381,7 @@ class FileList extends AbstractRecordList
$elToConfirm[$key] = $clipBoardElement->getName();
}
if ($addPasteButton) {
- $cells[] = '<a class="btn btn-default t3js-modal-trigger"'.
+ $cells[] = '<a class="btn btn-default t3js-modal-trigger"' .
' href="' . htmlspecialchars($this->clipObj->pasteUrl(
'_FILE',
$this->folderObject->getCombinedIdentifier()
@@ -894,7 +894,7 @@ class FileList extends AbstractRecordList
. ' data-severity="warning"'
. ' data-title="' . $this->getLanguageService()->getLL('clip_pasteInto', true) . '"'
. ' title="' . $this->getLanguageService()->getLL('clip_pasteInto', true) . '"'
- .'>'
+ . '>'
. $this->iconFactory->getIcon('actions-document-paste-into', Icon::SIZE_SMALL)->render()
. '</a>';
}
diff --git a/typo3/sysext/filelist/Classes/ViewHelpers/Uri/EditFileContentViewHelper.php b/typo3/sysext/filelist/Classes/ViewHelpers/Uri/EditFileContentViewHelper.php
index 43a64e13d0bd..445038bdad5d 100644
--- a/typo3/sysext/filelist/Classes/ViewHelpers/Uri/EditFileContentViewHelper.php
+++ b/typo3/sysext/filelist/Classes/ViewHelpers/Uri/EditFileContentViewHelper.php
@@ -17,8 +17,8 @@ namespace TYPO3\CMS\Filelist\ViewHelpers\Uri;
use Closure;
use TYPO3\CMS\Backend\Utility\BackendUtility;
use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper;
+use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
/**
* Class EditFileContentViewHelper
diff --git a/typo3/sysext/filelist/Classes/ViewHelpers/Uri/EditSysFileMetadataRecordViewHelper.php b/typo3/sysext/filelist/Classes/ViewHelpers/Uri/EditSysFileMetadataRecordViewHelper.php
index 11c458256be7..edb3328469a4 100644
--- a/typo3/sysext/filelist/Classes/ViewHelpers/Uri/EditSysFileMetadataRecordViewHelper.php
+++ b/typo3/sysext/filelist/Classes/ViewHelpers/Uri/EditSysFileMetadataRecordViewHelper.php
@@ -17,8 +17,8 @@ namespace TYPO3\CMS\Filelist\ViewHelpers\Uri;
use Closure;
use TYPO3\CMS\Backend\Utility\BackendUtility;
use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper;
+use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
/**
* Class EditSysFileMetadataRecordViewHelper
diff --git a/typo3/sysext/filelist/Classes/ViewHelpers/Uri/RenameFileViewHelper.php b/typo3/sysext/filelist/Classes/ViewHelpers/Uri/RenameFileViewHelper.php
index 508fa30ba1d3..9022bf76feba 100644
--- a/typo3/sysext/filelist/Classes/ViewHelpers/Uri/RenameFileViewHelper.php
+++ b/typo3/sysext/filelist/Classes/ViewHelpers/Uri/RenameFileViewHelper.php
@@ -17,8 +17,8 @@ namespace TYPO3\CMS\Filelist\ViewHelpers\Uri;
use Closure;
use TYPO3\CMS\Backend\Utility\BackendUtility;
use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper;
+use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
/**
* Class RenameFileViewHelper
diff --git a/typo3/sysext/filelist/Classes/ViewHelpers/Uri/ReplaceFileViewHelper.php b/typo3/sysext/filelist/Classes/ViewHelpers/Uri/ReplaceFileViewHelper.php
index be656fd47a96..e20081fabdff 100644
--- a/typo3/sysext/filelist/Classes/ViewHelpers/Uri/ReplaceFileViewHelper.php
+++ b/typo3/sysext/filelist/Classes/ViewHelpers/Uri/ReplaceFileViewHelper.php
@@ -17,8 +17,8 @@ namespace TYPO3\CMS\Filelist\ViewHelpers\Uri;
use Closure;
use TYPO3\CMS\Backend\Utility\BackendUtility;
use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper;
+use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
/**
* Class ReplaceFileViewHelper
diff --git a/typo3/sysext/fluid/Classes/ViewHelpers/BaseViewHelper.php b/typo3/sysext/fluid/Classes/ViewHelpers/BaseViewHelper.php
index aa8027663511..e3cb5c5adf82 100644
--- a/typo3/sysext/fluid/Classes/ViewHelpers/BaseViewHelper.php
+++ b/typo3/sysext/fluid/Classes/ViewHelpers/BaseViewHelper.php
@@ -14,8 +14,8 @@ namespace TYPO3\CMS\Fluid\ViewHelpers;
* The TYPO3 project - inspiring people to share!
*/
-use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper;
+use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
/**
* View helper which creates a <base href="..."></base> tag. The Base URI is taken from the
diff --git a/typo3/sysext/fluid/Classes/ViewHelpers/Be/Buttons/CshViewHelper.php b/typo3/sysext/fluid/Classes/ViewHelpers/Be/Buttons/CshViewHelper.php
index fd2a4812a0f1..cb62b56b1d8b 100644
--- a/typo3/sysext/fluid/Classes/ViewHelpers/Be/Buttons/CshViewHelper.php
+++ b/typo3/sysext/fluid/Classes/ViewHelpers/Be/Buttons/CshViewHelper.php
@@ -15,8 +15,8 @@ namespace TYPO3\CMS\Fluid\ViewHelpers\Be\Buttons;
*/
use TYPO3\CMS\Backend\Utility\BackendUtility;
-use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
use TYPO3\CMS\Fluid\ViewHelpers\Be\AbstractBackendViewHelper;
+use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
/**
* View helper which returns CSH (context sensitive help) button with icon
diff --git a/typo3/sysext/fluid/Classes/ViewHelpers/Be/Buttons/ShortcutViewHelper.php b/typo3/sysext/fluid/Classes/ViewHelpers/Be/Buttons/ShortcutViewHelper.php
index f874ebe69bc1..4b479d53e843 100644
--- a/typo3/sysext/fluid/Classes/ViewHelpers/Be/Buttons/ShortcutViewHelper.php
+++ b/typo3/sysext/fluid/Classes/ViewHelpers/Be/Buttons/ShortcutViewHelper.php
@@ -16,8 +16,8 @@ namespace TYPO3\CMS\Fluid\ViewHelpers\Be\Buttons;
use TYPO3\CMS\Backend\Template\DocumentTemplate;
use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
use TYPO3\CMS\Fluid\ViewHelpers\Be\AbstractBackendViewHelper;
+use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
/**
* View helper which returns shortcut button with icon
diff --git a/typo3/sysext/fluid/Classes/ViewHelpers/Be/InfoboxViewHelper.php b/typo3/sysext/fluid/Classes/ViewHelpers/Be/InfoboxViewHelper.php
index 69f1e882e487..48390cb37cd9 100644
--- a/typo3/sysext/fluid/Classes/ViewHelpers/Be/InfoboxViewHelper.php
+++ b/typo3/sysext/fluid/Classes/ViewHelpers/Be/InfoboxViewHelper.php
@@ -14,8 +14,8 @@ namespace TYPO3\CMS\Fluid\ViewHelpers\Be;
* The TYPO3 project - inspiring people to share!
*/
use TYPO3\CMS\Core\Utility\MathUtility;
-use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper;
+use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
/**
* View helper for rendering a styled content infobox markup.
diff --git a/typo3/sysext/fluid/Classes/ViewHelpers/DebugViewHelper.php b/typo3/sysext/fluid/Classes/ViewHelpers/DebugViewHelper.php
index 92d97165a328..6ae3d549fa86 100644
--- a/typo3/sysext/fluid/Classes/ViewHelpers/DebugViewHelper.php
+++ b/typo3/sysext/fluid/Classes/ViewHelpers/DebugViewHelper.php
@@ -15,8 +15,8 @@ namespace TYPO3\CMS\Fluid\ViewHelpers;
*/
use TYPO3\CMS\Extbase\Utility\DebuggerUtility;
-use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper;
+use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
/**
* This ViewHelper generates a HTML dump of the tagged variable.
diff --git a/typo3/sysext/fluid/Classes/ViewHelpers/Format/BytesViewHelper.php b/typo3/sysext/fluid/Classes/ViewHelpers/Format/BytesViewHelper.php
index 43ea1ce69666..7197065f881b 100644
--- a/typo3/sysext/fluid/Classes/ViewHelpers/Format/BytesViewHelper.php
+++ b/typo3/sysext/fluid/Classes/ViewHelpers/Format/BytesViewHelper.php
@@ -16,8 +16,8 @@ namespace TYPO3\CMS\Fluid\ViewHelpers\Format;
use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Extbase\Utility\LocalizationUtility;
-use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper;
+use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
/**
* Formats an integer with a byte count into human-readable form.
diff --git a/typo3/sysext/fluid/Classes/ViewHelpers/Format/CaseViewHelper.php b/typo3/sysext/fluid/Classes/ViewHelpers/Format/CaseViewHelper.php
index ca49fce60c98..22d02315cd29 100644
--- a/typo3/sysext/fluid/Classes/ViewHelpers/Format/CaseViewHelper.php
+++ b/typo3/sysext/fluid/Classes/ViewHelpers/Format/CaseViewHelper.php
@@ -16,9 +16,9 @@ namespace TYPO3\CMS\Fluid\ViewHelpers\Format;
use TYPO3\CMS\Core\Charset\CharsetConverter;
use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper;
use TYPO3\CMS\Fluid\Core\ViewHelper\Exception\InvalidVariableException;
+use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
/**
* Modifies the case of an input string to upper- or lowercase or capitalization.
diff --git a/typo3/sysext/fluid/Classes/ViewHelpers/Format/CropViewHelper.php b/typo3/sysext/fluid/Classes/ViewHelpers/Format/CropViewHelper.php
index d790c9c3a132..a9c52f598345 100644
--- a/typo3/sysext/fluid/Classes/ViewHelpers/Format/CropViewHelper.php
+++ b/typo3/sysext/fluid/Classes/ViewHelpers/Format/CropViewHelper.php
@@ -16,9 +16,9 @@ namespace TYPO3\CMS\Fluid\ViewHelpers\Format;
use TYPO3\CMS\Core\Charset\CharsetConverter;
use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper;
use TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer;
+use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
/**
* Use this view helper to crop the text between its opening and closing tags.
diff --git a/typo3/sysext/fluid/Classes/ViewHelpers/Format/CurrencyViewHelper.php b/typo3/sysext/fluid/Classes/ViewHelpers/Format/CurrencyViewHelper.php
index 98f77b033228..704b43c8f288 100644
--- a/typo3/sysext/fluid/Classes/ViewHelpers/Format/CurrencyViewHelper.php
+++ b/typo3/sysext/fluid/Classes/ViewHelpers/Format/CurrencyViewHelper.php
@@ -14,8 +14,8 @@ namespace TYPO3\CMS\Fluid\ViewHelpers\Format;
* The TYPO3 project - inspiring people to share!
*/
-use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper;
+use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
/**
* Formats a given float to a currency representation.
diff --git a/typo3/sysext/fluid/Classes/ViewHelpers/Format/DateViewHelper.php b/typo3/sysext/fluid/Classes/ViewHelpers/Format/DateViewHelper.php
index cb7d09b6359f..5c6ac544e824 100644
--- a/typo3/sysext/fluid/Classes/ViewHelpers/Format/DateViewHelper.php
+++ b/typo3/sysext/fluid/Classes/ViewHelpers/Format/DateViewHelper.php
@@ -15,9 +15,9 @@ namespace TYPO3\CMS\Fluid\ViewHelpers\Format;
*/
use TYPO3\CMS\Core\Utility\MathUtility;
-use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper;
use TYPO3\CMS\Fluid\Core\ViewHelper\Exception;
+use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
/**
* Formats an object implementing \DateTimeInterface.
diff --git a/typo3/sysext/fluid/Classes/ViewHelpers/Format/HtmlViewHelper.php b/typo3/sysext/fluid/Classes/ViewHelpers/Format/HtmlViewHelper.php
index da22e71842ff..3caec860f015 100644
--- a/typo3/sysext/fluid/Classes/ViewHelpers/Format/HtmlViewHelper.php
+++ b/typo3/sysext/fluid/Classes/ViewHelpers/Format/HtmlViewHelper.php
@@ -17,9 +17,9 @@ namespace TYPO3\CMS\Fluid\ViewHelpers\Format;
use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface;
use TYPO3\CMS\Extbase\Object\ObjectManager;
-use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper;
use TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer;
+use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
/**
* Renders a string by passing it to a TYPO3 parseFunc.
diff --git a/typo3/sysext/fluid/Classes/ViewHelpers/Format/Nl2brViewHelper.php b/typo3/sysext/fluid/Classes/ViewHelpers/Format/Nl2brViewHelper.php
index 50e7da20a9c2..22725f2d126f 100644
--- a/typo3/sysext/fluid/Classes/ViewHelpers/Format/Nl2brViewHelper.php
+++ b/typo3/sysext/fluid/Classes/ViewHelpers/Format/Nl2brViewHelper.php
@@ -14,8 +14,8 @@ namespace TYPO3\CMS\Fluid\ViewHelpers\Format;
* The TYPO3 project - inspiring people to share!
*/
-use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper;
+use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
/**
* Wrapper for PHPs nl2br function.
diff --git a/typo3/sysext/fluid/Classes/ViewHelpers/Format/NumberViewHelper.php b/typo3/sysext/fluid/Classes/ViewHelpers/Format/NumberViewHelper.php
index b404502e0ee8..6ea735b0c3ca 100644
--- a/typo3/sysext/fluid/Classes/ViewHelpers/Format/NumberViewHelper.php
+++ b/typo3/sysext/fluid/Classes/ViewHelpers/Format/NumberViewHelper.php
@@ -14,8 +14,8 @@ namespace TYPO3\CMS\Fluid\ViewHelpers\Format;
* The TYPO3 project - inspiring people to share!
*/
-use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper;
+use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
/**
* Formats a number with custom precision, decimal point and grouped thousands.
diff --git a/typo3/sysext/fluid/Classes/ViewHelpers/Format/PaddingViewHelper.php b/typo3/sysext/fluid/Classes/ViewHelpers/Format/PaddingViewHelper.php
index 18801dd139c1..7ff0f9abe3e1 100644
--- a/typo3/sysext/fluid/Classes/ViewHelpers/Format/PaddingViewHelper.php
+++ b/typo3/sysext/fluid/Classes/ViewHelpers/Format/PaddingViewHelper.php
@@ -14,8 +14,8 @@ namespace TYPO3\CMS\Fluid\ViewHelpers\Format;
* The TYPO3 project - inspiring people to share!
*/
-use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper;
+use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
/**
* Formats a string using PHPs str_pad function.
diff --git a/typo3/sysext/fluid/Classes/ViewHelpers/Format/StripTagsViewHelper.php b/typo3/sysext/fluid/Classes/ViewHelpers/Format/StripTagsViewHelper.php
index 29191dc3ce12..c2f2c9008c8e 100644
--- a/typo3/sysext/fluid/Classes/ViewHelpers/Format/StripTagsViewHelper.php
+++ b/typo3/sysext/fluid/Classes/ViewHelpers/Format/StripTagsViewHelper.php
@@ -14,8 +14,8 @@ namespace TYPO3\CMS\Fluid\ViewHelpers\Format;
* The TYPO3 project - inspiring people to share!
*/
-use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper;
+use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
/**
* Removes tags from the given string (applying PHPs strip_tags() function)
diff --git a/typo3/sysext/fluid/Classes/ViewHelpers/Format/UrlencodeViewHelper.php b/typo3/sysext/fluid/Classes/ViewHelpers/Format/UrlencodeViewHelper.php
index cd305e3c2967..2a95c3cba9ad 100644
--- a/typo3/sysext/fluid/Classes/ViewHelpers/Format/UrlencodeViewHelper.php
+++ b/typo3/sysext/fluid/Classes/ViewHelpers/Format/UrlencodeViewHelper.php
@@ -14,8 +14,8 @@ namespace TYPO3\CMS\Fluid\ViewHelpers\Format;
* The TYPO3 project - inspiring people to share!
*/
-use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper;
+use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
/**
* Encodes the given string according to http://www.faqs.org/rfcs/rfc3986.html (applying PHPs rawurlencode() function)
diff --git a/typo3/sysext/fluid/Classes/ViewHelpers/Link/TypolinkViewHelper.php b/typo3/sysext/fluid/Classes/ViewHelpers/Link/TypolinkViewHelper.php
index 672010db145a..f151da9f8303 100644
--- a/typo3/sysext/fluid/Classes/ViewHelpers/Link/TypolinkViewHelper.php
+++ b/typo3/sysext/fluid/Classes/ViewHelpers/Link/TypolinkViewHelper.php
@@ -14,10 +14,10 @@ namespace TYPO3\CMS\Fluid\ViewHelpers\Link;
* The TYPO3 project - inspiring people to share!
*/
use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper;
use TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer;
use TYPO3\CMS\Frontend\Service\TypoLinkCodecService;
+use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
/**
* A ViewHelper to create links from fields supported by the link wizard
diff --git a/typo3/sysext/fluid/Classes/ViewHelpers/TranslateViewHelper.php b/typo3/sysext/fluid/Classes/ViewHelpers/TranslateViewHelper.php
index 42503e2a32bd..f12df4a6e6d4 100644
--- a/typo3/sysext/fluid/Classes/ViewHelpers/TranslateViewHelper.php
+++ b/typo3/sysext/fluid/Classes/ViewHelpers/TranslateViewHelper.php
@@ -14,9 +14,9 @@ namespace TYPO3\CMS\Fluid\ViewHelpers;
* The TYPO3 project - inspiring people to share!
*/
use TYPO3\CMS\Extbase\Utility\LocalizationUtility;
-use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper;
use TYPO3\CMS\Fluid\Core\ViewHelper\Exception\InvalidVariableException;
+use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
/**
* Translate a key from locallang. The files are loaded from the folder
diff --git a/typo3/sysext/fluid/Classes/ViewHelpers/Uri/EmailViewHelper.php b/typo3/sysext/fluid/Classes/ViewHelpers/Uri/EmailViewHelper.php
index f36ac478eacd..51f6ab5d5638 100644
--- a/typo3/sysext/fluid/Classes/ViewHelpers/Uri/EmailViewHelper.php
+++ b/typo3/sysext/fluid/Classes/ViewHelpers/Uri/EmailViewHelper.php
@@ -13,8 +13,8 @@ namespace TYPO3\CMS\Fluid\ViewHelpers\Uri;
*
* The TYPO3 project - inspiring people to share!
*/
-use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper;
+use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
/**
* Email URI view helper.
diff --git a/typo3/sysext/fluid/Classes/ViewHelpers/Uri/ExternalViewHelper.php b/typo3/sysext/fluid/Classes/ViewHelpers/Uri/ExternalViewHelper.php
index 9d553a3120e9..e36854f9a852 100644
--- a/typo3/sysext/fluid/Classes/ViewHelpers/Uri/ExternalViewHelper.php
+++ b/typo3/sysext/fluid/Classes/ViewHelpers/Uri/ExternalViewHelper.php
@@ -13,8 +13,8 @@ namespace TYPO3\CMS\Fluid\ViewHelpers\Uri;
*
* The TYPO3 project - inspiring people to share!
*/
-use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper;
+use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
/**
* A view helper for creating URIs to external targets.
diff --git a/typo3/sysext/fluid/Classes/ViewHelpers/Uri/ImageViewHelper.php b/typo3/sysext/fluid/Classes/ViewHelpers/Uri/ImageViewHelper.php
index c5904c49d2b1..1e2a6ddce89d 100644
--- a/typo3/sysext/fluid/Classes/ViewHelpers/Uri/ImageViewHelper.php
+++ b/typo3/sysext/fluid/Classes/ViewHelpers/Uri/ImageViewHelper.php
@@ -19,9 +19,9 @@ use TYPO3\CMS\Core\Resource\FileReference;
use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Extbase\Object\ObjectManager;
use TYPO3\CMS\Extbase\Service\ImageService;
-use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper;
use TYPO3\CMS\Fluid\Core\ViewHelper\Exception;
+use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
/**
* Resizes a given image (if required) and returns its relative path.
diff --git a/typo3/sysext/fluid/Classes/ViewHelpers/Uri/TypolinkViewHelper.php b/typo3/sysext/fluid/Classes/ViewHelpers/Uri/TypolinkViewHelper.php
index 90ec8faec46c..3c0a9d888eaf 100644
--- a/typo3/sysext/fluid/Classes/ViewHelpers/Uri/TypolinkViewHelper.php
+++ b/typo3/sysext/fluid/Classes/ViewHelpers/Uri/TypolinkViewHelper.php
@@ -14,10 +14,10 @@ namespace TYPO3\CMS\Fluid\ViewHelpers\Uri;
* The TYPO3 project - inspiring people to share!
*/
use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper;
use TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer;
use TYPO3\CMS\Frontend\Service\TypoLinkCodecService;
+use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
/**
* A ViewHelper to create uris from fields supported by the link wizard
diff --git a/typo3/sysext/fluid_styled_content/Classes/ViewHelpers/Link/ClickEnlargeViewHelper.php b/typo3/sysext/fluid_styled_content/Classes/ViewHelpers/Link/ClickEnlargeViewHelper.php
index 4ac928413296..196cee681455 100644
--- a/typo3/sysext/fluid_styled_content/Classes/ViewHelpers/Link/ClickEnlargeViewHelper.php
+++ b/typo3/sysext/fluid_styled_content/Classes/ViewHelpers/Link/ClickEnlargeViewHelper.php
@@ -18,9 +18,9 @@ use TYPO3\CMS\Core\Resource\FileInterface;
use TYPO3\CMS\Core\Resource\FileReference;
use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Extbase\Service\TypoScriptService;
-use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper;
use TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer;
+use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
/**
* A view helper for creating a link for an image popup.
diff --git a/typo3/sysext/form/Classes/Domain/Repository/ContentRepository.php b/typo3/sysext/form/Classes/Domain/Repository/ContentRepository.php
index 80c4f86e702f..ee488067f529 100644
--- a/typo3/sysext/form/Classes/Domain/Repository/ContentRepository.php
+++ b/typo3/sysext/form/Classes/Domain/Repository/ContentRepository.php
@@ -15,7 +15,6 @@ namespace TYPO3\CMS\Form\Domain\Repository;
*/
use TYPO3\CMS\Backend\Utility\BackendUtility;
-use TYPO3\CMS\Core\DataHandling\DataHandler;
use TYPO3\CMS\Core\TypoScript\Parser\TypoScriptParser;
use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Form\Domain\Factory\JsonToTypoScript;
@@ -40,11 +39,11 @@ class ContentRepository
{
$record = false;
$getPostVariables = GeneralUtility::_GP('P');
- if(!$table) {
+ if (!$table) {
$table = 'tt_content';
}
- if(!$recordId) {
+ if (!$recordId) {
$recordId = (int)$getPostVariables['uid'];
}
diff --git a/typo3/sysext/form/Classes/Domain/Validator/FileAllowedTypesValidator.php b/typo3/sysext/form/Classes/Domain/Validator/FileAllowedTypesValidator.php
index 67ce42a7ca09..a271d91709f1 100755
--- a/typo3/sysext/form/Classes/Domain/Validator/FileAllowedTypesValidator.php
+++ b/typo3/sysext/form/Classes/Domain/Validator/FileAllowedTypesValidator.php
@@ -78,4 +78,4 @@ class FileAllowedTypesValidator extends AbstractValidator
return $message;
}
-}
\ No newline at end of file
+}
diff --git a/typo3/sysext/form/Classes/View/Wizard/Element/FormWizardElement.php b/typo3/sysext/form/Classes/View/Wizard/Element/FormWizardElement.php
index 5916b22fc00d..492525eb9499 100644
--- a/typo3/sysext/form/Classes/View/Wizard/Element/FormWizardElement.php
+++ b/typo3/sysext/form/Classes/View/Wizard/Element/FormWizardElement.php
@@ -15,8 +15,8 @@ namespace TYPO3\CMS\Form\View\Wizard\Element;
*/
use TYPO3\CMS\Backend\Form\Element\AbstractFormElement;
-use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Core\Utility\ExtensionManagementUtility;
+use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Core\Utility\StringUtility;
use TYPO3\CMS\Extbase\Service\TypoScriptService;
use TYPO3\CMS\Form\Domain\Repository\ContentRepository;
@@ -221,7 +221,7 @@ class FormWizardElement extends AbstractFormElement
$attributeString .= ' ' . $attributeName . '="' . htmlspecialchars($attributeValue) . '"';
}
- $input = '<input ' . $attributeString . ' type="hidden" />' . "\n" ;
+ $input = '<input ' . $attributeString . ' type="hidden" />' . "\n";
$content = $input . '<div id="form-wizard-element"></div>';
$this->resultArray['html'] = '<div id="form-wizard-element-container" rel="' . $attributes['id'] . '">'
. "\n" . $content
@@ -236,5 +236,4 @@ class FormWizardElement extends AbstractFormElement
{
return GeneralUtility::makeInstance(TypoScriptService::class);
}
-
}
diff --git a/typo3/sysext/form/Tests/Unit/Utility/TypoScriptToJsonConverterTest.php b/typo3/sysext/form/Tests/Unit/Utility/TypoScriptToJsonConverterTest.php
index 257b1b539588..105f53bf9c19 100644
--- a/typo3/sysext/form/Tests/Unit/Utility/TypoScriptToJsonConverterTest.php
+++ b/typo3/sysext/form/Tests/Unit/Utility/TypoScriptToJsonConverterTest.php
@@ -16,8 +16,8 @@ namespace TYPO3\CMS\Form\Tests\Unit\Utility;
use TYPO3\CMS\Core\Tests\AccessibleObjectInterface;
use TYPO3\CMS\Core\Tests\UnitTestCase;
-use TYPO3\CMS\Form\Utility\TypoScriptToJsonConverter;
use TYPO3\CMS\Form\Domain\Model\Json\FormJsonElement;
+use TYPO3\CMS\Form\Utility\TypoScriptToJsonConverter;
/**
* Test case for \TYPO3\CMS\Form\Utility\TypoScriptToJsonConverter
@@ -36,12 +36,12 @@ class TypoScriptToJsonConverterTest extends UnitTestCase
public function getChildElementsByIntegerKeyCallsAddElement(array $typoScript, $methodCount)
{
/** @var FormJsonElement|\PHPUnit_Framework_MockObject_MockObject $mockSubject */
- $parentElement = $this->getMock(FormJsonElement::class, ['addElement',]);
+ $parentElement = $this->getMock(FormJsonElement::class, ['addElement']);
// check if method gets called exactly X times
$parentElement->expects($this->exactly($methodCount))->method('addElement');
/** @var TypoScriptToJsonConverter|\PHPUnit_Framework_MockObject_MockObject|AccessibleObjectInterface $subjectAccessible */
- $accessibleSubject = $this->getAccessibleMock(TypoScriptToJsonConverter::class, ['dummy',]);
+ $accessibleSubject = $this->getAccessibleMock(TypoScriptToJsonConverter::class, ['dummy']);
$accessibleSubject->_call('getChildElementsByIntegerKey', $parentElement, $typoScript);
}
diff --git a/typo3/sysext/frontend/Classes/ContentObject/Exception/ProductionExceptionHandler.php b/typo3/sysext/frontend/Classes/ContentObject/Exception/ProductionExceptionHandler.php
index 562eee818e8f..fb9e45cc6f7a 100644
--- a/typo3/sysext/frontend/Classes/ContentObject/Exception/ProductionExceptionHandler.php
+++ b/typo3/sysext/frontend/Classes/ContentObject/Exception/ProductionExceptionHandler.php
@@ -15,10 +15,10 @@ namespace TYPO3\CMS\Frontend\ContentObject\Exception;
*/
use Psr\Log\LoggerInterface;
+use TYPO3\CMS\Core\Crypto\Random;
use TYPO3\CMS\Core\Log\LogManager;
use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Frontend\ContentObject\AbstractContentObject;
-use TYPO3\CMS\Core\Crypto\Random;
/**
* Exception handler class for content object rendering
diff --git a/typo3/sysext/frontend/Classes/Page/PageGenerator.php b/typo3/sysext/frontend/Classes/Page/PageGenerator.php
index 01e84d5467d0..2bb6b880cd5c 100644
--- a/typo3/sysext/frontend/Classes/Page/PageGenerator.php
+++ b/typo3/sysext/frontend/Classes/Page/PageGenerator.php
@@ -17,7 +17,6 @@ namespace TYPO3\CMS\Frontend\Page;
use TYPO3\CMS\Core\Page\PageRenderer;
use TYPO3\CMS\Core\TimeTracker\TimeTracker;
use TYPO3\CMS\Core\Type\File\ImageInfo;
-use TYPO3\CMS\Core\Utility\ArrayUtility;
use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Core\Utility\MathUtility;
use TYPO3\CMS\Core\Utility\PathUtility;
diff --git a/typo3/sysext/frontend/Tests/Unit/ContentObject/CaseContentObjectTest.php b/typo3/sysext/frontend/Tests/Unit/ContentObject/CaseContentObjectTest.php
index ecdf43ebffc6..cb9701471b5e 100644
--- a/typo3/sysext/frontend/Tests/Unit/ContentObject/CaseContentObjectTest.php
+++ b/typo3/sysext/frontend/Tests/Unit/ContentObject/CaseContentObjectTest.php
@@ -13,7 +13,6 @@ namespace TYPO3\CMS\Frontend\Tests\Unit\ContentObject;
*
* The TYPO3 project - inspiring people to share!
*/
-use TYPO3\CMS\Core\Charset\CharsetConverter;
use TYPO3\CMS\Core\Tests\UnitTestCase;
use TYPO3\CMS\Core\TypoScript\TemplateService;
use TYPO3\CMS\Frontend\ContentObject\CaseContentObject;
diff --git a/typo3/sysext/frontend/Tests/Unit/ContentObject/FilesContentObjectTest.php b/typo3/sysext/frontend/Tests/Unit/ContentObject/FilesContentObjectTest.php
index 06e4d95e8e5d..a32bcaa35b17 100644
--- a/typo3/sysext/frontend/Tests/Unit/ContentObject/FilesContentObjectTest.php
+++ b/typo3/sysext/frontend/Tests/Unit/ContentObject/FilesContentObjectTest.php
@@ -13,7 +13,6 @@ namespace TYPO3\CMS\Frontend\Tests\Unit\ContentObject;
*
* The TYPO3 project - inspiring people to share!
*/
-use TYPO3\CMS\Core\Charset\CharsetConverter;
use TYPO3\CMS\Core\Resource\Collection\StaticFileCollection;
use TYPO3\CMS\Core\Resource\File;
use TYPO3\CMS\Core\Resource\FileCollectionRepository;
diff --git a/typo3/sysext/indexed_search/Classes/ViewHelpers/Format/DateTimeViewHelper.php b/typo3/sysext/indexed_search/Classes/ViewHelpers/Format/DateTimeViewHelper.php
index e7cda9505c7d..a581ba77e1d5 100644
--- a/typo3/sysext/indexed_search/Classes/ViewHelpers/Format/DateTimeViewHelper.php
+++ b/typo3/sysext/indexed_search/Classes/ViewHelpers/Format/DateTimeViewHelper.php
@@ -15,8 +15,8 @@ namespace TYPO3\CMS\IndexedSearch\ViewHelpers\Format;
*/
use TYPO3\CMS\Backend\Utility\BackendUtility;
-use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper;
+use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
/**
* DateTime viewhelper
diff --git a/typo3/sysext/indexed_search/Classes/ViewHelpers/Format/FlagValueViewHelper.php b/typo3/sysext/indexed_search/Classes/ViewHelpers/Format/FlagValueViewHelper.php
index 6dda945babe2..763614cbcb7f 100644
--- a/typo3/sysext/indexed_search/Classes/ViewHelpers/Format/FlagValueViewHelper.php
+++ b/typo3/sysext/indexed_search/Classes/ViewHelpers/Format/FlagValueViewHelper.php
@@ -14,8 +14,8 @@ namespace TYPO3\CMS\IndexedSearch\ViewHelpers\Format;
* The TYPO3 project - inspiring people to share!
*/
-use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper;
+use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
/**
* FlagValue viewhelper
diff --git a/typo3/sysext/indexed_search/Classes/ViewHelpers/Format/GroupListViewHelper.php b/typo3/sysext/indexed_search/Classes/ViewHelpers/Format/GroupListViewHelper.php
index f9126a000047..14e537ca42be 100644
--- a/typo3/sysext/indexed_search/Classes/ViewHelpers/Format/GroupListViewHelper.php
+++ b/typo3/sysext/indexed_search/Classes/ViewHelpers/Format/GroupListViewHelper.php
@@ -14,8 +14,8 @@ namespace TYPO3\CMS\IndexedSearch\ViewHelpers\Format;
* The TYPO3 project - inspiring people to share!
*/
-use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper;
+use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
/**
* Group list viewhelper
diff --git a/typo3/sysext/indexed_search/Classes/ViewHelpers/PageBrowsingResultsViewHelper.php b/typo3/sysext/indexed_search/Classes/ViewHelpers/PageBrowsingResultsViewHelper.php
index a16c2411f958..501fd8851375 100644
--- a/typo3/sysext/indexed_search/Classes/ViewHelpers/PageBrowsingResultsViewHelper.php
+++ b/typo3/sysext/indexed_search/Classes/ViewHelpers/PageBrowsingResultsViewHelper.php
@@ -15,8 +15,8 @@ namespace TYPO3\CMS\IndexedSearch\ViewHelpers;
*/
use TYPO3\CMS\Extbase\Utility\LocalizationUtility;
-use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper;
+use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
/**
* renders the header of the results page
diff --git a/typo3/sysext/indexed_search/Classes/ViewHelpers/PageBrowsingViewHelper.php b/typo3/sysext/indexed_search/Classes/ViewHelpers/PageBrowsingViewHelper.php
index 6d3502dcad4e..dbc8f451f196 100644
--- a/typo3/sysext/indexed_search/Classes/ViewHelpers/PageBrowsingViewHelper.php
+++ b/typo3/sysext/indexed_search/Classes/ViewHelpers/PageBrowsingViewHelper.php
@@ -17,8 +17,8 @@ namespace TYPO3\CMS\IndexedSearch\ViewHelpers;
use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Core\Utility\MathUtility;
use TYPO3\CMS\Extbase\Utility\LocalizationUtility;
-use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper;
+use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
/**
* Page browser for indexed search, and only useful here, as the
diff --git a/typo3/sysext/indexed_search/ext_localconf.php b/typo3/sysext/indexed_search/ext_localconf.php
index e77fa77595a2..20ece71edbbd 100644
--- a/typo3/sysext/indexed_search/ext_localconf.php
+++ b/typo3/sysext/indexed_search/ext_localconf.php
@@ -1,7 +1,6 @@
<?php
defined('TYPO3_MODE') or die();
-
// register extbase plugin
\TYPO3\CMS\Extbase\Utility\ExtensionUtility::configurePlugin('TYPO3.CMS.IndexedSearch', 'Pi2', array('Search' => 'form,search'), array('Search' => 'form,search'));
diff --git a/typo3/sysext/indexed_search/ext_tables.php b/typo3/sysext/indexed_search/ext_tables.php
index bba4b0b14164..05f89f23d282 100644
--- a/typo3/sysext/indexed_search/ext_tables.php
+++ b/typo3/sysext/indexed_search/ext_tables.php
@@ -18,7 +18,6 @@ if (TYPO3_MODE === 'BE') {
'labels' => 'LLL:EXT:indexed_search/Resources/Private/Language/locallang_mod.xlf',
)
);
-
}
\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::allowTableOnStandardPages('index_config');
diff --git a/typo3/sysext/install/Classes/ViewHelpers/ConstantViewHelper.php b/typo3/sysext/install/Classes/ViewHelpers/ConstantViewHelper.php
index bc211eecdb3c..bd06828e6bcc 100644
--- a/typo3/sysext/install/Classes/ViewHelpers/ConstantViewHelper.php
+++ b/typo3/sysext/install/Classes/ViewHelpers/ConstantViewHelper.php
@@ -14,8 +14,8 @@ namespace TYPO3\CMS\Install\ViewHelpers;
* The TYPO3 project - inspiring people to share!
*/
-use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper;
+use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
/**
* Render value of a constant
diff --git a/typo3/sysext/install/Classes/ViewHelpers/File/ExistsViewHelper.php b/typo3/sysext/install/Classes/ViewHelpers/File/ExistsViewHelper.php
index 959b4e55a5f5..e316ed7f4ecc 100644
--- a/typo3/sysext/install/Classes/ViewHelpers/File/ExistsViewHelper.php
+++ b/typo3/sysext/install/Classes/ViewHelpers/File/ExistsViewHelper.php
@@ -14,8 +14,8 @@ namespace TYPO3\CMS\Install\ViewHelpers\File;
* The TYPO3 project - inspiring people to share!
*/
-use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper;
+use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
/**
* Simple view helper to check if given file is a regular file
diff --git a/typo3/sysext/install/Classes/ViewHelpers/File/ImageDimensionViewHelper.php b/typo3/sysext/install/Classes/ViewHelpers/File/ImageDimensionViewHelper.php
index 3997268e07e3..308fcc0d0e63 100644
--- a/typo3/sysext/install/Classes/ViewHelpers/File/ImageDimensionViewHelper.php
+++ b/typo3/sysext/install/Classes/ViewHelpers/File/ImageDimensionViewHelper.php
@@ -14,8 +14,8 @@ namespace TYPO3\CMS\Install\ViewHelpers\File;
* The TYPO3 project - inspiring people to share!
*/
-use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper;
+use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
/**
* Get width or height from image file
diff --git a/typo3/sysext/install/Classes/ViewHelpers/File/RelativePathViewHelper.php b/typo3/sysext/install/Classes/ViewHelpers/File/RelativePathViewHelper.php
index e914370eaa1c..73fddaa7f37b 100644
--- a/typo3/sysext/install/Classes/ViewHelpers/File/RelativePathViewHelper.php
+++ b/typo3/sysext/install/Classes/ViewHelpers/File/RelativePathViewHelper.php
@@ -14,8 +14,8 @@ namespace TYPO3\CMS\Install\ViewHelpers\File;
* The TYPO3 project - inspiring people to share!
*/
-use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper;
+use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
/**
* Get file path relative to PATH_site from absolute path
diff --git a/typo3/sysext/install/Classes/ViewHelpers/File/SizeViewHelper.php b/typo3/sysext/install/Classes/ViewHelpers/File/SizeViewHelper.php
index c18c6a3871ce..cf3b9fe07b15 100644
--- a/typo3/sysext/install/Classes/ViewHelpers/File/SizeViewHelper.php
+++ b/typo3/sysext/install/Classes/ViewHelpers/File/SizeViewHelper.php
@@ -15,8 +15,8 @@ namespace TYPO3\CMS\Install\ViewHelpers\File;
*/
use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper;
+use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
/**
* Get file size from file
diff --git a/typo3/sysext/install/Classes/ViewHelpers/Format/CropViewHelper.php b/typo3/sysext/install/Classes/ViewHelpers/Format/CropViewHelper.php
index af7f162e40e2..e90d2b181e4c 100644
--- a/typo3/sysext/install/Classes/ViewHelpers/Format/CropViewHelper.php
+++ b/typo3/sysext/install/Classes/ViewHelpers/Format/CropViewHelper.php
@@ -14,8 +14,8 @@ namespace TYPO3\CMS\Install\ViewHelpers\Format;
* The TYPO3 project - inspiring people to share!
*/
-use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper;
+use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
/**
* Simplified crop view helper that does not need a frontend environment
diff --git a/typo3/sysext/install/Classes/ViewHelpers/Format/ImageMagickCommandsViewHelper.php b/typo3/sysext/install/Classes/ViewHelpers/Format/ImageMagickCommandsViewHelper.php
index 6572b9ebc619..926b9f102a96 100644
--- a/typo3/sysext/install/Classes/ViewHelpers/Format/ImageMagickCommandsViewHelper.php
+++ b/typo3/sysext/install/Classes/ViewHelpers/Format/ImageMagickCommandsViewHelper.php
@@ -14,8 +14,8 @@ namespace TYPO3\CMS\Install\ViewHelpers\Format;
* The TYPO3 project - inspiring people to share!
*/
-use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper;
+use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
/**
* Display image magick commands
diff --git a/typo3/sysext/install/Classes/ViewHelpers/Format/PhpErrorCodeViewHelper.php b/typo3/sysext/install/Classes/ViewHelpers/Format/PhpErrorCodeViewHelper.php
index be8bc76a6b20..09dedf385122 100644
--- a/typo3/sysext/install/Classes/ViewHelpers/Format/PhpErrorCodeViewHelper.php
+++ b/typo3/sysext/install/Classes/ViewHelpers/Format/PhpErrorCodeViewHelper.php
@@ -14,8 +14,8 @@ namespace TYPO3\CMS\Install\ViewHelpers\Format;
* The TYPO3 project - inspiring people to share!
*/
-use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper;
+use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
/**
* Transform PHP error code to readable text
diff --git a/typo3/sysext/install/Classes/ViewHelpers/Object/ArrayValueByKeyViewHelper.php b/typo3/sysext/install/Classes/ViewHelpers/Object/ArrayValueByKeyViewHelper.php
index 9bed49b96a8b..3c5ef64a0011 100644
--- a/typo3/sysext/install/Classes/ViewHelpers/Object/ArrayValueByKeyViewHelper.php
+++ b/typo3/sysext/install/Classes/ViewHelpers/Object/ArrayValueByKeyViewHelper.php
@@ -14,9 +14,9 @@ namespace TYPO3\CMS\Install\ViewHelpers\Object;
* The TYPO3 project - inspiring people to share!
*/
-use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper;
use TYPO3\CMS\Install\ViewHelpers\Exception;
+use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
/**
* View helper which allows you to access a key in an array.
diff --git a/typo3/sysext/install/Classes/ViewHelpers/PhpInfoViewHelper.php b/typo3/sysext/install/Classes/ViewHelpers/PhpInfoViewHelper.php
index 8af3d4f43133..8a4325afa8f4 100644
--- a/typo3/sysext/install/Classes/ViewHelpers/PhpInfoViewHelper.php
+++ b/typo3/sysext/install/Classes/ViewHelpers/PhpInfoViewHelper.php
@@ -14,8 +14,8 @@ namespace TYPO3\CMS\Install\ViewHelpers;
* The TYPO3 project - inspiring people to share!
*/
-use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper;
+use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
/**
* Utility class for phpinfo()
diff --git a/typo3/sysext/install/Tests/Unit/FolderStructure/LinkNodeTest.php b/typo3/sysext/install/Tests/Unit/FolderStructure/LinkNodeTest.php
index 84dee7d30f1a..7be84dbd5da9 100644
--- a/typo3/sysext/install/Tests/Unit/FolderStructure/LinkNodeTest.php
+++ b/typo3/sysext/install/Tests/Unit/FolderStructure/LinkNodeTest.php
@@ -365,7 +365,7 @@ class LinkNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
public function isTargetCorrectReturnsFalseIfActualTargetIsNotIdenticalToSpecifiedTarget()
{
$path = PATH_site . 'typo3temp/var/tests/' . $this->getUniqueId('link_');
- $target = PATH_site . 'typo3temp/var/tests/' .$this->getUniqueId('linkTarget_');
+ $target = PATH_site . 'typo3temp/var/tests/' . $this->getUniqueId('linkTarget_');
touch($target);
symlink($target, $path);
$this->testFilesToDelete[] = $path;
diff --git a/typo3/sysext/install/Tests/Unit/Updates/ContentTypesToTextMediaUpdateTest.php b/typo3/sysext/install/Tests/Unit/Updates/ContentTypesToTextMediaUpdateTest.php
index a9ae7b15dfab..b69699031cb0 100644
--- a/typo3/sysext/install/Tests/Unit/Updates/ContentTypesToTextMediaUpdateTest.php
+++ b/typo3/sysext/install/Tests/Unit/Updates/ContentTypesToTextMediaUpdateTest.php
@@ -14,7 +14,6 @@ namespace TYPO3\CMS\Install\Tests\Unit\Updates;
* The TYPO3 project - inspiring people to share!
*/
-use Prophecy\Argument;
use Prophecy\Prophecy\ObjectProphecy;
use Prophecy\Prophet;
use TYPO3\CMS\Core\Package\PackageManager;
diff --git a/typo3/sysext/lowlevel/Classes/View/DatabaseIntegrityView.php b/typo3/sysext/lowlevel/Classes/View/DatabaseIntegrityView.php
index 23fe6a48a449..0db784e82bc3 100644
--- a/typo3/sysext/lowlevel/Classes/View/DatabaseIntegrityView.php
+++ b/typo3/sysext/lowlevel/Classes/View/DatabaseIntegrityView.php
@@ -27,7 +27,6 @@ use TYPO3\CMS\Core\Imaging\IconFactory;
use TYPO3\CMS\Core\Integrity\DatabaseIntegrityCheck;
use TYPO3\CMS\Core\Utility\ExtensionManagementUtility;
use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Core\Utility\PathUtility;
use TYPO3\CMS\Fluid\View\StandaloneView;
/**
diff --git a/typo3/sysext/recordlist/Classes/RecordList/AbstractDatabaseRecordList.php b/typo3/sysext/recordlist/Classes/RecordList/AbstractDatabaseRecordList.php
index 5c98be484f9e..ba6de0333743 100644
--- a/typo3/sysext/recordlist/Classes/RecordList/AbstractDatabaseRecordList.php
+++ b/typo3/sysext/recordlist/Classes/RecordList/AbstractDatabaseRecordList.php
@@ -29,7 +29,6 @@ use TYPO3\CMS\Core\Utility\ExtensionManagementUtility;
use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Core\Utility\HttpUtility;
use TYPO3\CMS\Core\Utility\MathUtility;
-use TYPO3\CMS\Core\Utility\ArrayUtility;
/**
* Child class for rendering of Web > List (not the final class)
@@ -557,7 +556,7 @@ class AbstractDatabaseRecordList extends AbstractRecordList
$searchLevelItems = array();
// get translated labels for search levels from pagets
- foreach ($searchLevelsFromTSconfig as $keySearchLevel => $labelConfigured ) {
+ foreach ($searchLevelsFromTSconfig as $keySearchLevel => $labelConfigured) {
$label = $lang->sL('LLL:' . $labelConfigured, false);
if ($label === '') {
$label = $labelConfigured;
diff --git a/typo3/sysext/reports/Classes/ViewHelpers/IconViewHelper.php b/typo3/sysext/reports/Classes/ViewHelpers/IconViewHelper.php
index bdaf8a0a1be3..0d6d18bb2e93 100644
--- a/typo3/sysext/reports/Classes/ViewHelpers/IconViewHelper.php
+++ b/typo3/sysext/reports/Classes/ViewHelpers/IconViewHelper.php
@@ -16,8 +16,8 @@ namespace TYPO3\CMS\Reports\ViewHelpers;
use TYPO3\CMS\Core\Utility\ExtensionManagementUtility;
use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
use TYPO3\CMS\Fluid\ViewHelpers\Be\AbstractBackendViewHelper;
+use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
/**
* Render the icon of a report
diff --git a/typo3/sysext/rtehtmlarea/Classes/Extension/Spellchecker.php b/typo3/sysext/rtehtmlarea/Classes/Extension/Spellchecker.php
index 3bc915fee10d..e79337bbd8bc 100644
--- a/typo3/sysext/rtehtmlarea/Classes/Extension/Spellchecker.php
+++ b/typo3/sysext/rtehtmlarea/Classes/Extension/Spellchecker.php
@@ -15,7 +15,6 @@ namespace TYPO3\CMS\Rtehtmlarea\Extension;
*/
use TYPO3\CMS\Backend\Routing\UriBuilder;
-use TYPO3\CMS\Backend\Utility\BackendUtility;
use TYPO3\CMS\Core\Utility\ExtensionManagementUtility;
use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Rtehtmlarea\RteHtmlAreaApi;
diff --git a/typo3/sysext/scheduler/Classes/ViewHelpers/ModuleLinkViewHelper.php b/typo3/sysext/scheduler/Classes/ViewHelpers/ModuleLinkViewHelper.php
index d004566ac6f2..1276fbd8b3c4 100644
--- a/typo3/sysext/scheduler/Classes/ViewHelpers/ModuleLinkViewHelper.php
+++ b/typo3/sysext/scheduler/Classes/ViewHelpers/ModuleLinkViewHelper.php
@@ -15,8 +15,8 @@ namespace TYPO3\CMS\Scheduler\ViewHelpers;
*/
use TYPO3\CMS\Backend\Utility\BackendUtility;
-use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper;
+use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
/**
* Create internal link within backend app
diff --git a/typo3/sysext/sys_action/Classes/ActionTask.php b/typo3/sysext/sys_action/Classes/ActionTask.php
index 7c04e4d2e869..8169e2730d90 100644
--- a/typo3/sysext/sys_action/Classes/ActionTask.php
+++ b/typo3/sysext/sys_action/Classes/ActionTask.php
@@ -190,7 +190,7 @@ class ActionTask implements \TYPO3\CMS\Taskcenter\TaskInterface
'uid' => 'actiontask' . $actionRow['uid'],
'title' => $actionRow['title'],
'description' => $actionRow['description'],
- 'descriptionHtml' => ($actionRow['description'] ? '<p>' . nl2br(htmlspecialchars($actionRow['description'])) . '</p>' : '' ) . $editActionLink,
+ 'descriptionHtml' => ($actionRow['description'] ? '<p>' . nl2br(htmlspecialchars($actionRow['description'])) . '</p>' : '') . $editActionLink,
'link' => $this->moduleUrl . '&SET[function]=sys_action.TYPO3\\CMS\\SysAction\\ActionTask&show=' . $actionRow['uid']
);
}
diff --git a/typo3/sysext/sys_note/Classes/ViewHelpers/DeleteLinkViewHelper.php b/typo3/sysext/sys_note/Classes/ViewHelpers/DeleteLinkViewHelper.php
index fad87084bc06..212c7fcbc022 100644
--- a/typo3/sysext/sys_note/Classes/ViewHelpers/DeleteLinkViewHelper.php
+++ b/typo3/sysext/sys_note/Classes/ViewHelpers/DeleteLinkViewHelper.php
@@ -16,8 +16,8 @@ namespace TYPO3\CMS\SysNote\ViewHelpers;
use TYPO3\CMS\Backend\Utility\BackendUtility;
use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper;
+use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
/**
* ViewHelper to create a link to delete a note
diff --git a/typo3/sysext/sys_note/Classes/ViewHelpers/EditLinkViewHelper.php b/typo3/sysext/sys_note/Classes/ViewHelpers/EditLinkViewHelper.php
index 0247c14a4290..b0c23e7fbd2a 100644
--- a/typo3/sysext/sys_note/Classes/ViewHelpers/EditLinkViewHelper.php
+++ b/typo3/sysext/sys_note/Classes/ViewHelpers/EditLinkViewHelper.php
@@ -16,8 +16,8 @@ namespace TYPO3\CMS\SysNote\ViewHelpers;
use TYPO3\CMS\Backend\Utility\BackendUtility;
use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper;
+use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
/**
* ViewHelper to create a link to edit a note
diff --git a/typo3/sysext/taskcenter/Classes/Controller/TaskModuleController.php b/typo3/sysext/taskcenter/Classes/Controller/TaskModuleController.php
index 18b5890811a7..59988e2791db 100644
--- a/typo3/sysext/taskcenter/Classes/Controller/TaskModuleController.php
+++ b/typo3/sysext/taskcenter/Classes/Controller/TaskModuleController.php
@@ -17,7 +17,6 @@ namespace TYPO3\CMS\Taskcenter\Controller;
use Psr\Http\Message\ResponseInterface;
use Psr\Http\Message\ServerRequestInterface;
use TYPO3\CMS\Backend\Module\BaseScriptClass;
-use TYPO3\CMS\Backend\Template\Components\ButtonBar;
use TYPO3\CMS\Backend\Template\ModuleTemplate;
use TYPO3\CMS\Backend\Utility\BackendUtility;
use TYPO3\CMS\Core\Imaging\Icon;
@@ -332,7 +331,7 @@ class TaskModuleController extends BaseScriptClass
}
$description = $item['descriptionHtml'] ?: '<p>' . nl2br(htmlspecialchars($item['description'])) . '</p>';
$id = $this->getUniqueKey($item['uid']);
- $contentId = strtolower(str_replace('\\','-',$id));
+ $contentId = strtolower(str_replace('\\', '-', $id));
// Collapsed & expanded menu items
if (isset($this->getBackendUser()->uc['taskcenter']['states'][$id]) && $this->getBackendUser()->uc['taskcenter']['states'][$id]) {
$collapsed = true;
@@ -347,7 +346,7 @@ class TaskModuleController extends BaseScriptClass
<div id="' . $contentId . '" data-taskcenter-id="' . $id . '" class="panel ' . $panelState . '">
<div class="panel-heading">
<div class="panel-heading-right">
- <a href="#task_content_' . $contentId . '" class="panel-header-collapse t3js-taskcenter-header-collapse" role="button" data-toggle="collapse" data-uid="' . $contentId . '" aria-expanded="' . ($collapsed ? 'false' : 'true') .'">
+ <a href="#task_content_' . $contentId . '" class="panel-header-collapse t3js-taskcenter-header-collapse" role="button" data-toggle="collapse" data-uid="' . $contentId . '" aria-expanded="' . ($collapsed ? 'false' : 'true') . '">
' . $collapseIcon . '
</a>
</div>
diff --git a/typo3/sysext/tstemplate/Classes/Controller/TypoScriptTemplateModuleController.php b/typo3/sysext/tstemplate/Classes/Controller/TypoScriptTemplateModuleController.php
index 3bd175609ee3..a8c9d507055f 100755
--- a/typo3/sysext/tstemplate/Classes/Controller/TypoScriptTemplateModuleController.php
+++ b/typo3/sysext/tstemplate/Classes/Controller/TypoScriptTemplateModuleController.php
@@ -23,7 +23,6 @@ use TYPO3\CMS\Backend\Utility\BackendUtility;
use TYPO3\CMS\Core\DataHandling\DataHandler;
use TYPO3\CMS\Core\Imaging\Icon;
use TYPO3\CMS\Core\TypoScript\ExtendedTemplateService;
-use TYPO3\CMS\Core\Utility\ExtensionManagementUtility;
use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Core\Utility\MathUtility;
use TYPO3\CMS\Fluid\View\StandaloneView;
--
GitLab