[TASK] Add more fixers for php-cs-fixer 65/49665/4
authorWouter Wolters <typo3@wouterwolters.nl>
Tue, 30 Aug 2016 16:57:24 +0000 (18:57 +0200)
committerAndreas Fernandez <typo3@scripting-base.de>
Tue, 30 Aug 2016 21:09:18 +0000 (23:09 +0200)
Resolves: #77701
Releases: master
Change-Id: Id5f32eb76ac3adddd834160bc79828fefd0ce63c
Reviewed-on: https://review.typo3.org/49665
Tested-by: Bamboo TYPO3com <info@typo3.com>
Reviewed-by: Georg Ringer <georg.ringer@gmail.com>
Tested-by: Georg Ringer <georg.ringer@gmail.com>
Reviewed-by: Andreas Fernandez <typo3@scripting-base.de>
Tested-by: Andreas Fernandez <typo3@scripting-base.de>
172 files changed:
Build/.php_cs
typo3/sysext/backend/Classes/Controller/ContentElement/NewContentElementController.php
typo3/sysext/backend/Classes/Controller/FormInlineAjaxController.php
typo3/sysext/backend/Classes/Form/FormDataProvider/AbstractItemProvider.php
typo3/sysext/backend/Classes/History/RecordHistory.php
typo3/sysext/backend/Classes/Http/RequestHandler.php
typo3/sysext/backend/Classes/RecordList/AbstractRecordList.php
typo3/sysext/backend/Classes/Template/Components/Buttons/Action/HelpButton.php
typo3/sysext/backend/Classes/Template/Components/Buttons/Action/ShortcutButton.php
typo3/sysext/backend/Classes/Template/Components/Buttons/FullyRenderedButton.php
typo3/sysext/backend/Classes/Template/Components/Buttons/InputButton.php
typo3/sysext/backend/Classes/Template/Components/Buttons/LinkButton.php
typo3/sysext/backend/Classes/Template/Components/Menu/Menu.php
typo3/sysext/backend/Classes/Tree/Pagetree/ExtdirectTreeCommands.php
typo3/sysext/backend/Classes/Tree/Pagetree/PagetreeNode.php
typo3/sysext/backend/Classes/Tree/Renderer/ExtJsJsonTreeRenderer.php
typo3/sysext/backend/Classes/Utility/BackendUtility.php
typo3/sysext/backend/Classes/View/BackendLayout/BackendLayout.php
typo3/sysext/backend/Classes/View/BackendLayout/DefaultDataProvider.php
typo3/sysext/backend/Classes/View/PageLayoutView.php
typo3/sysext/backend/Tests/Unit/Form/Element/InputTextElementTest.php
typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/TcaColumnsProcessRecordTitleTest.php
typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/TcaSelectItemsTest.php
typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/TcaSelectTreeItemsTest.php
typo3/sysext/core/Build/Configuration/Acceptance/Support/AcceptanceTester.php
typo3/sysext/core/Build/Scripts/cglFixMyCommit.sh
typo3/sysext/core/Classes/Authentication/AbstractUserAuthentication.php
typo3/sysext/core/Classes/Authentication/BackendUserAuthentication.php
typo3/sysext/core/Classes/Category/Collection/CategoryCollection.php
typo3/sysext/core/Classes/Charset/CharsetConverter.php
typo3/sysext/core/Classes/Collection/StaticRecordCollection.php
typo3/sysext/core/Classes/Configuration/TypoScript/ConditionMatching/AbstractConditionMatcher.php
typo3/sysext/core/Classes/Controller/ErrorPageController.php
typo3/sysext/core/Classes/Core/ApplicationContext.php
typo3/sysext/core/Classes/Crypto/Random.php
typo3/sysext/core/Classes/DataHandling/DataHandler.php
typo3/sysext/core/Classes/Database/Connection.php
typo3/sysext/core/Classes/Database/ConnectionPool.php
typo3/sysext/core/Classes/Database/Query/BulkInsertQuery.php
typo3/sysext/core/Classes/Database/Query/Expression/CompositeExpression.php
typo3/sysext/core/Classes/Database/Query/Expression/ExpressionBuilder.php
typo3/sysext/core/Classes/Database/Query/QueryBuilder.php
typo3/sysext/core/Classes/Database/Query/QueryHelper.php
typo3/sysext/core/Classes/Database/Query/Restriction/AbstractRestrictionContainer.php
typo3/sysext/core/Classes/Database/Query/Restriction/BackendWorkspaceRestriction.php
typo3/sysext/core/Classes/Database/Query/Restriction/DefaultRestrictionContainer.php
typo3/sysext/core/Classes/Database/Query/Restriction/DeletedRestriction.php
typo3/sysext/core/Classes/Database/Query/Restriction/EndTimeRestriction.php
typo3/sysext/core/Classes/Database/Query/Restriction/FrontendGroupRestriction.php
typo3/sysext/core/Classes/Database/Query/Restriction/FrontendRestrictionContainer.php
typo3/sysext/core/Classes/Database/Query/Restriction/FrontendWorkspaceRestriction.php
typo3/sysext/core/Classes/Database/Query/Restriction/HiddenRestriction.php
typo3/sysext/core/Classes/Database/Query/Restriction/QueryRestrictionContainerInterface.php
typo3/sysext/core/Classes/Database/Query/Restriction/QueryRestrictionInterface.php
typo3/sysext/core/Classes/Database/Query/Restriction/RootLevelRestriction.php
typo3/sysext/core/Classes/Database/Query/Restriction/StartTimeRestriction.php
typo3/sysext/core/Classes/Database/ReferenceIndex.php
typo3/sysext/core/Classes/FormProtection/FormProtectionFactory.php
typo3/sysext/core/Classes/Html/HtmlParser.php
typo3/sysext/core/Classes/Http/Stream.php
typo3/sysext/core/Classes/Imaging/GraphicalFunctions.php
typo3/sysext/core/Classes/Imaging/IconFactory.php
typo3/sysext/core/Classes/LinkHandling/EmailLinkHandler.php
typo3/sysext/core/Classes/LinkHandling/FileLinkHandler.php
typo3/sysext/core/Classes/LinkHandling/FolderLinkHandler.php
typo3/sysext/core/Classes/LinkHandling/LegacyLinkNotationConverter.php
typo3/sysext/core/Classes/LinkHandling/LinkHandlingInterface.php
typo3/sysext/core/Classes/LinkHandling/LinkService.php
typo3/sysext/core/Classes/LinkHandling/PageLinkHandler.php
typo3/sysext/core/Classes/Localization/Locales.php
typo3/sysext/core/Classes/Locking/SemaphoreLockStrategy.php
typo3/sysext/core/Classes/Resource/Index/ExtractorRegistry.php
typo3/sysext/core/Classes/Resource/Index/FileIndexRepository.php
typo3/sysext/core/Classes/Resource/Index/MetaDataRepository.php
typo3/sysext/core/Classes/Resource/OnlineMedia/Helpers/OnlineMediaHelperRegistry.php
typo3/sysext/core/Classes/Resource/Rendering/RendererRegistry.php
typo3/sysext/core/Classes/Resource/ResourceFactory.php
typo3/sysext/core/Classes/Resource/ResourceStorage.php
typo3/sysext/core/Classes/Tree/TableConfiguration/DatabaseTreeDataProvider.php
typo3/sysext/core/Classes/Type/Bitmask/JsConfirmation.php
typo3/sysext/core/Classes/Utility/ClientUtility.php
typo3/sysext/core/Classes/Utility/ExtensionManagementUtility.php
typo3/sysext/core/Classes/Utility/GeneralUtility.php
typo3/sysext/core/Configuration/DefaultConfiguration.php
typo3/sysext/core/Resources/PHP/RemoveXSS.php
typo3/sysext/core/Tests/Functional/DataHandling/DataHandler/GetUniqueTest.php
typo3/sysext/core/Tests/Functional/DataHandling/DataHandler/SpecialLanguagesTest.php
typo3/sysext/core/Tests/Functional/DataHandling/Regular/CheckValueTestForCheckboxes.php
typo3/sysext/core/Tests/Functional/Framework/Frontend/Collector.php
typo3/sysext/core/Tests/Functional/Resource/ResourceStorageTest.php
typo3/sysext/core/Tests/Unit/Crypto/RandomTest.php
typo3/sysext/core/Tests/Unit/Database/ConnectionPoolTest.php
typo3/sysext/core/Tests/Unit/Database/ConnectionTest.php
typo3/sysext/core/Tests/Unit/Database/Query/BulkInsertTest.php
typo3/sysext/core/Tests/Unit/Database/Query/Expression/ExpressionBuilderTest.php
typo3/sysext/core/Tests/Unit/Database/Query/QueryBuilderTest.php
typo3/sysext/core/Tests/Unit/Database/Query/QueryHelperTest.php
typo3/sysext/core/Tests/Unit/Database/Query/Restriction/AbstractRestrictionTestCase.php
typo3/sysext/core/Tests/Unit/Database/Query/Restriction/BackendWorkspaceRestrictionTest.php
typo3/sysext/core/Tests/Unit/Database/Query/Restriction/DefaultRestrictionContainerTest.php
typo3/sysext/core/Tests/Unit/Database/Query/Restriction/DeletedRestrictionTest.php
typo3/sysext/core/Tests/Unit/Database/Query/Restriction/EndTimeRestrictionTest.php
typo3/sysext/core/Tests/Unit/Database/Query/Restriction/FrontendGroupRestrictionTest.php
typo3/sysext/core/Tests/Unit/Database/Query/Restriction/FrontendRestrictionContainerTest.php
typo3/sysext/core/Tests/Unit/Database/Query/Restriction/FrontendWorkspaceRestrictionTest.php
typo3/sysext/core/Tests/Unit/Database/Query/Restriction/HiddenRestrictionTest.php
typo3/sysext/core/Tests/Unit/Database/Query/Restriction/RootLevelRestrictionTest.php
typo3/sysext/core/Tests/Unit/Database/Query/Restriction/StartTimeRestrictionTest.php
typo3/sysext/core/Tests/Unit/Locking/FileLockStrategyTest.php
typo3/sysext/core/Tests/Unit/Resource/ResourceCompressorTest.php
typo3/sysext/core/Tests/Unit/Tree/TableConfiguration/Fixtures/TreeDataProviderWithConfigurationFixture.php
typo3/sysext/core/Tests/Unit/Utility/ArrayUtilityTest.php
typo3/sysext/core/Tests/Unit/Utility/GeneralUtilityTest.php
typo3/sysext/core/Tests/Unit/Utility/VersionNumberUtilityTest.php
typo3/sysext/documentation/Classes/Slots/ExtensionManager.php
typo3/sysext/extbase/Classes/Core/Bootstrap.php
typo3/sysext/extbase/Classes/Error/Result.php
typo3/sysext/extbase/Classes/Persistence/Generic/Mapper/DataMapper.php
typo3/sysext/extbase/Classes/Persistence/Generic/PersistenceManager.php
typo3/sysext/extbase/Classes/Persistence/ObjectStorage.php
typo3/sysext/extbase/Classes/Property/PropertyMappingConfiguration.php
typo3/sysext/extbase/Classes/Property/TypeConverter/FloatConverter.php
typo3/sysext/extbase/Classes/Reflection/ClassReflection.php
typo3/sysext/extbase/Tests/Functional/Persistence/OperatorTest.php
typo3/sysext/extbase/Tests/Unit/Configuration/AbstractConfigurationManagerTest.php
typo3/sysext/extbase/Tests/Unit/Property/TypeConverter/Fixtures/DateTimeSubFixture.php
typo3/sysext/extbase/Tests/Unit/Property/TypeConverter/PersistentObjectConverterTest.php
typo3/sysext/extbase/Tests/Unit/SignalSlot/DispatcherTest.php
typo3/sysext/extensionmanager/Classes/Domain/Model/Extension.php
typo3/sysext/extensionmanager/Tests/Unit/Utility/FileHandlingUtilityTest.php
typo3/sysext/fluid/Classes/ViewHelpers/Be/AbstractBackendViewHelper.php
typo3/sysext/fluid/Classes/ViewHelpers/Be/Security/IfAuthenticatedViewHelper.php
typo3/sysext/fluid/Classes/ViewHelpers/SwitchViewHelper.php
typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/AbstractFormFieldViewHelperTest.php
typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/Fixtures/ClassWithTwoGetters.php
typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/SelectViewHelperTest.php
typo3/sysext/fluid_styled_content/Configuration/TCA/Overrides/tt_content.php
typo3/sysext/form/Classes/Domain/Builder/ElementBuilder.php
typo3/sysext/form/Classes/Domain/Builder/FormBuilder.php
typo3/sysext/form/Classes/Domain/Builder/ValidationBuilder.php
typo3/sysext/form/Classes/Domain/Model/Configuration.php
typo3/sysext/form/Classes/Domain/Model/ValidationElement.php
typo3/sysext/form/Classes/Domain/Validator/RequiredValidator.php
typo3/sysext/form/Classes/Mvc/Controller/ControllerContext.php
typo3/sysext/form/Classes/Utility/FormUtility.php
typo3/sysext/form/Tests/Unit/Validator/BetweenValidatorTest.php
typo3/sysext/frontend/Classes/ContentObject/ContentObjectRenderer.php
typo3/sysext/frontend/Classes/ContentObject/Menu/CategoryMenuUtility.php
typo3/sysext/frontend/Classes/Page/PageRepository.php
typo3/sysext/frontend/Classes/Plugin/AbstractPlugin.php
typo3/sysext/frontend/Tests/Unit/ContentObject/ContentObjectRendererTest.php
typo3/sysext/indexed_search/Classes/Hook/CrawlerHook.php
typo3/sysext/install/Classes/FolderStructure/DefaultFactory.php
typo3/sysext/install/Classes/FolderStructure/DirectoryNode.php
typo3/sysext/install/Classes/FolderStructure/FileNode.php
typo3/sysext/install/Classes/Service/ContextService.php
typo3/sysext/install/Classes/Service/EnableFileService.php
typo3/sysext/install/Classes/Service/SessionService.php
typo3/sysext/install/Classes/Service/SqlSchemaMigrationService.php
typo3/sysext/lang/Classes/Service/RegistryService.php
typo3/sysext/linkvalidator/Classes/Linktype/InternalLinktype.php
typo3/sysext/recordlist/Classes/RecordList.php
typo3/sysext/rsaauth/Classes/RsaAuthService.php
typo3/sysext/saltedpasswords/Classes/Utility/ExtensionManagerConfigurationUtility.php
typo3/sysext/scheduler/Classes/Task/TableGarbageCollectionTask.php
typo3/sysext/sv/Classes/AuthenticationService.php
typo3/sysext/sys_action/Classes/ActionTask.php
typo3/sysext/tstemplate/Classes/Controller/TypoScriptTemplateModuleController.php
typo3/sysext/workspaces/Classes/Controller/PreviewController.php
typo3/sysext/workspaces/Classes/Domain/Record/StageRecord.php
typo3/sysext/workspaces/Classes/Service/GridDataService.php
typo3/sysext/workspaces/Classes/Service/StagesService.php

index 809d873..177d4d8 100644 (file)
@@ -69,6 +69,17 @@ return Symfony\CS\Config\Config::create()
         'phpdoc_no_package',
         'phpdoc_scalar',
         'no_empty_lines_after_phpdocs',
-        'short_array_syntax'
+        'short_array_syntax',
+        'array_element_white_space_after_comma',
+        'function_typehint_space',
+        'hash_to_slash_comment',
+        'join_function',
+        'lowercase_cast',
+        'namespace_no_leading_whitespace',
+        'native_function_casing',
+        'no_empty_statement',
+        'self_accessor',
+        'short_bool_cast',
+        'unneeded_control_parentheses'
     ])
     ->finder($finder);
index fb5cbf9..e6ea978 100644 (file)
@@ -554,7 +554,9 @@ class NewContentElementController extends AbstractModule
     {
         if (isset($wizardGroup[$key])) {
             $wizardGroup[$key] = GeneralUtility::trimExplode(',', $wizardGroup[$key]);
-            $wizardGroup[$key] = array_map(function ($s) {return $s . '.';}, $wizardGroup[$key]);
+            $wizardGroup[$key] = array_map(function ($s) {
+                return $s . '.';
+            }, $wizardGroup[$key]);
         }
     }
 
index b676a01..ac009be 100644 (file)
@@ -162,7 +162,7 @@ abstract class AbstractItemProvider
 
         $special = $result['processedTca']['columns'][$fieldName]['config']['special'];
         switch (true) {
-            case ($special === 'tables'):
+            case $special === 'tables':
                 foreach ($GLOBALS['TCA'] as $currentTable => $_) {
                     if (!empty($GLOBALS['TCA'][$currentTable]['ctrl']['adminOnly'])) {
                         // Hide "admin only" tables
@@ -180,7 +180,7 @@ abstract class AbstractItemProvider
                     $items[] = [$label, $currentTable, $icon, $helpText];
                 }
                 break;
-            case ($special === 'pagetypes'):
+            case $special === 'pagetypes':
                 if (isset($GLOBALS['TCA']['pages']['columns']['doktype']['config']['items'])
                     && is_array($GLOBALS['TCA']['pages']['columns']['doktype']['config']['items'])
                 ) {
@@ -197,7 +197,7 @@ abstract class AbstractItemProvider
                     }
                 }
                 break;
-            case ($special === 'exclude'):
+            case $special === 'exclude':
                 $excludeArrays = $this->getExcludeFields();
                 foreach ($excludeArrays as $excludeArray) {
                     // If the field comes from a FlexForm, the syntax is more complex
@@ -240,7 +240,7 @@ abstract class AbstractItemProvider
                     ];
                 }
                 break;
-            case ($special === 'explicitValues'):
+            case $special === 'explicitValues':
                 $theTypes = $this->getExplicitAuthFieldValues();
                 $icons = [
                     'ALLOW' => 'status-status-permission-granted',
@@ -266,7 +266,7 @@ abstract class AbstractItemProvider
                     }
                 }
                 break;
-            case ($special === 'languages'):
+            case $special === 'languages':
                 foreach ($result['systemLanguageRows'] as $language) {
                     if ($language['uid'] !== -1) {
                         $items[] = [
@@ -277,7 +277,7 @@ abstract class AbstractItemProvider
                     }
                 }
                 break;
-            case ($special === 'custom'):
+            case $special === 'custom':
                 $customOptions = $GLOBALS['TYPO3_CONF_VARS']['BE']['customPermOptions'];
                 if (is_array($customOptions)) {
                     foreach ($customOptions as $coKey => $coValue) {
@@ -305,7 +305,7 @@ abstract class AbstractItemProvider
                     }
                 }
                 break;
-            case ($special === 'modListGroup' || $special === 'modListUser'):
+            case $special === 'modListGroup' || $special === 'modListUser':
                 /** @var ModuleLoader $loadModules */
                 $loadModules = GeneralUtility::makeInstance(ModuleLoader::class);
                 $loadModules->load($GLOBALS['TBE_MODULES']);
index 3f5c823..a01dafd 100644 (file)
@@ -949,7 +949,7 @@ class RecordHistory
             );
         }
 
-        return ($this->pageAccessCache[$pageId] !== false);
+        return $this->pageAccessCache[$pageId] !== false;
     }
 
     /**
index 5b7a8c3..91100a0 100644 (file)
@@ -102,7 +102,7 @@ class RequestHandler implements RequestHandlerInterface
      */
     public function canHandleRequest(ServerRequestInterface $request)
     {
-        return (TYPO3_REQUESTTYPE & TYPO3_REQUESTTYPE_BE && !(TYPO3_REQUESTTYPE & TYPO3_REQUESTTYPE_CLI));
+        return TYPO3_REQUESTTYPE & TYPO3_REQUESTTYPE_BE && !(TYPO3_REQUESTTYPE & TYPO3_REQUESTTYPE_CLI);
     }
 
     /**
index 810f2b2..c0dfd2e 100644 (file)
@@ -442,7 +442,7 @@ abstract class AbstractRecordList
         $this->pageOverlays = [];
         while ($row = $result->fetch()) {
             $this->pageOverlays[$row['sys_language_uid']] = $row;
-        };
+        }
 
         $this->languageIconTitles = $this->getTranslateTools()->getSystemLanguages($this->id);
     }
index 9dfd874..cb96483 100644 (file)
@@ -127,7 +127,7 @@ class HelpButton implements ButtonInterface, PositionInterface
      */
     public function isValid()
     {
-        return (!empty($this->moduleName));
+        return !empty($this->moduleName);
     }
 
     /**
index fdce532..14db2a1 100644 (file)
@@ -191,9 +191,9 @@ class ShortcutButton implements ButtonInterface, PositionInterface
     {
         $this->preProcess();
 
-        return (
+        return
             !empty($this->moduleName)
-        );
+        ;
     }
 
     /**
index e6b1957..99ebfbf 100644 (file)
@@ -82,7 +82,7 @@ class FullyRenderedButton implements ButtonInterface
     {
         if (
             trim($this->getHtmlSource()) !== ''
-            && $this->getType() === FullyRenderedButton::class
+            && $this->getType() === self::class
         ) {
             return true;
         }
index 46500a7..b014a1e 100644 (file)
@@ -132,7 +132,7 @@ class InputButton extends AbstractButton implements ButtonInterface
             trim($this->getName()) !== ''
             && trim($this->getValue()) !== ''
             && trim($this->getTitle()) !== ''
-            && $this->getType() === InputButton::class
+            && $this->getType() === self::class
             && $this->getIcon() !== null
         ) {
             return true;
index f90c8a6..46e9855 100644 (file)
@@ -74,7 +74,7 @@ class LinkButton extends AbstractButton implements ButtonInterface
         if (
             trim($this->getHref()) !== ''
             && trim($this->getTitle()) !== ''
-            && $this->getType() === LinkButton::class
+            && $this->getType() === self::class
             && $this->getIcon() !== null
         ) {
             return true;
index cff0b1f..54d5aea 100644 (file)
@@ -137,6 +137,6 @@ class Menu
      */
     public function isValid(Menu $menu)
     {
-        return (trim($menu->getIdentifier()) !== '');
+        return trim($menu->getIdentifier()) !== '';
     }
 }
index b260a30..1358607 100644 (file)
@@ -355,7 +355,7 @@ class ExtdirectTreeCommands
             // Clean JSON-serialized ampersands ('&')
             // @see GeneralUtility::quoteJSvalue()
             $extractedLink = json_decode('"' . trim($match[1], '"') . '"', JSON_HEX_AMP);
-        };
+        }
         return $extractedLink;
     }
 
index 8382f82..82b39f5 100644 (file)
@@ -264,11 +264,11 @@ class PagetreeNode extends \TYPO3\CMS\Backend\Tree\ExtDirectNode
      */
     public function canBeCut()
     {
-        return (
+        return
             $this->canEdit($this->record)
             && !VersionState::cast($this->record['t3ver_state'])->equals(VersionState::DELETE_PLACEHOLDER)
             && $GLOBALS['BE_USER']->checkLanguageAccess(0)
-        );
+        ;
     }
 
     /**
@@ -288,11 +288,11 @@ class PagetreeNode extends \TYPO3\CMS\Backend\Tree\ExtDirectNode
      */
     public function canBeCopied()
     {
-        return (
+        return
             $GLOBALS['BE_USER']->doesUserHaveAccess($this->record, 1)
             && !VersionState::cast($this->record['t3ver_state'])->equals(VersionState::DELETE_PLACEHOLDER)
             && $GLOBALS['BE_USER']->checkLanguageAccess(0)
-        );
+        ;
     }
 
     /**
@@ -312,11 +312,11 @@ class PagetreeNode extends \TYPO3\CMS\Backend\Tree\ExtDirectNode
      */
     public function canBeRemoved()
     {
-        return (
+        return
             $this->canRemove($this->record)
             && !VersionState::cast($this->record['t3ver_state'])->equals(VersionState::DELETE_PLACEHOLDER)
             && $GLOBALS['BE_USER']->checkLanguageAccess(0)
-        );
+        ;
     }
 
     /**
@@ -326,11 +326,11 @@ class PagetreeNode extends \TYPO3\CMS\Backend\Tree\ExtDirectNode
      */
     public function canBePastedInto()
     {
-        return (
+        return
             $this->canCreate($this->record)
             && !VersionState::cast($this->record['t3ver_state'])->equals(VersionState::DELETE_PLACEHOLDER)
             && $GLOBALS['BE_USER']->checkLanguageAccess(0)
-        );
+        ;
     }
 
     /**
@@ -340,11 +340,11 @@ class PagetreeNode extends \TYPO3\CMS\Backend\Tree\ExtDirectNode
      */
     public function canBePastedAfter()
     {
-        return (
+        return
             $this->canCreate($this->record)
             && !VersionState::cast($this->record['t3ver_state'])->equals(VersionState::DELETE_PLACEHOLDER)
             && $GLOBALS['BE_USER']->checkLanguageAccess(0)
-        );
+        ;
     }
 
     /**
@@ -394,10 +394,10 @@ class PagetreeNode extends \TYPO3\CMS\Backend\Tree\ExtDirectNode
      */
     public function isDeleted()
     {
-        return (
+        return
             !empty($this->record['deleted'])
             || VersionState::cast($this->record['t3ver_state'])->equals(VersionState::DELETE_PLACEHOLDER)
-        );
+        ;
     }
 
     /**
index 553f295..88606b7 100644 (file)
@@ -63,7 +63,7 @@ class ExtJsJsonTreeRenderer extends \TYPO3\CMS\Backend\Tree\Renderer\AbstractTre
         } else {
             $iconMarkup = $node->getIcon();
         }
-        $nodeArray = array(
+        $nodeArray = [
             'iconTag' => $iconMarkup,
             'text' => htmlspecialchars($node->getLabel()),
             'leaf' => !$node->hasChildNodes(),
@@ -76,7 +76,7 @@ class ExtJsJsonTreeRenderer extends \TYPO3\CMS\Backend\Tree\Renderer\AbstractTre
             'identifier' => htmlspecialchars($node->getId()),
             //no need for htmlspecialhars here as d3 is using 'textContent' property of the HTML DOM node
             'name' => $node->getLabel(),
-        );
+        ];
 
         return $nodeArray;
     }
index e0f6cf9..95acf33 100644 (file)
@@ -2256,7 +2256,7 @@ class BackendUtility
                             foreach (GeneralUtility::trimExplode(',', $GLOBALS['TCA'][$theColConf['foreign_table']]['ctrl']['label_alt'], true) as $f) {
                                 $MMfields[] = $theColConf['foreign_table'] . '.' . $f;
                             }
-                            $MMfield = join(',', $MMfields);
+                            $MMfield = implode(',', $MMfields);
                         }
                         /** @var $dbGroup RelationHandler */
                         $dbGroup = GeneralUtility::makeInstance(RelationHandler::class);
@@ -2404,7 +2404,7 @@ class BackendUtility
                                         $MMfields[] = $theColConf['foreign_table'] . '.' . $f;
                                     }
                                 }
-                                $MMfield = join(',', $MMfields);
+                                $MMfield = implode(',', $MMfields);
                             }
                             /** @var $dbGroup RelationHandler */
                             $dbGroup = GeneralUtility::makeInstance(RelationHandler::class);
@@ -3056,7 +3056,7 @@ class BackendUtility
             'uPT' => 1,
             'vC' => static::getBackendUserAuthentication()->veriCode()
         ];
-        $url = BackendUtility::getModuleUrl('tce_db', $urlParameters) . $parameters . '&redirect=';
+        $url = self::getModuleUrl('tce_db', $urlParameters) . $parameters . '&redirect=';
         if ((int)$redirectUrl === -1) {
             $url = GeneralUtility::quoteJSvalue($url) . '+T3_THIS_LOCATION';
         } else {
@@ -4229,7 +4229,7 @@ class BackendUtility
                 $outputRows[] = $row;
             } else {
                 // Select UID version:
-                $row = BackendUtility::getRecord($table, $uid, $fields, '', !$includeDeletedRecords);
+                $row = self::getRecord($table, $uid, $fields, '', !$includeDeletedRecords);
                 // Add rows to output array:
                 if ($row) {
                     $row['_CURRENT_VERSION'] = true;
@@ -4701,7 +4701,7 @@ class BackendUtility
             // -2 means "show at any login". We simulate first available fe_group.
             /** @var PageRepository $sysPage */
             $sysPage = GeneralUtility::makeInstance(PageRepository::class);
-            $activeFeGroupRow = BackendUtility::getRecordRaw(
+            $activeFeGroupRow = self::getRecordRaw(
                 'fe_groups',
                 '1=1' . $sysPage->enableFields('fe_groups'),
                 'uid'
index 26ff510..4585fcb 100644 (file)
@@ -58,7 +58,7 @@ class BackendLayout
     public static function create($identifier, $title, $configuration)
     {
         return \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
-            BackendLayout::class,
+            self::class,
             $identifier,
             $title,
             $configuration
index 5db5e89..86e4d91 100644 (file)
@@ -169,7 +169,7 @@ class DefaultDataProvider implements DataProviderInterface
 
         if (!empty($GLOBALS['TCA'][$this->tableName]['ctrl']['sortby'])) {
             $queryBuilder->orderBy($GLOBALS['TCA'][$this->tableName]['ctrl']['sortby']);
-        };
+        }
 
         $results = $queryBuilder
             ->execute()
index 44c351a..a6cc34c 100644 (file)
@@ -1216,7 +1216,7 @@ class PageLayoutView extends \TYPO3\CMS\Recordlist\RecordList\AbstractDatabaseRe
 
         if (!empty($GLOBALS['TCA']['pages']['ctrl']['sortby'])) {
             $queryBuilder->orderBy($GLOBALS['TCA']['pages']['ctrl']['sortby']);
-        };
+        }
 
         if ($depth >= 0) {
             $result = $queryBuilder->execute();
@@ -1278,7 +1278,7 @@ class PageLayoutView extends \TYPO3\CMS\Recordlist\RecordList\AbstractDatabaseRe
 
         if (!empty($GLOBALS['TCA']['pages']['ctrl']['sortby'])) {
             $queryBuilder->orderBy($GLOBALS['TCA']['pages']['ctrl']['sortby']);
-        };
+        }
 
         if (!empty($qWhere)) {
             $queryBuilder->andWhere(QueryHelper::stripLogicalOperatorPrefix($qWhere));
index eb19f7e..9b8bfd7 100644 (file)
@@ -103,6 +103,6 @@ class InputTextElementTest extends UnitTestCase
         $nodeFactoryProphecy = $this->prophesize(NodeFactory::class)->reveal();
         $subject = new InputTextElement($nodeFactoryProphecy, $data);
         $result = $subject->render();
-        $this->assertContains('<input type="hidden" name="" value="' . $expectedOutput  . '" />', $result['html']);
+        $this->assertContains('<input type="hidden" name="" value="' . $expectedOutput . '" />', $result['html']);
     }
 }
index b31d243..a93c33e 100644 (file)
@@ -69,7 +69,7 @@ class TcaColumnsProcessRecordTitleTest extends UnitTestCase
         ];
 
         $expected = $input;
-        $expected['columnsToProcess'] = ['uid','aField','anotherField'];
+        $expected['columnsToProcess'] = ['uid', 'aField', 'anotherField'];
         $this->assertSame($expected, $this->subject->addData($input));
     }
 
index 25596de..2fcc89a 100644 (file)
@@ -141,7 +141,7 @@ class TcaSelectItemsTest extends UnitTestCase
             ->shouldBeCalled()
             ->willReturn($statementProphet->reveal());
 
-        # Two instances are needed due to the push/pop behavior of addInstance()
+        // Two instances are needed due to the push/pop behavior of addInstance()
         GeneralUtility::addInstance(ConnectionPool::class, $connectionPoolProphet->reveal());
         GeneralUtility::addInstance(ConnectionPool::class, $connectionPoolProphet->reveal());
     }
@@ -1708,7 +1708,7 @@ class TcaSelectItemsTest extends UnitTestCase
                 ->willReturn($queryBuilderProphet->reveal());
         }
 
-        # Two instances are needed due to the push/pop behavior of addInstance()
+        // Two instances are needed due to the push/pop behavior of addInstance()
         GeneralUtility::addInstance(ConnectionPool::class, $connectionPoolProphet->reveal());
         GeneralUtility::addInstance(ConnectionPool::class, $connectionPoolProphet->reveal());
 
@@ -1793,7 +1793,7 @@ class TcaSelectItemsTest extends UnitTestCase
         $queryBuilderProphet->andWhere('`pages.uid` = `fTable.pid`')->shouldBeCalled()->willReturn($queryBuilderProphet->reveal());
         $queryBuilderProphet->execute()->shouldBeCalled()->willReturn($statementProphet->reveal());
 
-        # Two instances are needed due to the push/pop behavior of addInstance()
+        // Two instances are needed due to the push/pop behavior of addInstance()
         GeneralUtility::addInstance(ConnectionPool::class, $connectionPoolProphet->reveal());
         GeneralUtility::addInstance(ConnectionPool::class, $connectionPoolProphet->reveal());
 
@@ -1860,7 +1860,7 @@ class TcaSelectItemsTest extends UnitTestCase
         $queryBuilderProphet->andWhere('`pages.uid` = `fTable.pid`')->shouldBeCalled()->willReturn($queryBuilderProphet->reveal());
         $queryBuilderProphet->execute()->shouldBeCalled()->willReturn($statementProphet->reveal());
 
-        # Two instances are needed due to the push/pop behavior of addInstance()
+        // Two instances are needed due to the push/pop behavior of addInstance()
         GeneralUtility::addInstance(ConnectionPool::class, $connectionPoolProphet->reveal());
         GeneralUtility::addInstance(ConnectionPool::class, $connectionPoolProphet->reveal());
 
@@ -1935,7 +1935,7 @@ class TcaSelectItemsTest extends UnitTestCase
         $queryBuilderProphet->andWhere('`pages.uid` = `fTable.pid`')->shouldBeCalled()->willReturn($queryBuilderProphet->reveal());
         $queryBuilderProphet->execute()->shouldBeCalled()->willReturn($statementProphet->reveal());
 
-        # Two instances are needed due to the push/pop behavior of addInstance()
+        // Two instances are needed due to the push/pop behavior of addInstance()
         GeneralUtility::addInstance(ConnectionPool::class, $connectionPoolProphet->reveal());
         GeneralUtility::addInstance(ConnectionPool::class, $connectionPoolProphet->reveal());
 
@@ -2033,7 +2033,7 @@ class TcaSelectItemsTest extends UnitTestCase
         $queryBuilderProphet->andWhere('`pages.uid` = `fTable.pid`')->shouldBeCalled()->willReturn($queryBuilderProphet->reveal());
         $queryBuilderProphet->execute()->shouldBeCalled()->willReturn($statementProphet->reveal());
 
-        # Two instances are needed due to the push/pop behavior of addInstance()
+        // Two instances are needed due to the push/pop behavior of addInstance()
         GeneralUtility::addInstance(ConnectionPool::class, $connectionPoolProphet->reveal());
         GeneralUtility::addInstance(ConnectionPool::class, $connectionPoolProphet->reveal());
 
index ea5c7b7..3fd752d 100644 (file)
@@ -125,7 +125,7 @@ class TcaSelectTreeItemsTest extends UnitTestCase
             ->shouldBeCalled()
             ->willReturn($statementProphet->reveal());
 
-        # Two instances are needed due to the push/pop behavior of addInstance()
+        // Two instances are needed due to the push/pop behavior of addInstance()
         GeneralUtility::addInstance(ConnectionPool::class, $connectionPoolProphet->reveal());
         GeneralUtility::addInstance(ConnectionPool::class, $connectionPoolProphet->reveal());
     }
index 83390a4..35ae557 100644 (file)
@@ -23,7 +23,7 @@ class AcceptanceTester extends \Codeception\Actor
     /**
      * The session cookie that is used if the session is injected.
      * This session must exist in the database fixture to get a logged in state.
-     * 
+     *
      * @var string
      */
     protected $sessionCookie = '';
index 1de6886..0f520c7 100755 (executable)
@@ -20,7 +20,7 @@ for FILE in $(git diff-tree --no-commit-id --name-only -r HEAD | grep '.php$');
         ./bin/php-cs-fixer fix $FILE \
             -v \
             --level=psr2 \
-            --fixers=remove_leading_slash_use,single_array_no_trailing_comma,spaces_before_semicolon,unused_use,concat_with_spaces,whitespacy_lines,ordered_use,single_quote,duplicate_semicolon,extra_empty_lines,phpdoc_no_package,phpdoc_scalar,no_empty_lines_after_phpdocs,short_array_syntax
+            --fixers=remove_leading_slash_use,single_array_no_trailing_comma,spaces_before_semicolon,unused_use,concat_with_spaces,whitespacy_lines,ordered_use,single_quote,duplicate_semicolon,extra_empty_lines,phpdoc_no_package,phpdoc_scalar,no_empty_lines_after_phpdocs,short_array_syntax,array_element_white_space_after_comma,function_typehint_space,hash_to_slash_comment,join_function,lowercase_cast,namespace_no_leading_whitespace,native_function_casing,no_empty_statement,self_accessor,short_bool_cast,unneeded_control_parentheses
         if [ "$?" = "1" ]
         then
             COUNTER=$((COUNTER+1))
index de7325a..ed2eb7c 100644 (file)
@@ -383,7 +383,7 @@ abstract class AbstractUserAuthentication
             $this->writeDevLog = true;
         }
         if ($this->writeDevLog) {
-            GeneralUtility::devLog('## Beginning of auth logging.', AbstractUserAuthentication::class);
+            GeneralUtility::devLog('## Beginning of auth logging.', self::class);
         }
         // Init vars.
         $mode = '';
@@ -495,7 +495,7 @@ abstract class AbstractUserAuthentication
             }
             if ($this->writeDevLog) {
                 $devLogMessage = ($isRefreshTimeBasedCookie ? 'Updated Cookie: ' : 'Set Cookie: ') . $this->id;
-                GeneralUtility::devLog($devLogMessage . ($cookieDomain ? ', ' . $cookieDomain : ''), AbstractUserAuthentication::class);
+                GeneralUtility::devLog($devLogMessage . ($cookieDomain ? ', ' . $cookieDomain : ''), self::class);
             }
         }
     }
@@ -583,14 +583,14 @@ abstract class AbstractUserAuthentication
         // Indicates if an active authentication failed (not auto login)
         $this->loginFailure = false;
         if ($this->writeDevLog) {
-            GeneralUtility::devLog('Login type: ' . $this->loginType, AbstractUserAuthentication::class);
+            GeneralUtility::devLog('Login type: ' . $this->loginType, self::class);
         }
         // The info array provide additional information for auth services
         $authInfo = $this->getAuthInfoArray();
         // Get Login/Logout data submitted by a form or params
         $loginData = $this->getLoginFormData();
         if ($this->writeDevLog) {
-            GeneralUtility::devLog('Login data: ' . GeneralUtility::arrayToLogString($loginData), AbstractUserAuthentication::class);
+            GeneralUtility::devLog('Login data: ' . GeneralUtility::arrayToLogString($loginData), self::class);
         }
         // Active logout (eg. with "logout" button)
         if ($loginData['status'] === 'logout') {
@@ -600,7 +600,7 @@ abstract class AbstractUserAuthentication
             }
             // Logout written to log
             if ($this->writeDevLog) {
-                GeneralUtility::devLog('User logged out. Id: ' . $this->id, AbstractUserAuthentication::class, -1);
+                GeneralUtility::devLog('User logged out. Id: ' . $this->id, self::class, -1);
             }
             $this->logoff();
         }
@@ -617,7 +617,7 @@ abstract class AbstractUserAuthentication
         if (!$haveSession && $loginData['status'] === 'login') {
             $activeLogin = true;
             if ($this->writeDevLog) {
-                GeneralUtility::devLog('Active login (eg. with login form)', AbstractUserAuthentication::class);
+                GeneralUtility::devLog('Active login (eg. with login form)', self::class);
             }
             // check referer for submitted login values
             if ($this->formfield_status && $loginData['uident'] && $loginData['uname']) {
@@ -638,12 +638,12 @@ abstract class AbstractUserAuthentication
         }
         if ($this->writeDevLog) {
             if ($haveSession) {
-                GeneralUtility::devLog('User session found: ' . GeneralUtility::arrayToLogString($authInfo['userSession'], [$this->userid_column, $this->username_column]), AbstractUserAuthentication::class, 0);
+                GeneralUtility::devLog('User session found: ' . GeneralUtility::arrayToLogString($authInfo['userSession'], [$this->userid_column, $this->username_column]), self::class, 0);
             } else {
-                GeneralUtility::devLog('No user session found.', AbstractUserAuthentication::class, 2);
+                GeneralUtility::devLog('No user session found.', self::class, 2);
             }
             if (is_array($this->svConfig['setup'])) {
-                GeneralUtility::devLog('SV setup: ' . GeneralUtility::arrayToLogString($this->svConfig['setup']), AbstractUserAuthentication::class, 0);
+                GeneralUtility::devLog('SV setup: ' . GeneralUtility::arrayToLogString($this->svConfig['setup']), self::class, 0);
             }
         }
         // Fetch user if ...
@@ -661,7 +661,7 @@ abstract class AbstractUserAuthentication
                 if ($row = $serviceObj->getUser()) {
                     $tempuserArr[] = $row;
                     if ($this->writeDevLog) {
-                        GeneralUtility::devLog('User found: ' . GeneralUtility::arrayToLogString($row, [$this->userid_column, $this->username_column]), AbstractUserAuthentication::class, 0);
+                        GeneralUtility::devLog('User found: ' . GeneralUtility::arrayToLogString($row, [$this->userid_column, $this->username_column]), self::class, 0);
                     }
                     // User found, just stop to search for more if not configured to go on
                     if (!$this->svConfig['setup'][$this->loginType . '_fetchAllUsers']) {
@@ -672,16 +672,16 @@ abstract class AbstractUserAuthentication
             }
             unset($serviceObj);
             if ($this->writeDevLog && $this->svConfig['setup'][$this->loginType . '_alwaysFetchUser']) {
-                GeneralUtility::devLog($this->loginType . '_alwaysFetchUser option is enabled', AbstractUserAuthentication::class);
+                GeneralUtility::devLog($this->loginType . '_alwaysFetchUser option is enabled', self::class);
             }
             if ($this->writeDevLog && $serviceChain) {
-                GeneralUtility::devLog($subType . ' auth services called: ' . $serviceChain, AbstractUserAuthentication::class);
+                GeneralUtility::devLog($subType . ' auth services called: ' . $serviceChain, self::class);
             }
             if ($this->writeDevLog && empty($tempuserArr)) {
-                GeneralUtility::devLog('No user found by services', AbstractUserAuthentication::class);
+                GeneralUtility::devLog('No user found by services', self::class);
             }
             if ($this->writeDevLog && !empty($tempuserArr)) {
-                GeneralUtility::devLog(count($tempuserArr) . ' user records found by services', AbstractUserAuthentication::class);
+                GeneralUtility::devLog(count($tempuserArr) . ' user records found by services', self::class);
             }
         }
         // If no new user was set we use the already found user session
@@ -691,14 +691,14 @@ abstract class AbstractUserAuthentication
             // User is authenticated because we found a user session
             $authenticated = true;
             if ($this->writeDevLog) {
-                GeneralUtility::devLog('User session used: ' . GeneralUtility::arrayToLogString($authInfo['userSession'], [$this->userid_column, $this->username_column]), AbstractUserAuthentication::class);
+                GeneralUtility::devLog('User session used: ' . GeneralUtility::arrayToLogString($authInfo['userSession'], [$this->userid_column, $this->username_column]), self::class);
             }
         }
         // Re-auth user when 'auth'-service option is set
         if ($this->svConfig['setup'][$this->loginType . '_alwaysAuthUser']) {
             $authenticated = false;
             if ($this->writeDevLog) {
-                GeneralUtility::devLog('alwaysAuthUser option is enabled', AbstractUserAuthentication::class);
+                GeneralUtility::devLog('alwaysAuthUser option is enabled', self::class);
             }
         }
         // Authenticate the user if needed
@@ -708,7 +708,7 @@ abstract class AbstractUserAuthentication
                 // If one service returns FALSE then authentication failed
                 // a service might return 100 which means there's no reason to stop but the user can't be authenticated by that service
                 if ($this->writeDevLog) {
-                    GeneralUtility::devLog('Auth user: ' . GeneralUtility::arrayToLogString($tempuser), AbstractUserAuthentication::class);
+                    GeneralUtility::devLog('Auth user: ' . GeneralUtility::arrayToLogString($tempuser), self::class);
                 }
                 $serviceChain = '';
                 $subType = 'authUser' . $this->loginType;
@@ -732,7 +732,7 @@ abstract class AbstractUserAuthentication
                 }
                 unset($serviceObj);
                 if ($this->writeDevLog && $serviceChain) {
-                    GeneralUtility::devLog($subType . ' auth services called: ' . $serviceChain, AbstractUserAuthentication::class);
+                    GeneralUtility::devLog($subType . ' auth services called: ' . $serviceChain, self::class);
                 }
                 if ($authenticated) {
                     // Leave foreach() because a user is authenticated
@@ -756,7 +756,7 @@ abstract class AbstractUserAuthentication
                 // The login session is started.
                 $this->loginSessionStarted = true;
                 if ($this->writeDevLog && is_array($this->user)) {
-                    GeneralUtility::devLog('User session finally read: ' . GeneralUtility::arrayToLogString($this->user, [$this->userid_column, $this->username_column]), AbstractUserAuthentication::class, -1);
+                    GeneralUtility::devLog('User session finally read: ' . GeneralUtility::arrayToLogString($this->user, [$this->userid_column, $this->username_column]), self::class, -1);
                 }
             } elseif ($haveSession) {
                 $this->user = $authInfo['userSession'];
@@ -769,24 +769,24 @@ abstract class AbstractUserAuthentication
                 $this->writelog(255, 1, 0, 1, 'User %s logged in from %s (%s)', [$tempuser[$this->username_column], GeneralUtility::getIndpEnv('REMOTE_ADDR'), GeneralUtility::getIndpEnv('REMOTE_HOST')], '', '', '', -1, '', $tempuser['uid']);
             }
             if ($this->writeDevLog && $activeLogin) {
-                GeneralUtility::devLog('User ' . $tempuser[$this->username_column] . ' logged in from ' . GeneralUtility::getIndpEnv('REMOTE_ADDR') . ' (' . GeneralUtility::getIndpEnv('REMOTE_HOST') . ')', AbstractUserAuthentication::class, -1);
+                GeneralUtility::devLog('User ' . $tempuser[$this->username_column] . ' logged in from ' . GeneralUtility::getIndpEnv('REMOTE_ADDR') . ' (' . GeneralUtility::getIndpEnv('REMOTE_HOST') . ')', self::class, -1);
             }
             if ($this->writeDevLog && !$activeLogin) {
-                GeneralUtility::devLog('User ' . $tempuser[$this->username_column] . ' authenticated from ' . GeneralUtility::getIndpEnv('REMOTE_ADDR') . ' (' . GeneralUtility::getIndpEnv('REMOTE_HOST') . ')', AbstractUserAuthentication::class, -1);
+                GeneralUtility::devLog('User ' . $tempuser[$this->username_column] . ' authenticated from ' . GeneralUtility::getIndpEnv('REMOTE_ADDR') . ' (' . GeneralUtility::getIndpEnv('REMOTE_HOST') . ')', self::class, -1);
             }
         } elseif ($activeLogin || !empty($tempuserArr)) {
             $this->loginFailure = true;
             if ($this->writeDevLog && empty($tempuserArr) && $activeLogin) {
-                GeneralUtility::devLog('Login failed: ' . GeneralUtility::arrayToLogString($loginData), AbstractUserAuthentication::class, 2);
+                GeneralUtility::devLog('Login failed: ' . GeneralUtility::arrayToLogString($loginData), self::class, 2);
             }
             if ($this->writeDevLog && !empty($tempuserArr)) {
-                GeneralUtility::devLog('Login failed: ' . GeneralUtility::arrayToLogString($tempuser, [$this->userid_column, $this->username_column]), AbstractUserAuthentication::class, 2);
+                GeneralUtility::devLog('Login failed: ' . GeneralUtility::arrayToLogString($tempuser, [$this->userid_column, $this->username_column]), self::class, 2);
             }
         }
         // If there were a login failure, check to see if a warning email should be sent:
         if ($this->loginFailure && $activeLogin) {
             if ($this->writeDevLog) {
-                GeneralUtility::devLog('Call checkLogFailures: ' . GeneralUtility::arrayToLogString(['warningEmail' => $this->warningEmail, 'warningPeriod' => $this->warningPeriod, 'warningMax' => $this->warningMax]), AbstractUserAuthentication::class, -1);
+                GeneralUtility::devLog('Call checkLogFailures: ' . GeneralUtility::arrayToLogString(['warningEmail' => $this->warningEmail, 'warningPeriod' => $this->warningPeriod, 'warningMax' => $this->warningMax]), self::class, -1);
             }
 
             // Hook to implement login failure tracking methods
@@ -850,7 +850,7 @@ abstract class AbstractUserAuthentication
     public function createUserSession($tempuser)
     {
         if ($this->writeDevLog) {
-            GeneralUtility::devLog('Create session ses_id = ' . $this->id, AbstractUserAuthentication::class);
+            GeneralUtility::devLog('Create session ses_id = ' . $this->id, self::class);
         }
         // Delete session entry first
         $connection = GeneralUtility::makeInstance(ConnectionPool::class)->getConnectionForTable($this->session_table);
@@ -866,7 +866,7 @@ abstract class AbstractUserAuthentication
             $message = 'Session data could not be written to DB. Error: ' . $connection->errorInfo();
             GeneralUtility::sysLog($message, 'core', GeneralUtility::SYSLOG_SEVERITY_WARNING);
             if ($this->writeDevLog) {
-                GeneralUtility::devLog($message, AbstractUserAuthentication::class, 2);
+                GeneralUtility::devLog($message, self::class, 2);
             }
         }
         // Updating lastLogin_column carrying information about last login.
@@ -911,7 +911,7 @@ abstract class AbstractUserAuthentication
     public function fetchUserSession($skipSessionUpdate = false)
     {
         if ($this->writeDevLog) {
-            GeneralUtility::devLog('Fetch session ses_id = ' . $this->id, AbstractUserAuthentication::class);
+            GeneralUtility::devLog('Fetch session ses_id = ' . $this->id, self::class);
         }
 
         // Fetch the user session from the DB
@@ -959,7 +959,7 @@ abstract class AbstractUserAuthentication
     public function logoff()
     {
         if ($this->writeDevLog) {
-            GeneralUtility::devLog('logoff: ses_id = ' . $this->id, AbstractUserAuthentication::class);
+            GeneralUtility::devLog('logoff: ses_id = ' . $this->id, self::class);
         }
         // Release the locked records
         BackendUtility::lockRecords();
@@ -1269,7 +1269,7 @@ abstract class AbstractUserAuthentication
             if ($this->writeDevLog) {
                 GeneralUtility::devLog(
                     'writeUC: ' . $this->userid_column . '=' . (int)$this->user[$this->userid_column],
-                    AbstractUserAuthentication::class
+                    self::class
                 );
             }
             GeneralUtility::makeInstance(ConnectionPool::class)->getConnectionForTable($this->session_table)->update(
@@ -1358,7 +1358,7 @@ abstract class AbstractUserAuthentication
         $sesDat[$key] = $data;
         $this->user['ses_data'] = serialize($sesDat);
         if ($this->writeDevLog) {
-            GeneralUtility::devLog('setAndSaveSessionData: ses_id = ' . $this->user['ses_id'], AbstractUserAuthentication::class);
+            GeneralUtility::devLog('setAndSaveSessionData: ses_id = ' . $this->user['ses_id'], self::class);
         }
         GeneralUtility::makeInstance(ConnectionPool::class)->getConnectionForTable($this->session_table)->update(
             $this->session_table,
@@ -1411,7 +1411,7 @@ abstract class AbstractUserAuthentication
         $loginSecurityLevel = trim($GLOBALS['TYPO3_CONF_VARS'][$this->loginType]['loginSecurityLevel']) ?: 'normal';
         $passwordTransmissionStrategy = $passwordTransmissionStrategy ?: $loginSecurityLevel;
         if ($this->writeDevLog) {
-            GeneralUtility::devLog('Login data before processing: ' . GeneralUtility::arrayToLogString($loginData), AbstractUserAuthentication::class);
+            GeneralUtility::devLog('Login data before processing: ' . GeneralUtility::arrayToLogString($loginData), self::class);
         }
         $serviceChain = '';
         $subType = 'processLoginData' . $this->loginType;
@@ -1435,7 +1435,7 @@ abstract class AbstractUserAuthentication
         if ($isLoginDataProcessed) {
             $loginData = $processedLoginData;
             if ($this->writeDevLog) {
-                GeneralUtility::devLog('Processed login data: ' . GeneralUtility::arrayToLogString($processedLoginData), AbstractUserAuthentication::class);
+                GeneralUtility::devLog('Processed login data: ' . GeneralUtility::arrayToLogString($processedLoginData), self::class);
             }
         }
         return $loginData;
index 27073fb..323dea2 100644 (file)
@@ -2657,7 +2657,7 @@ This is a dump of the failures:
      */
     public function logoff()
     {
-        if (isset($GLOBALS['BE_USER']) && $GLOBALS['BE_USER'] instanceof BackendUserAuthentication && isset($GLOBALS['BE_USER']->user['uid'])) {
+        if (isset($GLOBALS['BE_USER']) && $GLOBALS['BE_USER'] instanceof self && isset($GLOBALS['BE_USER']->user['uid'])) {
             \TYPO3\CMS\Core\FormProtection\FormProtectionFactory::get()->clean();
         }
         parent::logoff();
index 29b0341..66750e6 100644 (file)
@@ -54,7 +54,7 @@ class CategoryCollection extends AbstractRecordCollection implements EditableCol
         if (!empty($tableName)) {
             $this->setItemTableName($tableName);
         } elseif (empty($this->itemTableName)) {
-            throw new \RuntimeException(CategoryCollection::class . ' needs a valid itemTableName.', 1341826168);
+            throw new \RuntimeException(self::class . ' needs a valid itemTableName.', 1341826168);
         }
         if (!empty($fieldName)) {
             $this->setRelationFieldName($fieldName);
@@ -73,7 +73,7 @@ class CategoryCollection extends AbstractRecordCollection implements EditableCol
     {
         /** @var $collection CategoryCollection */
         $collection = GeneralUtility::makeInstance(
-            CategoryCollection::class,
+            self::class,
             $collectionRecord['table_name'],
             $collectionRecord['field_name']
         );
index dd6e9c8..7e90a2f 100644 (file)
@@ -1023,7 +1023,7 @@ class CharsetConverter implements SingletonInterface
                     array_push($code_decomp, chr($ord));
                 }
             }
-            $ascii[$this->UnumberToChar(hexdec($from))] = join('', $code_decomp);
+            $ascii[$this->UnumberToChar(hexdec($from))] = implode('', $code_decomp);
         }
         // Add numeric decompositions
         foreach ($number as $from => $to) {
index 64f1576..a74cf64 100644 (file)
@@ -34,7 +34,7 @@ class StaticRecordCollection extends AbstractRecordCollection implements Editabl
     {
         /** @var $collection StaticRecordCollection */
         $collection = GeneralUtility::makeInstance(
-            StaticRecordCollection::class,
+            self::class,
             $collectionRecord['table_name']
         );
         $collection->fromArray($collectionRecord);
index 4152795..f6ec681 100644 (file)
@@ -422,7 +422,7 @@ abstract class AbstractConditionMatcher
                 }
             }
             $arguments = trim($arguments);
-        };
+        }
         return $result;
     }
 
index 8251063..f9f3a24 100644 (file)
@@ -70,7 +70,7 @@ class ApplicationContext
             $contextStringParts = explode('/', $contextString);
             $this->rootContextString = $contextStringParts[0];
             array_pop($contextStringParts);
-            $this->parentContext = new ApplicationContext(implode('/', $contextStringParts));
+            $this->parentContext = new self(implode('/', $contextStringParts));
         }
 
         if (!in_array($this->rootContextString, ['Development', 'Production', 'Testing'], true)) {
@@ -99,7 +99,7 @@ class ApplicationContext
      */
     public function isDevelopment()
     {
-        return ($this->rootContextString === 'Development');
+        return $this->rootContextString === 'Development';
     }
 
     /**
@@ -110,7 +110,7 @@ class ApplicationContext
      */
     public function isProduction()
     {
-        return ($this->rootContextString === 'Production');
+        return $this->rootContextString === 'Production';
     }
 
     /**
@@ -121,7 +121,7 @@ class ApplicationContext
      */
     public function isTesting()
     {
-        return ($this->rootContextString === 'Testing');
+        return $this->rootContextString === 'Testing';
     }
 
     /**
index a613bad..909b1d2 100644 (file)
@@ -1,5 +1,5 @@
 <?php
-declare (strict_types=1);
+declare(strict_types=1);
 namespace TYPO3\CMS\Core\Crypto;
 
 /*
index ee56ca6..884f9ea 100644 (file)
@@ -2724,7 +2724,7 @@ class DataHandler
                     }
                     $valueArray = explode('.', $value);
                     $dec = array_pop($valueArray);
-                    $value = join('', $valueArray) . '.' . $dec;
+                    $value = implode('', $valueArray) . '.' . $dec;
                     if ($negative) {
                         $value *= -1;
                     }
@@ -8462,7 +8462,7 @@ class DataHandler
         if (!isset($this->outerMostInstance)) {
             $stack = array_reverse(debug_backtrace(DEBUG_BACKTRACE_PROVIDE_OBJECT | DEBUG_BACKTRACE_IGNORE_ARGS));
             foreach ($stack as $stackItem) {
-                if (isset($stackItem['object']) && $stackItem['object'] instanceof DataHandler) {
+                if (isset($stackItem['object']) && $stackItem['object'] instanceof self) {
                     $this->outerMostInstance = $stackItem['object'];
                     break;
                 }
index 0f78d80..ee67933 100644 (file)
@@ -1,5 +1,5 @@
 <?php
-declare (strict_types=1);
+declare(strict_types=1);
 namespace TYPO3\CMS\Core\Database;
 
 /*
index f4b3857..85a9be4 100644 (file)
@@ -1,5 +1,5 @@
 <?php
-declare (strict_types = 1);
+declare(strict_types=1);
 namespace TYPO3\CMS\Core\Database;
 
 /*
@@ -59,7 +59,7 @@ class ConnectionPool
             );
         }
 
-        $connectionName = ConnectionPool::DEFAULT_CONNECTION_NAME;
+        $connectionName = self::DEFAULT_CONNECTION_NAME;
         if (!empty($GLOBALS['TYPO3_CONF_VARS']['DB']['TableMapping'][$tableName])) {
             $connectionName = (string)$GLOBALS['TYPO3_CONF_VARS']['DB']['TableMapping'][$tableName];
         }
index 7cdf3ed..94d2bca 100644 (file)
@@ -1,5 +1,5 @@
 <?php
-declare (strict_types = 1);
+declare(strict_types=1);
 namespace TYPO3\CMS\Core\Database\Query;
 
 /*
@@ -1077,7 +1077,7 @@ class QueryBuilder
             if ($originalWhereConditions instanceof CompositeExpression) {
                 // Save the original query conditions so we can restore
                 // them after the query has been built.
-                $originalWhereConditions = clone($originalWhereConditions);
+                $originalWhereConditions = clone $originalWhereConditions;
             }
             $this->concreteQueryBuilder->andWhere($expression);
         }
index 291e23b..ff5189f 100644 (file)
@@ -1,5 +1,5 @@
 <?php
-declare (strict_types = 1);
+declare(strict_types=1);
 namespace TYPO3\CMS\Core\Database\Query;
 
 /*
index c6a1c25..745e21a 100644 (file)
@@ -1067,13 +1067,13 @@ class ReferenceIndex
      */
     protected function isDbReferenceField(array $configuration)
     {
-        return (
+        return
             ($configuration['type'] === 'group' && $configuration['internal_type'] === 'db')
             || (
                 ($configuration['type'] === 'select' || $configuration['type'] === 'inline')
                 && !empty($configuration['foreign_table'])
             )
-        );
+        ;
     }
 
     /**
@@ -1084,7 +1084,7 @@ class ReferenceIndex
      */
     public function isReferenceField(array $configuration)
     {
-        return (
+        return
             $this->isDbReferenceField($configuration)
             ||
             ($configuration['type'] === 'group' && ($configuration['internal_type'] === 'file' || $configuration['internal_type'] === 'file_reference')) // getRelations_procFiles
@@ -1094,7 +1094,7 @@ class ReferenceIndex
             $configuration['type'] === 'flex'
             ||
             isset($configuration['softref'])
-        );
+        ;
     }
 
     /**
@@ -1189,7 +1189,7 @@ class ReferenceIndex
             $tableCount++;
             $uidList = [0];
             while ($record = $queryResult->fetch()) {
-                $refIndexObj = GeneralUtility::makeInstance(ReferenceIndex::class);
+                $refIndexObj = GeneralUtility::makeInstance(self::class);
                 if (isset($record['t3ver_wsid'])) {
                     $refIndexObj->setWorkspaceId($record['t3ver_wsid']);
                 }
index 79f3b9f..f125a33 100644 (file)
@@ -129,7 +129,7 @@ class FormProtectionFactory
      */
     protected static function isInstallToolSession()
     {
-        return (TYPO3_REQUESTTYPE & TYPO3_REQUESTTYPE_INSTALL);
+        return TYPO3_REQUESTTYPE & TYPO3_REQUESTTYPE_INSTALL;
     }
 
     /**
index 2a7f77b..43cf87d 100644 (file)
@@ -992,7 +992,7 @@ class HtmlParser
     public function stripEmptyTags($content, $tagList = '', $treatNonBreakingSpaceAsEmpty = false, $keepTags = false)
     {
         if (!empty($tagList)) {
-            $tagRegEx = join('|', GeneralUtility::trimExplode(',', $tagList, true));
+            $tagRegEx = implode('|', GeneralUtility::trimExplode(',', $tagList, true));
             if ($keepTags) {
                 $tagRegEx = '(?!' . $tagRegEx . ')[^ >]+';
             }
index 81750bd..a7e478e 100644 (file)
@@ -257,7 +257,7 @@ class Stream implements StreamInterface
             return false;
         }
         $mode = $this->getMetadata('mode');
-        return (strpos($mode, 'r') !== false || strpos($mode, '+') !== false);
+        return strpos($mode, 'r') !== false || strpos($mode, '+') !== false;
     }
 
     /**
index 4ebb005..dab8321 100644 (file)
@@ -1021,7 +1021,7 @@ class GraphicalFunctions
                     $offsetInfo[5] += $calc[5] - $calc[7] - (int)$splitRendering['compY'] - (int)$strCfg['ySpaceBefore'] - (int)$strCfg['ySpaceAfter'];
                 }
             } else {
-                debug('cannot read file: ' . $fontFile, GraphicalFunctions::class . '::ImageTTFBBoxWrapper()');
+                debug('cannot read file: ' . $fontFile, self::class . '::ImageTTFBBoxWrapper()');
             }
         }
         return $offsetInfo;
@@ -1072,7 +1072,7 @@ class GraphicalFunctions
                 $x += $wordInf[2] - $wordInf[0] + (int)$splitRendering['compX'] + (int)$strCfg['xSpaceAfter'];
                 $y += $wordInf[5] - $wordInf[7] - (int)$splitRendering['compY'] - (int)$strCfg['ySpaceAfter'];
             } else {
-                debug('cannot read file: ' . $fontFile, GraphicalFunctions::class . '::ImageTTFTextWrapper()');
+                debug('cannot read file: ' . $fontFile, self::class . '::ImageTTFTextWrapper()');
             }
         }
     }
index 0789c41..69b8512 100644 (file)
@@ -322,8 +322,8 @@ class IconFactory
         }
 
         // Hook to define an alternative iconName
-        if (!empty($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS'][IconFactory::class]['overrideIconOverlay'])) {
-            $hookObjects = $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS'][IconFactory::class]['overrideIconOverlay'];
+        if (!empty($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS'][self::class]['overrideIconOverlay'])) {
+            $hookObjects = $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS'][self::class]['overrideIconOverlay'];
             foreach ($hookObjects as $classRef) {
                 $hookObject = GeneralUtility::getUserObj($classRef);
                 if (method_exists($hookObject, 'postOverlayPriorityLookup')) {
@@ -503,7 +503,7 @@ class IconFactory
         $overlayIdentifier
     ) {
         $result = $this->getSignalSlotDispatcher()->dispatch(
-            IconFactory::class,
+            self::class,
             'buildIconForResourceSignal',
             [$resource, $size, $options, $iconIdentifier, $overlayIdentifier]
         );
index 2346607..7a6fc7f 100644 (file)
@@ -1,5 +1,5 @@
 <?php
-declare (strict_types = 1);
+declare(strict_types=1);
 namespace TYPO3\CMS\Core\LinkHandling;
 
 /*
index 165094c..787e395 100644 (file)
@@ -1,5 +1,5 @@
 <?php
-declare (strict_types = 1);
+declare(strict_types=1);
 namespace TYPO3\CMS\Core\LinkHandling;
 
 /*
index 9b9444b..1c22117 100644 (file)
@@ -1,5 +1,5 @@
 <?php
-declare (strict_types = 1);
+declare(strict_types=1);
 namespace TYPO3\CMS\Core\LinkHandling;
 
 /*
@@ -26,7 +26,6 @@ use TYPO3\CMS\Core\Utility\GeneralUtility;
  */
 class LinkService implements SingletonInterface
 {
-
     const TYPE_PAGE = 'page';
     const TYPE_URL = 'url';
     const TYPE_EMAIL = 'email';
index 9c626cc..3c0177c 100644 (file)
@@ -1,5 +1,5 @@
 <?php
-declare (strict_types = 1);
+declare(strict_types=1);
 namespace TYPO3\CMS\Core\LinkHandling;
 
 /*
index 17b0a0e..0ce7187 100644 (file)
@@ -136,7 +136,7 @@ class Locales implements \TYPO3\CMS\Core\SingletonInterface
     public static function initialize()
     {
         /** @var $instance Locales */
-        $instance = GeneralUtility::makeInstance(Locales::class);
+        $instance = GeneralUtility::makeInstance(self::class);
         $instance->isoMapping = array_flip($instance->isoReverseMapping);
         // Allow user-defined locales
         if (isset($GLOBALS['TYPO3_CONF_VARS']['SYS']['localization']['locales']['user']) && is_array($GLOBALS['TYPO3_CONF_VARS']['SYS']['localization']['locales']['user'])) {
index f170465..ef39d71 100644 (file)
@@ -63,7 +63,7 @@ class SemaphoreLockStrategy implements LockingStrategyInterface
         if (!is_writable($path)) {
             throw new LockCreateException('Cannot write to directory ' . $path, 1460976320);
         }
-        $this->filePath = $path  . 'sem_' . md5((string)$subject);
+        $this->filePath = $path . 'sem_' . md5((string)$subject);
         touch($this->filePath);
         $this->id = ftok($this->filePath, 'A');
         if ($this->id === false) {
index 6aa97ad..f92b1d9 100644 (file)
@@ -43,7 +43,7 @@ class ExtractorRegistry implements SingletonInterface
      */
     public static function getInstance()
     {
-        return GeneralUtility::makeInstance(ExtractorRegistry::class);
+        return GeneralUtility::makeInstance(self::class);
     }
 
     /**
index 0872371..4aa4f61 100644 (file)
@@ -68,7 +68,7 @@ class FileIndexRepository implements SingletonInterface
      */
     public static function getInstance()
     {
-        return GeneralUtility::makeInstance(FileIndexRepository::class);
+        return GeneralUtility::makeInstance(self::class);
     }
 
     /**
@@ -563,7 +563,7 @@ class FileIndexRepository implements SingletonInterface
      */
     protected function emitRecordUpdatedSignal(array $data)
     {
-        $this->getSignalSlotDispatcher()->dispatch(FileIndexRepository::class, 'recordUpdated', [$data]);
+        $this->getSignalSlotDispatcher()->dispatch(self::class, 'recordUpdated', [$data]);
     }
 
     /**
@@ -574,7 +574,7 @@ class FileIndexRepository implements SingletonInterface
      */
     protected function emitRecordCreatedSignal(array $data)
     {
-        $this->getSignalSlotDispatcher()->dispatch(FileIndexRepository::class, 'recordCreated', [$data]);
+        $this->getSignalSlotDispatcher()->dispatch(self::class, 'recordCreated', [$data]);
     }
 
     /**
@@ -585,7 +585,7 @@ class FileIndexRepository implements SingletonInterface
      */
     protected function emitRecordDeletedSignal($fileUid)
     {
-        $this->getSignalSlotDispatcher()->dispatch(FileIndexRepository::class, 'recordDeleted', [$fileUid]);
+        $this->getSignalSlotDispatcher()->dispatch(self::class, 'recordDeleted', [$fileUid]);
     }
 
     /**
@@ -596,6 +596,6 @@ class FileIndexRepository implements SingletonInterface
      */
     protected function emitRecordMarkedAsMissingSignal($fileUid)
     {
-        $this->getSignalSlotDispatcher()->dispatch(FileIndexRepository::class, 'recordMarkedAsMissing', [$fileUid]);
+        $this->getSignalSlotDispatcher()->dispatch(self::class, 'recordMarkedAsMissing', [$fileUid]);
     }
 }
index 755b232..fc8fabc 100644 (file)
@@ -246,7 +246,7 @@ class MetaDataRepository implements SingletonInterface
      */
     protected function emitRecordPostRetrievalSignal(\ArrayObject $data)
     {
-        $this->getSignalSlotDispatcher()->dispatch(MetaDataRepository::class, 'recordPostRetrieval', [$data]);
+        $this->getSignalSlotDispatcher()->dispatch(self::class, 'recordPostRetrieval', [$data]);
     }
 
     /**
@@ -257,7 +257,7 @@ class MetaDataRepository implements SingletonInterface
      */
     protected function emitRecordUpdatedSignal(array $data)
     {
-        $this->getSignalSlotDispatcher()->dispatch(MetaDataRepository::class, 'recordUpdated', [$data]);
+        $this->getSignalSlotDispatcher()->dispatch(self::class, 'recordUpdated', [$data]);
     }
 
     /**
@@ -268,7 +268,7 @@ class MetaDataRepository implements SingletonInterface
      */
     protected function emitRecordCreatedSignal(array $data)
     {
-        $this->getSignalSlotDispatcher()->dispatch(MetaDataRepository::class, 'recordCreated', [$data]);
+        $this->getSignalSlotDispatcher()->dispatch(self::class, 'recordCreated', [$data]);
     }
 
     /**
@@ -279,7 +279,7 @@ class MetaDataRepository implements SingletonInterface
      */
     protected function emitRecordDeletedSignal($fileUid)
     {
-        $this->getSignalSlotDispatcher()->dispatch(MetaDataRepository::class, 'recordDeleted', [$fileUid]);
+        $this->getSignalSlotDispatcher()->dispatch(self::class, 'recordDeleted', [$fileUid]);
     }
 
     /**
@@ -287,6 +287,6 @@ class MetaDataRepository implements SingletonInterface
      */
     public static function getInstance()
     {
-        return GeneralUtility::makeInstance(MetaDataRepository::class);
+        return GeneralUtility::makeInstance(self::class);
     }
 }
index 077204e..4967493 100644 (file)
@@ -30,7 +30,7 @@ class OnlineMediaHelperRegistry implements \TYPO3\CMS\Core\SingletonInterface
      */
     public static function getInstance()
     {
-        return GeneralUtility::makeInstance(OnlineMediaHelperRegistry::class);
+        return GeneralUtility::makeInstance(self::class);
     }
 
     /**
index 0de308a..6186508 100644 (file)
@@ -43,7 +43,7 @@ class RendererRegistry implements \TYPO3\CMS\Core\SingletonInterface
      */
     public static function getInstance()
     {
-        return GeneralUtility::makeInstance(RendererRegistry::class);
+        return GeneralUtility::makeInstance(self::class);
     }
 
     /**
index 9979f2a..c8692fb 100644 (file)
@@ -203,7 +203,7 @@ class ResourceFactory implements ResourceFactoryInterface, \TYPO3\CMS\Core\Singl
      */
     protected function emitPostProcessStorageSignal(ResourceStorage $storageObject)
     {
-        $this->signalSlotDispatcher->dispatch(ResourceFactory::class, self::SIGNAL_PostProcessStorage, [$this, $storageObject]);
+        $this->signalSlotDispatcher->dispatch(self::class, self::SIGNAL_PostProcessStorage, [$this, $storageObject]);
     }
 
     /**
index af05b00..3509901 100644 (file)
@@ -2421,7 +2421,7 @@ class ResourceStorage implements ResourceStorageInterface
      */
     protected function emitSanitizeFileNameSignal($fileName, Folder $targetFolder)
     {
-        list($fileName) = $this->getSignalSlotDispatcher()->dispatch(ResourceStorage::class, self::SIGNAL_SanitizeFileName, [$fileName, $targetFolder, $this, $this->driver]);
+        list($fileName) = $this->getSignalSlotDispatcher()->dispatch(self::class, self::SIGNAL_SanitizeFileName, [$fileName, $targetFolder, $this, $this->driver]);
         return $fileName;
     }
 
@@ -2435,7 +2435,7 @@ class ResourceStorage implements ResourceStorageInterface
      */
     protected function emitPreFileAddSignal($targetFileName, Folder $targetFolder, $sourceFilePath)
     {
-        $this->getSignalSlotDispatcher()->dispatch(ResourceStorage::class, self::SIGNAL_PreFileAdd, [&$targetFileName, $targetFolder, $sourceFilePath, $this, $this->driver]);
+        $this->getSignalSlotDispatcher()->dispatch(self::class, self::SIGNAL_PreFileAdd, [&$targetFileName, $targetFolder, $sourceFilePath, $this, $this->driver]);
         return $targetFileName;
     }
 
@@ -2448,7 +2448,7 @@ class ResourceStorage implements ResourceStorageInterface
      */
     protected function emitPostFileAddSignal(FileInterface $file, Folder $targetFolder)
     {
-        $this->getSignalSlotDispatcher()->dispatch(ResourceStorage::class, self::SIGNAL_PostFileAdd, [$file, $targetFolder]);
+        $this->getSignalSlotDispatcher()->dispatch(self::class, self::SIGNAL_PostFileAdd, [$file, $targetFolder]);
     }
 
     /**
@@ -2460,7 +2460,7 @@ class ResourceStorage implements ResourceStorageInterface
      */
     protected function emitPreFileCopySignal(FileInterface $file, Folder $targetFolder)
     {
-        $this->getSignalSlotDispatcher()->dispatch(ResourceStorage::class, self::SIGNAL_PreFileCopy, [$file, $targetFolder]);
+        $this->getSignalSlotDispatcher()->dispatch(self::class, self::SIGNAL_PreFileCopy, [$file, $targetFolder]);
     }
 
     /**
@@ -2472,7 +2472,7 @@ class ResourceStorage implements ResourceStorageInterface
      */
     protected function emitPostFileCopySignal(FileInterface $file, Folder $targetFolder)
     {
-        $this->getSignalSlotDispatcher()->dispatch(ResourceStorage::class, self::SIGNAL_PostFileCopy, [$file, $targetFolder]);
+        $this->getSignalSlotDispatcher()->dispatch(self::class, self::SIGNAL_PostFileCopy, [$file, $targetFolder]);
     }
 
     /**
@@ -2484,7 +2484,7 @@ class ResourceStorage implements ResourceStorageInterface
      */
     protected function emitPreFileMoveSignal(FileInterface $file, Folder $targetFolder)
     {
-        $this->getSignalSlotDispatcher()->dispatch(ResourceStorage::class, self::SIGNAL_PreFileMove, [$file, $targetFolder]);
+        $this->getSignalSlotDispatcher()->dispatch(self::class, self::SIGNAL_PreFileMove, [$file, $targetFolder]);
     }
 
     /**
@@ -2497,7 +2497,7 @@ class ResourceStorage implements ResourceStorageInterface
      */
     protected function emitPostFileMoveSignal(FileInterface $file, Folder $targetFolder, FolderInterface $originalFolder)
     {
-        $this->getSignalSlotDispatcher()->dispatch(ResourceStorage::class, self::SIGNAL_PostFileMove, [$file, $targetFolder, $originalFolder]);
+        $this->getSignalSlotDispatcher()->dispatch(self::class, self::SIGNAL_PostFileMove, [$file, $targetFolder, $originalFolder]);
     }
 
     /**
@@ -2509,7 +2509,7 @@ class ResourceStorage implements ResourceStorageInterface
      */
     protected function emitPreFileRenameSignal(FileInterface $file, $targetFolder)
     {
-        $this->getSignalSlotDispatcher()->dispatch(ResourceStorage::class, self::SIGNAL_PreFileRename, [$file, $targetFolder]);
+        $this->getSignalSlotDispatcher()->dispatch(self::class, self::SIGNAL_PreFileRename, [$file, $targetFolder]);
     }
 
     /**
@@ -2521,7 +2521,7 @@ class ResourceStorage implements ResourceStorageInterface
      */
     protected function emitPostFileRenameSignal(FileInterface $file, $sanitizedTargetFileName)
     {
-        $this->getSignalSlotDispatcher()->dispatch(ResourceStorage::class, self::SIGNAL_PostFileRename, [$file, $sanitizedTargetFileName]);
+        $this->getSignalSlotDispatcher()->dispatch(self::class, self::SIGNAL_PostFileRename, [$file, $sanitizedTargetFileName]);
     }
 
     /**
@@ -2533,7 +2533,7 @@ class ResourceStorage implements ResourceStorageInterface
      */
     protected function emitPreFileReplaceSignal(FileInterface $file, $localFilePath)
     {
-        $this->getSignalSlotDispatcher()->dispatch(ResourceStorage::class, self::SIGNAL_PreFileReplace, [$file, $localFilePath]);
+        $this->getSignalSlotDispatcher()->dispatch(self::class, self::SIGNAL_PreFileReplace, [$file, $localFilePath]);
     }
 
     /**
@@ -2545,7 +2545,7 @@ class ResourceStorage implements ResourceStorageInterface
      */
     protected function emitPostFileReplaceSignal(FileInterface $file, $localFilePath)
     {
-        $this->getSignalSlotDispatcher()->dispatch(ResourceStorage::class, self::SIGNAL_PostFileReplace, [$file, $localFilePath]);
+        $this->getSignalSlotDispatcher()->dispatch(self::class, self::SIGNAL_PostFileReplace, [$file, $localFilePath]);
     }
 
     /**
@@ -2556,7 +2556,7 @@ class ResourceStorage implements ResourceStorageInterface
      */
     protected function emitPostFileCreateSignal($newFileIdentifier, Folder $targetFolder)
     {
-        $this->getSignalSlotDispatcher()->dispatch(ResourceStorage::class, self::SIGNAL_PostFileCreate, [$newFileIdentifier, $targetFolder]);
+        $this->getSignalSlotDispatcher()->dispatch(self::class, self::SIGNAL_PostFileCreate, [$newFileIdentifier, $targetFolder]);
     }
 
     /**
@@ -2567,7 +2567,7 @@ class ResourceStorage implements ResourceStorageInterface
      */
     protected function emitPreFileDeleteSignal(FileInterface $file)
     {
-        $this->getSignalSlotDispatcher()->dispatch(ResourceStorage::class, self::SIGNAL_PreFileDelete, [$file]);
+        $this->getSignalSlotDispatcher()->dispatch(self::class, self::SIGNAL_PreFileDelete, [$file]);
     }
 
     /**
@@ -2578,7 +2578,7 @@ class ResourceStorage implements ResourceStorageInterface
      */
     protected function emitPostFileDeleteSignal(FileInterface $file)
     {
-        $this->getSignalSlotDispatcher()->dispatch(ResourceStorage::class, self::SIGNAL_PostFileDelete, [$file]);
+        $this->getSignalSlotDispatcher()->dispatch(self::class, self::SIGNAL_PostFileDelete, [$file]);
     }
 
     /**
@@ -2590,7 +2590,7 @@ class ResourceStorage implements ResourceStorageInterface
      */
     protected function emitPostFileSetContentsSignal(FileInterface $file, $content)
     {
-        $this->getSignalSlotDispatcher()->dispatch(ResourceStorage::class, self::SIGNAL_PostFileSetContents, [$file, $content]);
+        $this->getSignalSlotDispatcher()->dispatch(self::class, self::SIGNAL_PostFileSetContents, [$file, $content]);
     }
 
     /**
@@ -2602,7 +2602,7 @@ class ResourceStorage implements ResourceStorageInterface
      */
     protected function emitPreFolderAddSignal(Folder $targetFolder, $name)
     {
-        $this->getSignalSlotDispatcher()->dispatch(ResourceStorage::class, self::SIGNAL_PreFolderAdd, [$targetFolder, $name]);
+        $this->getSignalSlotDispatcher()->dispatch(self::class, self::SIGNAL_PreFolderAdd, [$targetFolder, $name]);
     }
 
     /**
@@ -2613,7 +2613,7 @@ class ResourceStorage implements ResourceStorageInterface
      */
     protected function emitPostFolderAddSignal(Folder $folder)
     {
-        $this->getSignalSlotDispatcher()->dispatch(ResourceStorage::class, self::SIGNAL_PostFolderAdd, [$folder]);
+        $this->getSignalSlotDispatcher()->dispatch(self::class, self::SIGNAL_PostFolderAdd, [$folder]);
     }
 
     /**
@@ -2626,7 +2626,7 @@ class ResourceStorage implements ResourceStorageInterface
      */
     protected function emitPreFolderCopySignal(Folder $folder, Folder $targetFolder, $newName)
     {
-        $this->getSignalSlotDispatcher()->dispatch(ResourceStorage::class, self::SIGNAL_PreFolderCopy, [$folder, $targetFolder, $newName]);
+        $this->getSignalSlotDispatcher()->dispatch(self::class, self::SIGNAL_PreFolderCopy, [$folder, $targetFolder, $newName]);
     }
 
     /**
@@ -2639,7 +2639,7 @@ class ResourceStorage implements ResourceStorageInterface
      */
     protected function emitPostFolderCopySignal(Folder $folder, Folder $targetFolder, $newName)
     {
-        $this->getSignalSlotDispatcher()->dispatch(ResourceStorage::class, self::SIGNAL_PostFolderCopy, [$folder, $targetFolder, $newName]);
+        $this->getSignalSlotDispatcher()->dispatch(self::class, self::SIGNAL_PostFolderCopy, [$folder, $targetFolder, $newName]);
     }
 
     /**
@@ -2652,7 +2652,7 @@ class ResourceStorage implements ResourceStorageInterface
      */
     protected function emitPreFolderMoveSignal(Folder $folder, Folder $targetFolder, $newName)
     {
-        $this->getSignalSlotDispatcher()->dispatch(ResourceStorage::class, self::SIGNAL_PreFolderMove, [$folder, $targetFolder, $newName]);
+        $this->getSignalSlotDispatcher()->dispatch(self::class, self::SIGNAL_PreFolderMove, [$folder, $targetFolder, $newName]);
     }
 
     /**
@@ -2666,7 +2666,7 @@ class ResourceStorage implements ResourceStorageInterface
      */
     protected function emitPostFolderMoveSignal(Folder $folder, Folder $targetFolder, $newName, Folder $originalFolder)
     {
-        $this->getSignalSlotDispatcher()->dispatch(ResourceStorage::class, self::SIGNAL_PostFolderMove, [$folder, $targetFolder, $newName, $originalFolder]);
+        $this->getSignalSlotDispatcher()->dispatch(self::class, self::SIGNAL_PostFolderMove, [$folder, $targetFolder, $newName, $originalFolder]);
     }
 
     /**
@@ -2678,7 +2678,7 @@ class ResourceStorage implements ResourceStorageInterface
      */
     protected function emitPreFolderRenameSignal(Folder $folder, $newName)
     {
-        $this->getSignalSlotDispatcher()->dispatch(ResourceStorage::class, self::SIGNAL_PreFolderRename, [$folder, $newName]);
+        $this->getSignalSlotDispatcher()->dispatch(self::class, self::SIGNAL_PreFolderRename, [$folder, $newName]);
     }
 
     /**
@@ -2690,7 +2690,7 @@ class ResourceStorage implements ResourceStorageInterface
      */
     protected function emitPostFolderRenameSignal(Folder $folder, $newName)
     {
-        $this->getSignalSlotDispatcher()->dispatch(ResourceStorage::class, self::SIGNAL_PostFolderRename, [$folder, $newName]);
+        $this->getSignalSlotDispatcher()->dispatch(self::class, self::SIGNAL_PostFolderRename, [$folder, $newName]);
     }
 
     /**
@@ -2701,7 +2701,7 @@ class ResourceStorage implements ResourceStorageInterface
      */
     protected function emitPreFolderDeleteSignal(Folder $folder)
     {
-        $this->getSignalSlotDispatcher()->dispatch(ResourceStorage::class, self::SIGNAL_PreFolderDelete, [$folder]);
+        $this->getSignalSlotDispatcher()->dispatch(self::class, self::SIGNAL_PreFolderDelete, [$folder]);
     }
 
     /**
@@ -2712,7 +2712,7 @@ class ResourceStorage implements ResourceStorageInterface
      */
     protected function emitPostFolderDeleteSignal(Folder $folder)
     {
-        $this->getSignalSlotDispatcher()->dispatch(ResourceStorage::class, self::SIGNAL_PostFolderDelete, [$folder]);
+        $this->getSignalSlotDispatcher()->dispatch(self::class, self::SIGNAL_PostFolderDelete, [$folder]);
     }
 
     /**
@@ -2724,7 +2724,7 @@ class ResourceStorage implements ResourceStorageInterface
      */
     protected function emitPreGeneratePublicUrlSignal(ResourceInterface $resourceObject, $relativeToCurrentScript, array $urlData)
     {
-        $this->getSignalSlotDispatcher()->dispatch(ResourceStorage::class, self::SIGNAL_PreGeneratePublicUrl, [$this, $this->driver, $resourceObject, $relativeToCurrentScript, $urlData]);
+        $this->getSignalSlotDispatcher()->dispatch(self::class, self::SIGNAL_PreGeneratePublicUrl, [$this, $this->driver, $resourceObject, $relativeToCurrentScript, $urlData]);
     }
 
     /**
index a533c4d..d6e00ca 100644 (file)
@@ -373,7 +373,7 @@ class DatabaseTreeDataProvider extends AbstractTableConfigurationTreeDataProvide
      */
     protected function getRelatedRecords(array $row)
     {
-        if ($this->getLookupMode() == DatabaseTreeDataProvider::MODE_PARENT) {
+        if ($this->getLookupMode() == self::MODE_PARENT) {
             $children = $this->getChildrenUidsFromParentRelation($row);
         } else {
             $children = $this->getChildrenUidsFromChildrenRelation($row);
@@ -511,7 +511,7 @@ class DatabaseTreeDataProvider extends AbstractTableConfigurationTreeDataProvide
     protected function emitPostProcessTreeDataSignal()
     {
         $this->getSignalSlotDispatcher()->dispatch(
-            DatabaseTreeDataProvider::class,
+            self::class,
             self::SIGNAL_PostProcessTreeData,
             [$this, $this->treeData]
         );
index e841c1b..f8bcf01 100644 (file)
@@ -99,7 +99,7 @@ class JsConfirmation extends Enumeration
     protected function isValid($value)
     {
         if ($value < 255) {
-            return (($value & self::$allowedValues) === $value);
+            return ($value & self::$allowedValues) === $value;
         }
 
         $value = (string)$value;
index b614173..22554a7 100644 (file)
@@ -73,7 +73,7 @@ class ClientUtility
             'aol'
         ];
         $matches = [];
-        $pattern = '#(?P<browser>' . join('|', $known) . ')[/ ]+(?P<version>[0-9]+(?:\\.[0-9]+)?)#';
+        $pattern = '#(?P<browser>' . implode('|', $known) . ')[/ ]+(?P<version>[0-9]+(?:\\.[0-9]+)?)#';
         // Find all phrases (or return empty array if none found)
         if (!preg_match_all($pattern, strtolower($userAgent), $matches)) {
             // Microsoft Internet-Explorer 11 does not have a sign of "MSIE" or so in the useragent.
index ac4eca4..1f9f300 100644 (file)
@@ -856,7 +856,7 @@ class ExtensionManagementUtility
         $moduleConfiguration['name'] = $moduleSignature;
         $moduleConfiguration['script'] = 'extjspaneldummy.html';
         $moduleConfiguration['extensionName'] = $extensionName;
-        $moduleConfiguration['configureModuleFunction'] = [ExtensionManagementUtility::class, 'configureModule'];
+        $moduleConfiguration['configureModuleFunction'] = [self::class, 'configureModule'];
         $GLOBALS['TBE_MODULES']['_configuration'][$moduleSignature] = $moduleConfiguration;
         self::addModule($mainModuleName, $subModuleName, $position);
     }
index 2263990..f4348f3 100644 (file)
@@ -2392,7 +2392,7 @@ class GeneralUtility
             $temporaryDirectory = rtrim($directory, '/') . '.' . StringUtility::getUniqueId('remove') . '/';
             if (rename($directory, $temporaryDirectory)) {
                 if ($flushOpcodeCache) {
-                    GeneralUtility::makeInstance(OpcodeCacheService::class)->clearAllActive($directory);
+                    self::makeInstance(OpcodeCacheService::class)->clearAllActive($directory);
                 }
                 if ($keepOriginalDirectory) {
                     static::mkdir($directory);
@@ -3138,7 +3138,7 @@ class GeneralUtility
      */
     protected static function isInternalRequestType()
     {
-        return (!defined('TYPO3_REQUESTTYPE') || (defined('TYPO3_REQUESTTYPE') && TYPO3_REQUESTTYPE & (TYPO3_REQUESTTYPE_INSTALL | TYPO3_REQUESTTYPE_CLI)));
+        return !defined('TYPO3_REQUESTTYPE') || (defined('TYPO3_REQUESTTYPE') && TYPO3_REQUESTTYPE & (TYPO3_REQUESTTYPE_INSTALL | TYPO3_REQUESTTYPE_CLI));
     }
 
     /**
@@ -3516,7 +3516,7 @@ class GeneralUtility
     {
         $temporaryPath = PATH_site . 'typo3temp/var/transient/';
         if (!is_dir($temporaryPath)) {
-            GeneralUtility::mkdir_deep($temporaryPath);
+            self::mkdir_deep($temporaryPath);
         }
         if ($fileSuffix === '') {
             $tempFileName = static::fixWindowsFilePath(tempnam($temporaryPath, $filePrefix));
index 2173241..c195a03 100644 (file)
@@ -22,7 +22,7 @@ return [
         'thumbnails' => true,                            // Boolean: Enables the use of thumbnails in the backend interface.
         'thumbnails_png' => true,                            // Boolean. If false, thumbnails from non-image files will be converted to 'gif', otherwise 'png' (default).
         'gif_compress' => true,                            // Boolean: Enables the use of the \TYPO3\CMS\Core\Utility\GeneralUtility::gifCompress() workaround function for compressing giffiles made with GD or IM, which probably use only RLE or no compression at all.
-        'imagefile_ext' => 'gif,jpg,jpeg,tif,tiff,bmp,pcx,tga,png,pdf,ai,svg',// Commalist of file extensions perceived as images by TYPO3. List should be set to 'gif,png,jpeg,jpg' if IM is not available. Lowercase and no spaces between!
+        'imagefile_ext' => 'gif,jpg,jpeg,tif,tiff,bmp,pcx,tga,png,pdf,ai,svg', // Commalist of file extensions perceived as images by TYPO3. List should be set to 'gif,png,jpeg,jpg' if IM is not available. Lowercase and no spaces between!
         'gdlib' => true,                                // Boolean: Enables the use of GD.
         'gdlib_png' => false,                            // Boolean: Enables the use of GD, with PNG only. This means that all items normally generated as gif-files will be png-files instead!
         'processor_enabled' => true,                    // Boolean: Enables the use of Image- or GraphicsMagick.
@@ -205,7 +205,7 @@ return [
         'errorHandlerErrors' => E_ALL & ~(E_STRICT | E_NOTICE | E_COMPILE_WARNING | E_COMPILE_ERROR | E_CORE_WARNING | E_CORE_ERROR | E_PARSE | E_ERROR),        // Integer: The E_* constant that will be handled by the [SYS][errorHandler]. Not all PHP error types can be handled! Default is 30466 = <code>E_ALL & ~(E_STRICT | E_NOTICE | E_COMPILE_WARNING | E_COMPILE_ERROR | E_CORE_WARNING | E_CORE_ERROR | E_PARSE | E_ERROR)</code> (see <a href="http://php.net/manual/en/errorfunc.constants.php" target="_blank">PHP documentation</a>).
         'exceptionalErrors' => E_ALL & ~(E_STRICT | E_NOTICE | E_COMPILE_WARNING | E_COMPILE_ERROR | E_CORE_WARNING | E_CORE_ERROR | E_PARSE | E_ERROR | E_DEPRECATED | E_WARNING | E_USER_ERROR | E_USER_NOTICE | E_USER_WARNING),        // Integer: The E_* constant that will be converted into an exception by the default [SYS][errorHandler]. Default is 20480 = <code>E_ALL & ~(E_STRICT | E_NOTICE | E_COMPILE_WARNING | E_COMPILE_ERROR | E_CORE_WARNING | E_CORE_ERROR | E_PARSE | E_ERROR | E_DEPRECATED | E_WARNING | E_USER_ERROR | E_USER_NOTICE | E_USER_WARNING)</code> (see <a href="http://php.net/manual/en/errorfunc.constants.php" target="_blank">PHP documentation</a>).
         'enable_errorDLOG' => 0,    // Boolean: If set, errors are written to the developer log (requires an installed *devlog* extension).
-        'enable_exceptionDLOG' => 0,// Boolean: If set, exceptions are written to the developer log (requires an installed *devlog* extension).
+        'enable_exceptionDLOG' => 0, // Boolean: If set, exceptions are written to the developer log (requires an installed *devlog* extension).
         'syslogErrorReporting' => E_ALL & ~(E_STRICT | E_NOTICE),        // Integer: Configures which PHP errors should be logged to the configured syslogs (see: [SYS][systemLog]). If set to "0" no PHP errors are logged to the syslog. Default is 30711 = <code>E_ALL & ~(E_STRICT | E_NOTICE)</code> (see <a href="http://php.net/manual/en/errorfunc.constants.php" target="_blank">PHP documentation</a>).
         'belogErrorReporting' => E_ALL & ~(E_STRICT | E_NOTICE),        // Integer: Configures which PHP errors should be logged to the "syslog" table (extension: belog). If set to "0" no PHP errors are logged to the sys_log table. Default is 30711 = <code>E_ALL & ~(E_STRICT | E_NOTICE)</code> (see <a href="http://php.net/manual/en/errorfunc.constants.php" target="_blank">PHP documentation</a>).
         'locallangXMLOverride' => [],        // For extension/overriding of the arrays in 'locallang' files in frontend and backend. See 'Inside TYPO3' for more information.
index 69d2f3c..8f998ef 100644 (file)
@@ -83,7 +83,7 @@ class RemoveXSS
             'onmousewheel', 'onmove', 'onmoveend', 'onmovestart', 'onoffline', 'ononline', 'onpagehide', 'onpageshow', 'onpaste',
             'onpause', 'onplay', 'onplaying', 'onpopstate', 'onprogress', 'onpropertychange', 'onratechange', 'onreadystatechange',
             'onreset', 'onresize', 'onresizeend', 'onresizestart', 'onrowenter', 'onrowexit', 'onrowsdelete', 'onrowsinserted',
-            'onscroll', 'onseeked', 'onseeking','onselect', 'onselectionchange', 'onselectstart', 'onshow', 'onstalled', 'onstart',
+            'onscroll', 'onseeked', 'onseeking', 'onselect', 'onselectionchange', 'onselectstart', 'onshow', 'onstalled', 'onstart',
             'onstop', 'onstorage', 'onsubmit', 'onsuspend', 'ontimeupdate', 'onunload', 'onvolumechange', 'onwaiting'];
         $tagKeywords = ['applet', 'meta', 'xml', 'blink', 'link', 'style', 'script', 'embed', 'object', 'iframe', 'frame',
             'frameset', 'ilayer', 'layer', 'bgsound', 'title', 'base', 'video', 'audio', 'track', 'canvas'];
@@ -99,7 +99,7 @@ class RemoveXSS
             'onmouseover', 'onmouseup', 'onmousewheel', 'onmove', 'onmoveend', 'onmovestart', 'onoffline', 'ononline',
             'onpagehide', 'onpageshow', 'onpaste', 'onpause', 'onplay', 'onplaying', 'onpopstate', 'onprogress',
             'onpropertychange', 'onratechange', 'onreadystatechange', 'onredo', 'onreset', 'onresize', 'onresizeend',
-            'onresizestart','onrowenter', 'onrowexit', 'onrowsdelete', 'onrowsinserted', 'onscroll', 'onseeked', 'onseeking',
+            'onresizestart', 'onrowenter', 'onrowexit', 'onrowsdelete', 'onrowsinserted', 'onscroll', 'onseeked', 'onseeking',
             'onselect', 'onselectionchange', 'onselectstart', 'onshow', 'onstalled', 'onstart', 'onstop', 'onstorage', 'onsubmit',
             'onsuspend', 'ontimeupdate', 'onundo', 'onunload', 'onvolumechange', 'onwaiting'];
         $protocolKeywords = ['javascript', 'vbscript', 'expression'];
index 2d5edd2..370cfa9 100644 (file)
@@ -154,7 +154,7 @@ class Collector implements \TYPO3\CMS\Core\SingletonInterface
             unset($fieldList);
         }
 
-        return (!empty($this->tableFields[$tableName]) ? $this->tableFields[$tableName] : []);
+        return !empty($this->tableFields[$tableName]) ? $this->tableFields[$tableName] : [];
     }
 
     /**
index 3e9327c..f330bfb 100644 (file)
@@ -28,7 +28,6 @@ use TYPO3\CMS\Core\Utility\GeneralUtility;
  */
 class ResourceStorageTest extends FunctionalTestCase
 {
-
     protected function tearDown()
     {
         // cleanup manually created folders
index c3eff5c..44eff6c 100644 (file)
@@ -1,5 +1,5 @@
 <?php
-declare (strict_types=1);
+declare(strict_types=1);
 namespace TYPO3\CMS\Core\Tests\Unit\Crypto;
 
 /*
index 4671131..678d94f 100644 (file)
@@ -1,5 +1,5 @@
 <?php
-declare (strict_types = 1);
+declare(strict_types=1);
 namespace TYPO3\CMS\Core\Tests\Unit\Database;
 
 /*
index 702f44d..9d4340e 100644 (file)
@@ -1,5 +1,5 @@
 <?php
-declare (strict_types = 1);
+declare(strict_types=1);
 namespace TYPO3\CMS\Core\Tests\Unit\Database;
 
 /*
index 79a17e1..9b48e41 100644 (file)
@@ -1,5 +1,5 @@
 <?php
-declare (strict_types = 1);
+declare(strict_types=1);
 namespace TYPO3\CMS\Core\Tests\Unit\Database\Query;
 
 /*
index ae6509c..6294c79 100644 (file)
@@ -1,5 +1,5 @@
 <?php
-declare (strict_types = 1);
+declare(strict_types=1);
 namespace TYPO3\CMS\Core\Tests\Unit\Database\Query;
 
 /*
index 9fbd885..c66fe0b 100644 (file)
@@ -1,5 +1,5 @@
 <?php
-declare (strict_types = 1);
+declare(strict_types=1);
 namespace TYPO3\CMS\Core\Tests\Unit\Database\Query;
 
 /*
index 91bb456..6f92670 100644 (file)
@@ -39,6 +39,6 @@ class FileLockStrategyTest extends UnitTestCase
     public function constructorSetsFilePathToExpectedValue()
     {
         $lock = $this->getAccessibleMock(FileLockStrategy::class, ['dummy'], ['999999999']);
-        $this->assertSame(PATH_site . FileLockStrategy::FILE_LOCK_FOLDER  . 'flock_' . md5('999999999'), $lock->_get('filePath'));
+        $this->assertSame(PATH_site . FileLockStrategy::FILE_LOCK_FOLDER . 'flock_' . md5('999999999'), $lock->_get('filePath'));
     }
 }
index 0138a9f..f3bec6c 100644 (file)
@@ -364,7 +364,7 @@ class ResourceCompressorTest extends BaseTestCase
             2 => [
                 $path . 'comment_hacks.css',
                 $path . 'comment_hacks.css.optimized.css'
-            ],/*
+            ], /*
             // File. Tests:
             // - Any @charset declaration at the beginning of a file should be
             //   removed without breaking subsequent CSS.*/
index 8d5bb3e..303e266 100644 (file)
@@ -30,7 +30,7 @@ class TreeDataProviderWithConfigurationFixture
         }
         $tcaConfiguration = [
             'treeConfig' => [
-                'dataProvider' => TreeDataProviderWithConfigurationFixture::class,
+                'dataProvider' => self::class,
             ],
             'internal_type' => 'foo',
         ];
index c66dae1..8428064 100644 (file)
@@ -1419,8 +1419,8 @@ class ArrayUtilityTest extends UnitTestCase
                 []
             ],
             'returns self if array is already numerically keyed' => [
-                [1,2,3],
-                [1,2,3]
+                [1, 2, 3],
+                [1, 2, 3]
             ],
             'returns correctly if keys are numeric, but contains a leap' => [
                 [0 => 'One', 1 => 'Two', 3 => 'Three'],
@@ -1504,7 +1504,7 @@ class ArrayUtilityTest extends UnitTestCase
                         'three' => [
                             2 => 'SubSubOne',
                             5 => 'SubSubTwo',
-                            9 => [0,1,2],
+                            9 => [0, 1, 2],
                             []
                         ]
                     ]
@@ -1518,7 +1518,7 @@ class ArrayUtilityTest extends UnitTestCase
                         'three' => [
                             'SubSubOne',
                             'SubSubTwo',
-                            [0,1,2],
+                            [0, 1, 2],
                             []
                         ]
                     ]
index 5da46f6..5e6558b 100644 (file)
@@ -1485,7 +1485,7 @@ class GeneralUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
                 'Hello all   together     all      there all       all   are  all    none',
                 true,
                 5,
-                ['Hello', 'together', 'there', 'are' ,'none']
+                ['Hello', 'together', 'there', 'are' , 'none']
             ],
             'can use words as delimiter and do not remove empty' => [
                 'all  there',
@@ -4514,7 +4514,9 @@ class GeneralUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function callUserFunctionCanCallFunction()
     {
         $inputData = ['foo' => 'bar'];
-        $result = GeneralUtility::callUserFunction(function () { return 'Worked fine'; }, $inputData, $this, '');
+        $result = GeneralUtility::callUserFunction(function () {
+            return 'Worked fine';
+        }, $inputData, $this, '');
         $this->assertEquals('Worked fine', $result);
     }
 
@@ -4524,7 +4526,7 @@ class GeneralUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function callUserFunctionCanCallMethod()
     {
         $inputData = ['foo' => 'bar'];
-        $result = GeneralUtility::callUserFunction(GeneralUtilityTest::class . '->user_calledUserFunction', $inputData, $this);
+        $result = GeneralUtility::callUserFunction(self::class . '->user_calledUserFunction', $inputData, $this);
         $this->assertEquals('Worked fine', $result);
     }
 
index d4b6f62..743fbef 100644 (file)
@@ -55,7 +55,6 @@ class VersionNumberUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
             'object' => [new \stdClass()],
             'NULL' => [null],
             'function' => [function () {
-
             }]
         ];
     }
index 005fb5e..4d973c2 100644 (file)
@@ -71,7 +71,8 @@ class ExtensionManager
                     [
                         'documentTranslation' => $documentTranslation,
                     ],
-                    function () {},
+                    function () {
+                    },
                     new RenderingContext()
                 );
             }
index 1c68824..21b20f2 100644 (file)
@@ -238,6 +238,6 @@ class Bootstrap implements \TYPO3\CMS\Extbase\Core\BootstrapInterface
      */
     protected function isInCliMode()
     {
-        return (TYPO3_REQUESTTYPE & TYPO3_REQUESTTYPE_CLI);
+        return TYPO3_REQUESTTYPE & TYPO3_REQUESTTYPE_CLI;
     }
 }
index 15c5b06..8cf718a 100644 (file)
@@ -223,7 +223,7 @@ class Result
             return $this->recurseThroughResult(explode('.', $propertyPath));
         }
         if (!isset($this->propertyResults[$propertyPath])) {
-            $this->propertyResults[$propertyPath] = new Result();
+            $this->propertyResults[$propertyPath] = new self();
             $this->propertyResults[$propertyPath]->setParent($this);
         }
         return $this->propertyResults[$propertyPath];
@@ -244,7 +244,7 @@ class Result
         $propertyName = array_shift($pathSegments);
 
         if (!isset($this->propertyResults[$propertyName])) {
-            $this->propertyResults[$propertyName] = new Result();
+            $this->propertyResults[$propertyName] = new self();
             $this->propertyResults[$propertyName]->setParent($this);
         }
 
index c3d0a7c..f0108d9 100644 (file)
@@ -528,7 +528,7 @@ class DataMapper implements \TYPO3\CMS\Core\SingletonInterface
     protected function propertyMapsByForeignKey(DomainObjectInterface $parentObject, $propertyName)
     {
         $columnMap = $this->getDataMap(get_class($parentObject))->getColumnMap($propertyName);
-        return ($columnMap->getParentKeyFieldName() !== null);
+        return $columnMap->getParentKeyFieldName() !== null;
     }
 
     /**
index d1790d7..5f5e756 100644 (file)
@@ -295,7 +295,7 @@ class PersistenceManager implements \TYPO3\CMS\Extbase\Persistence\PersistenceMa
      */
     public function isNewObject($object)
     {
-        return ($this->persistenceSession->hasObject($object) === false);
+        return $this->persistenceSession->hasObject($object) === false;
     }
 
     /**
index 8a9fba7..ce5c330 100644 (file)
@@ -361,9 +361,9 @@ class ObjectStorage implements \Countable, \Iterator, \ArrayAccess, ObjectMonito
      */
     public function isRelationDirty($object)
     {
-        return (isset($this->addedObjectsPositions[spl_object_hash($object)])
+        return isset($this->addedObjectsPositions[spl_object_hash($object)])
                 && isset($this->removedObjectsPositions[spl_object_hash($object)])
-                && ($this->addedObjectsPositions[spl_object_hash($object)] !== $this->removedObjectsPositions[spl_object_hash($object)]));
+                && ($this->addedObjectsPositions[spl_object_hash($object)] !== $this->removedObjectsPositions[spl_object_hash($object)]);
     }
 
     /**
index 3ce0c22..e845ea6 100644 (file)
@@ -245,7 +245,7 @@ class PropertyMappingConfiguration implements PropertyMappingConfigurationInterf
             return $this->subConfigurationForProperty[self::PROPERTY_PATH_PLACEHOLDER];
         }
 
-        return new PropertyMappingConfiguration();
+        return new self();
     }
 
     /**
index 52ec950..91572a8 100644 (file)
@@ -73,8 +73,8 @@ class FloatConverter extends \TYPO3\CMS\Extbase\Property\TypeConverter\AbstractT
         // We won't backport the full flavored locale parsing of floats from Flow here
 
         if (is_string($source) && $configuration !== null) {
-            $thousandsSeparator = $configuration->getConfigurationValue(FloatConverter::class, self::CONFIGURATION_THOUSANDS_SEPARATOR);
-            $decimalPoint = $configuration->getConfigurationValue(FloatConverter::class, self::CONFIGURATION_DECIMAL_POINT);
+            $thousandsSeparator = $configuration->getConfigurationValue(self::class, self::CONFIGURATION_THOUSANDS_SEPARATOR);
+            $decimalPoint = $configuration->getConfigurationValue(self::class, self::CONFIGURATION_DECIMAL_POINT);
             $source = str_replace($thousandsSeparator, '', $source);
             $source = str_replace($decimalPoint, '.', $source);
         }
index 0c3d306..8adc6eb 100644 (file)
@@ -118,7 +118,7 @@ class ClassReflection extends \ReflectionClass
         $extendedInterfaces = [];
         $interfaces = parent::getInterfaces();
         foreach ($interfaces as $interface) {
-            $extendedInterfaces[] = new ClassReflection($interface->getName());
+            $extendedInterfaces[] = new self($interface->getName());
         }
         return $extendedInterfaces;
     }
@@ -133,7 +133,7 @@ class ClassReflection extends \ReflectionClass
     public function getParentClass()
     {
         $parentClass = parent::getParentClass();
-        return $parentClass === false ? false : new ClassReflection($parentClass->getName());
+        return $parentClass === false ? false : new self($parentClass->getName());
     }
 
     /**
index a6632a5..31a41fd 100644 (file)
@@ -103,7 +103,9 @@ class OperatorTest extends \TYPO3\CMS\Core\Tests\FunctionalTestCase
         );
 
         $result = array_map(
-            function ($row) { return $row['uid']; },
+            function ($row) {
+                return $row['uid'];
+            },
             $query->execute(true)
         );
         $this->assertEquals([3, 4, 5], $result);
index 09e2ec6..b64ec80 100644 (file)
@@ -408,7 +408,9 @@ class AbstractConfigurationManagerTest extends \TYPO3\CMS\Core\Tests\UnitTestCas
         $this->abstractConfigurationManager->setConfiguration($configuration);
         $this->abstractConfigurationManager->expects($this->once())->method('getPluginConfiguration')->with('CurrentExtensionName', 'CurrentPluginName')->will($this->returnValue($this->testPluginConfiguration));
         $this->abstractConfigurationManager->expects($this->once())->method('getSwitchableControllerActions')->with('CurrentExtensionName', 'CurrentPluginName')->will($this->returnValue($this->testSwitchableControllerActions));
-        $this->abstractConfigurationManager->expects($this->once())->method('getContextSpecificFrameworkConfiguration')->will($this->returnCallback(function ($a) { return $a; }));
+        $this->abstractConfigurationManager->expects($this->once())->method('getContextSpecificFrameworkConfiguration')->will($this->returnCallback(function ($a) {
+            return $a;
+        }));
         $mergedConfiguration = $this->abstractConfigurationManager->getConfiguration();
         $expectedResult = [
             'Controller1' => [
@@ -435,7 +437,9 @@ class AbstractConfigurationManagerTest extends \TYPO3\CMS\Core\Tests\UnitTestCas
         $this->abstractConfigurationManager->setConfiguration($configuration);
         $this->abstractConfigurationManager->expects($this->once())->method('getPluginConfiguration')->with('CurrentExtensionName', 'CurrentPluginName')->will($this->returnValue($this->testPluginConfiguration));
         $this->abstractConfigurationManager->expects($this->once())->method('getSwitchableControllerActions')->with('CurrentExtensionName', 'CurrentPluginName')->will($this->returnValue($this->testSwitchableControllerActions));
-        $this->abstractConfigurationManager->expects($this->once())->method('getContextSpecificFrameworkConfiguration')->will($this->returnCallback(function ($a) { return $a; }));
+        $this->abstractConfigurationManager->expects($this->once())->method('getContextSpecificFrameworkConfiguration')->will($this->returnCallback(function ($a) {
+            return $a;
+        }));
         $mergedConfiguration = $this->abstractConfigurationManager->getConfiguration();
         $expectedResult = [
             'Controller1' => [
@@ -462,7 +466,9 @@ class AbstractConfigurationManagerTest extends \TYPO3\CMS\Core\Tests\UnitTestCas
         $this->abstractConfigurationManager->setConfiguration($configuration);
         $this->abstractConfigurationManager->expects($this->once())->method('getPluginConfiguration')->with('CurrentExtensionName', 'CurrentPluginName')->will($this->returnValue($this->testPluginConfiguration));
         $this->abstractConfigurationManager->expects($this->once())->method('getSwitchableControllerActions')->with('CurrentExtensionName', 'CurrentPluginName')->will($this->returnValue($this->testSwitchableControllerActions));
-        $this->abstractConfigurationManager->expects($this->once())->method('getContextSpecificFrameworkConfiguration')->will($this->returnCallback(function ($a) { return $a; }));
+        $this->abstractConfigurationManager->expects($this->once())->method('getContextSpecificFrameworkConfiguration')->will($this->returnCallback(function ($a) {
+            return $a;
+        }));
         $mergedConfiguration = $this->abstractConfigurationManager->getConfiguration();
         $expectedResult = [];
         $actualResult = $mergedConfiguration['controllerConfiguration'];
@@ -486,7 +492,9 @@ class AbstractConfigurationManagerTest extends \TYPO3\CMS\Core\Tests\UnitTestCas
         $this->abstractConfigurationManager->setConfiguration($configuration);
         $this->abstractConfigurationManager->expects($this->once())->method('getPluginConfiguration')->with('CurrentExtensionName', 'CurrentPluginName')->will($this->returnValue($this->testPluginConfiguration));
         $this->abstractConfigurationManager->expects($this->once())->method('getSwitchableControllerActions')->with('CurrentExtensionName', 'CurrentPluginName')->will($this->returnValue($this->testSwitchableControllerActions));
-        $this->abstractConfigurationManager->expects($this->once())->method('getContextSpecificFrameworkConfiguration')->will($this->returnCallback(function ($a) { return $a; }));
+        $this->abstractConfigurationManager->expects($this->once())->method('getContextSpecificFrameworkConfiguration')->will($this->returnCallback(function ($a) {
+            return $a;
+        }));
         $mergedConfiguration = $this->abstractConfigurationManager->getConfiguration();
         $expectedResult = [
             'Controller1' => [
index 27be186..863b374 100644 (file)
@@ -27,7 +27,7 @@ class DateTimeSubFixture extends \DateTime
      */
     public static function createFromFormat($format, $time, $timezone = null)
     {
-        return new DateTimeSubFixture();
+        return new self();
     }
 
     /**
index 8cf6051..4f504f3 100644 (file)
@@ -78,13 +78,13 @@ class PersistentObjectConverterTest extends UnitTestCase
         $this->mockObjectManager->expects($this->any())
             ->method('get')
             ->will($this->returnCallback(function ($className, ...$arguments) {
-                    $reflectionClass = new \ReflectionClass($className);
-                    if (empty($arguments)) {
-                        return $reflectionClass->newInstance();
-                    } else {
-                        return $reflectionClass->newInstanceArgs($arguments);
-                    }
-                }));
+                $reflectionClass = new \ReflectionClass($className);
+                if (empty($arguments)) {
+                    return $reflectionClass->newInstance();
+                } else {
+                    return $reflectionClass->newInstanceArgs($arguments);
+                }
+            }));
         $this->inject($this->converter, 'objectManager', $this->mockObjectManager);
 
         $this->mockContainer = $this->createMock(\TYPO3\CMS\Extbase\Object\Container\Container::class);
index a81a352..0a07438 100644 (file)
@@ -131,7 +131,8 @@ class DispatcherTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
             ->method('slot')
             ->will($this->returnCallback(
                         function ($foo, $baz) {
-                            return ['modified_' . $foo, 'modified_' . $baz];}
+                            return ['modified_' . $foo, 'modified_' . $baz];
+                        }
                     ));
 
         $secondMockSlot = $this->createMock(\TYPO3\CMS\Extbase\Tests\Fixture\SlotFixture::class);
@@ -157,7 +158,8 @@ class DispatcherTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
             ->method('slot')
             ->will($this->returnCallback(
                         function ($foo, $baz) {
-                            return ['modified_' . $foo, 'modified_' . $baz];}
+                            return ['modified_' . $foo, 'modified_' . $baz];
+                        }
                     ));
 
         $secondMockSlot = $this->createMock(\TYPO3\CMS\Extbase\Tests\Fixture\SlotFixture::class);
@@ -183,7 +185,8 @@ class DispatcherTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
             ->method('slot')
             ->will($this->returnCallback(
                         function ($foo, $baz) {
-                            return ['modified_' . $foo, 'modified_' . $baz];}
+                            return ['modified_' . $foo, 'modified_' . $baz];
+                        }
                     ));
 
         $secondMockSlot = $this->createMock(\TYPO3\CMS\Extbase\Tests\Fixture\SlotFixture::class);
@@ -216,7 +219,8 @@ class DispatcherTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
             ->method('slot')
             ->will($this->returnCallback(
                         function () {
-                            return 'string';}
+                            return 'string';
+                        }
                     ));
 
         $this->signalSlotDispatcher->connect('Foo', 'emitBar', $mockSlot, 'slot', false);
@@ -237,7 +241,8 @@ class DispatcherTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
             ->method('slot')
             ->will($this->returnCallback(
                         function () {
-                            return [1, 2, 3];}
+                            return [1, 2, 3];
+                        }
                     ));
 
         $this->signalSlotDispatcher->connect('Foo', 'emitBar', $mockSlot, 'slot', false);
index bc4e029..7606e2b 100644 (file)
@@ -39,7 +39,7 @@ class Extension extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
         6 => 'templates',
         8 => 'doc',
         9 => 'example',
-        Extension::DISTRIBUTION_CATEGORY => 'distribution'
+        self::DISTRIBUTION_CATEGORY => 'distribution'
     ];
 
     /**
index 5a9ea50..d3f20fd 100644 (file)
@@ -518,11 +518,10 @@ class FileHandlingUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         $fileHandlerMock->expects($this->exactly(2))
             ->method('createNestedDirectory')
             ->will($this->returnCallback(function ($path) {
-                    if (!in_array($path, ['foo/bar', 'baz/foo'])) {
-                        throw new \Exception('Path "' . $path . '" is not expected to be created');
-                    }
-
-                })
+                if (!in_array($path, ['foo/bar', 'baz/foo'])) {
+                    throw new \Exception('Path "' . $path . '" is not expected to be created');
+                }
+            })
             );
         $fileHandlerMock->ensureConfiguredDirectoriesExist([
                 'key' => 'foo_bar',
index d72713a..d5e7ad6 100644 (file)
@@ -33,12 +33,12 @@ abstract class AbstractBackendViewHelper extends AbstractViewHelper
      */
     public function getDocInstance()
     {
-        if ($this->viewHelperVariableContainer->exists(AbstractBackendViewHelper::class, 'DocumentTemplate')) {
-            $doc = $this->viewHelperVariableContainer->get(AbstractBackendViewHelper::class, 'DocumentTemplate');
+        if ($this->viewHelperVariableContainer->exists(self::class, 'DocumentTemplate')) {
+            $doc = $this->viewHelperVariableContainer->get(self::class, 'DocumentTemplate');
         } else {
             /** @var $doc DocumentTemplate */
             $doc = GeneralUtility::makeInstance(DocumentTemplate::class);
-            $this->viewHelperVariableContainer->add(AbstractBackendViewHelper::class, 'DocumentTemplate', $doc);
+            $this->viewHelperVariableContainer->add(self::class, 'DocumentTemplate', $doc);
         }
 
         return $doc;
@@ -52,12 +52,12 @@ abstract class AbstractBackendViewHelper extends AbstractViewHelper
      */
     public function getPageRenderer()
     {
-        if ($this->viewHelperVariableContainer->exists(AbstractBackendViewHelper::class, 'PageRenderer')) {
-            $pageRenderer = $this->viewHelperVariableContainer->get(AbstractBackendViewHelper::class, 'PageRenderer');
+        if ($this->viewHelperVariableContainer->exists(self::class, 'PageRenderer')) {
+            $pageRenderer = $this->viewHelperVariableContainer->get(self::class, 'PageRenderer');
         } else {
             /** @var $doc DocumentTemplate */
             $pageRenderer = GeneralUtility::makeInstance(PageRenderer::class);
-            $this->viewHelperVariableContainer->add(AbstractBackendViewHelper::class, 'PageRenderer', $pageRenderer);
+            $this->viewHelperVariableContainer->add(self::class, 'PageRenderer', $pageRenderer);
         }
 
         return $pageRenderer;
index a301e61..0e6d38a 100644 (file)
@@ -55,7 +55,7 @@ class IfAuthenticatedViewHelper extends \TYPO3\CMS\Fluid\Core\ViewHelper\Abstrac
      */
     protected static function evaluateCondition($arguments = null)
     {
-        return (isset($GLOBALS['BE_USER']) && $GLOBALS['BE_USER']->user['uid'] > 0);
+        return isset($GLOBALS['BE_USER']) && $GLOBALS['BE_USER']->user['uid'] > 0;
     }
 
     /**
index a5c0d5e..c560815 100644 (file)
@@ -54,12 +54,12 @@ class SwitchViewHelper extends \TYPO3Fluid\Fluid\ViewHelpers\SwitchViewHelper
         if ($node instanceof ViewHelperNode) {
             $viewHelperClassName = $node->getViewHelperClassName();
             $arguments = $node->getArguments();
-            return (
+            return
                 $viewHelperClassName === DefaultCaseViewHelper::class ||
                 (
                     $viewHelperClassName === CaseViewHelper::class && isset($arguments['default']) && $arguments['default']
                 )
-            );
+            ;
         }
         return false;
     }
@@ -72,7 +72,7 @@ class SwitchViewHelper extends \TYPO3Fluid\Fluid\ViewHelpers\SwitchViewHelper
     {
         if ($node instanceof ViewHelperNode) {
             $viewHelperClassName = $node->getViewHelperClassName();
-            return ($viewHelperClassName === CaseViewHelper::class || $viewHelperClassName === OriginalCaseViewHelper::class);
+            return $viewHelperClassName === CaseViewHelper::class || $viewHelperClassName === OriginalCaseViewHelper::class;
         }
         return false;
     }
index a77daab..195ed62 100644 (file)
@@ -16,8 +16,7 @@ use TYPO3\CMS\Fluid\ViewHelpers\FormViewHelper;
 /**
  * Test for the Abstract Form view helper
  */
-class AbstractFormFieldViewHelperTest
-    extends \TYPO3\CMS\Fluid\Tests\Unit\ViewHelpers\Form\FormFieldViewHelperBaseTestcase
+class AbstractFormFieldViewHelperTest extends \TYPO3\CMS\Fluid\Tests\Unit\ViewHelpers\Form\FormFieldViewHelperBaseTestcase
 {
     /**
      * @test
index acf8bbd..86bea19 100644 (file)
@@ -34,6 +34,6 @@ class ClassWithTwoGetters
      */
     public function getValue()
     {
-        return new ClassWithTwoGetters();
+        return new self();
     }
 }
index 0aa44d6..6aa5c2c 100644 (file)
@@ -428,7 +428,7 @@ class SelectViewHelperTest extends ViewHelperBaseTestcase
         $user_sk = new \TYPO3\CMS\Fluid\Tests\Unit\ViewHelpers\Form\Fixtures\UserDomainClass(2, 'Sebastian', 'Kurfuerst');
         $user_rl = new \TYPO3\CMS\Fluid\Tests\Unit\ViewHelpers\Form\Fixtures\UserDomainClass(3, 'Robert', 'Lemke');
 
-        $this->arguments['options'] = [$user_is,$user_sk,$user_rl];
+        $this->arguments['options'] = [$user_is, $user_sk, $user_rl];
         $this->arguments['value'] = [$user_rl, $user_is];
         $this->arguments['optionLabelField'] = 'lastName';
         $this->arguments['name'] = 'myName';
index 481a4c8..266e6c3 100644 (file)
@@ -2,7 +2,6 @@
 defined('TYPO3_MODE') or die();
 
 call_user_func(function () {
-
     $languageFilePrefix = 'LLL:EXT:fluid_styled_content/Resources/Private/Language/Database.xlf:';
     $frontendLanguageFilePrefix = 'LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:';
 
index 8266ba7..c2b0023 100644 (file)
@@ -31,7 +31,7 @@ class ElementBuilder
     public static function create(FormBuilder $formBuilder, Element $element, array $userDefinedTypoScript)
     {
         /** @var ElementBuilder $elementBuilder */
-        $elementBuilder = \TYPO3\CMS\Form\Utility\FormUtility::getObjectManager()->get(ElementBuilder::class);
+        $elementBuilder = \TYPO3\CMS\Form\Utility\FormUtility::getObjectManager()->get(self::class);
         $elementBuilder->setFormBuilder($formBuilder);
         $elementBuilder->setElement($element);
         $elementBuilder->setUserConfiguredElementTyposcript($userDefinedTypoScript);
@@ -423,9 +423,9 @@ class ElementBuilder
      */
     protected function arrayKeyExists($needle, array $haystack = [])
     {
-        return (
+        return
             isset($haystack[$needle]) || isset($haystack[$needle . '.'])
-        );
+        ;
     }
 
     /**
index cb1bc76..9d66e33 100644 (file)
@@ -37,7 +37,7 @@ class FormBuilder
     public static function create(Configuration $configuration)
     {
         /** @var FormBuilder $formBuilder */
-        $formBuilder = \TYPO3\CMS\Form\Utility\FormUtility::getObjectManager()->get(FormBuilder::class);
+        $formBuilder = \TYPO3\CMS\Form\Utility\FormUtility::getObjectManager()->get(self::class);
         $formBuilder->setConfiguration($configuration);
         return $formBuilder;
     }
index 6db02fe..4853a25 100644 (file)
@@ -31,7 +31,7 @@ class ValidationBuilder
     public static function create(Configuration $configuration)
     {
         /** @var ValidationBuilder $validationBuilder */
-        $validationBuilder = \TYPO3\CMS\Form\Utility\FormUtility::getObjectManager()->get(ValidationBuilder::class);
+        $validationBuilder = \TYPO3\CMS\Form\Utility\FormUtility::getObjectManager()->get(self::class);
         $validationBuilder->setConfiguration($configuration);
         return $validationBuilder;
     }
index c23994c..f923ab8 100644 (file)
@@ -35,7 +35,7 @@ class Configuration
      */
     public static function create()
     {
-        return \TYPO3\CMS\Form\Utility\FormUtility::getObjectManager()->get(Configuration::class);
+        return \TYPO3\CMS\Form\Utility\FormUtility::getObjectManager()->get(self::class);
     }
 
     /**
index 7c84410..15812fc 100644 (file)
@@ -81,9 +81,9 @@ class ValidationElement extends AbstractEntity
      */
     public function hasIncomingField($key)
     {
-        return (
+        return
             isset($this->incomingFields[$key])
             || array_key_exists($key, $this->incomingFields)
-        );
+        ;
     }
 }
index e899c0e..e1c80ef 100644 (file)
@@ -39,10 +39,10 @@ class RequiredValidator extends AbstractValidator
     {
         if (is_array($value)) {
             array_walk_recursive($value, function ($value, $key, $validator) {
-                    if (!empty($value) || $value === '0' || $value === 0) {
-                        $validator->setAllFieldsAreEmpty(false);
-                    }
-                },
+                if (!empty($value) || $value === '0' || $value === 0) {
+                    $validator->setAllFieldsAreEmpty(false);
+                }
+            },
                 $this
             );
             if ($this->getAllFieldsAreEmpty()) {
index fbe3b0a..bd00248 100644 (file)
@@ -31,7 +31,7 @@ class ControllerContext extends \TYPO3\CMS\Extbase\Mvc\Controller\ControllerCont
      */
     public static function extend(\TYPO3\CMS\Extbase\Mvc\Controller\ControllerContext $source)
     {
-        $controllerContext = \TYPO3\CMS\Form\Utility\FormUtility::getObjectManager()->get(ControllerContext::class);
+        $controllerContext = \TYPO3\CMS\Form\Utility\FormUtility::getObjectManager()->get(self::class);
         $propertyNames = ObjectAccess::getGettableProperties($source);
         foreach ($propertyNames as $propertyName => $propertyValue) {
             ObjectAccess::setProperty($controllerContext, $propertyName, $propertyValue);
index 1f25050..a0c4999 100644 (file)
@@ -29,7 +29,7 @@ class FormUtility
     public static function create(Configuration $configuration)
     {
         /** @var FormBuilder $formBuilder */
-        $formUtility = FormUtility::getObjectManager()->get(FormUtility::class);
+        $formUtility = self::getObjectManager()->get(self::class);
         $formUtility->setConfiguration($configuration);
         return $formUtility;
     }
@@ -112,13 +112,13 @@ class FormUtility
      *
      *   If $type is set and $configuration['value'] isset
      *   return the value of $configuration['value'].
-     * 
+     *
      *   If $type is set and $configuration['value'] is not set
      *   return the value of $defaultMessage.
-     * 
+     *
      *   If $type is empty and $configuration['value'] isset
      *   return the value of $configuration['value'].
-     * 
+     *
      *   If $type is empty and $configuration['value'] is not set
      *   return the value of $defaultMessage.
      *
index 3b3456b..a641096 100644 (file)
@@ -60,7 +60,7 @@ class BetweenValidatorTest extends AbstractValidatorTest
     public function validInclusiveDataProvider()
     {
         return [
-            '1 ≤ 1 ≤ 1'                 => [[1,1,1]],
+            '1 ≤ 1 ≤ 1'                 => [[1, 1, 1]],
             '-10.1234 ≤ -10.12340 ≤ 10' => [[-10.1234, -10.12340, 10]],
             '-10.1234 ≤ -10 ≤ 10'       => [[-10.1234, -10.12340, 10]],
         ];
index d3f867b..9307be1 100644 (file)
@@ -1069,7 +1069,7 @@ class ContentObjectRenderer
     public function convertToUserIntObject()
     {
         if ($this->userObjectType !== self::OBJECTTYPE_USER) {
-            $this->getTimeTracker()->setTSlogMessage(ContentObjectRenderer::class . '::convertToUserIntObject() is called in the wrong context or for the wrong object type', 2);
+            $this->getTimeTracker()->setTSlogMessage(self::class . '::convertToUserIntObject() is called in the wrong context or for the wrong object type', 2);
         } else {
             $this->doConvertToUserIntObject = true;
         }
index 8bf9f96..5b283de 100644 (file)
@@ -119,7 +119,7 @@ class CategoryMenuUtility
                 uasort(
                     $pages,
                     [
-                        CategoryMenuUtility::class,
+                        self::class,
                         'sortPagesUtility'
                     ]
                 );
index 34a040e..c5fee05 100644 (file)
@@ -207,8 +207,8 @@ class PageRepository
             // versioning preview (that means we are online!)
             $this->where_hid_del = $this->enableFields('pages', $show_hidden, ['fe_group' => true], true);
         }
-        if (is_array($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS'][PageRepository::class]['init'])) {
-            foreach ($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS'][PageRepository::class]['init'] as $classRef) {
+        if (is_array($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS'][self::class]['init'])) {
+            foreach ($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS'][self::class]['init'] as $classRef) {
                 $hookObject = GeneralUtility::makeInstance($classRef);
                 if (!$hookObject instanceof PageRepositoryInitHookInterface) {
                     throw new \UnexpectedValueException($hookObject . ' must implement interface ' . PageRepositoryInitHookInterface::class, 1379579812);
index 029d426..56477a7 100644 (file)
@@ -520,10 +520,10 @@ class AbstractPlugin
      */
     public function pi_list_browseresults($showResultCount = 1, $tableParams = '', $wrapArr = [], $pointerName = 'pointer', $hscText = true, $forceOutput = false)
     {
-        if (isset($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS'][AbstractPlugin::class]['pi_list_browseresults'])
-            && is_array($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS'][AbstractPlugin::class]['pi_list_browseresults'])
+        if (isset($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS'][self::class]['pi_list_browseresults'])
+            && is_array($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS'][self::class]['pi_list_browseresults'])
         ) {
-            foreach ($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS'][AbstractPlugin::class]['pi_list_browseresults'] as $classRef) {
+            foreach ($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS'][self::class]['pi_list_browseresults'] as $classRef) {
                 $hookObj = GeneralUtility::makeInstance($classRef);
                 if (method_exists($hookObj, 'pi_list_browseresults')) {
                     $pageBrowser = $hookObj->pi_list_browseresults($showResultCount, $tableParams, $wrapArr, $pointerName, $hscText, $forceOutput, $this);
index 1e2964d..1ce40c3 100644 (file)
@@ -4474,10 +4474,10 @@ class ContentObjectRendererTest extends UnitTestCase
         list($countCalls, $test) = [0, $this];
         $closure = function ($par1, $par2) use (
             $test, $subject, $params, &$countCalls) {
-                $test->assertSame($params, $par1);
-                $test->assertSame($subject, $par2);
-                $countCalls++;
-            };
+            $test->assertSame($params, $par1);
+            $test->assertSame($subject, $par2);
+            $countCalls++;
+        };
         $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['tslib/class.tslib_content.php']['stdWrap_cacheStore'] = [$closure, $closure, $closure];
         $this->assertSame($content,
             $subject->stdWrap_cacheStore($content, $conf));
index b28d302..093d8df 100644 (file)
@@ -43,7 +43,7 @@ class CrawlerHook
     /**
      * @var string
      */
-    public $callBack = CrawlerHook::class;
+    public $callBack = self::class;
 
     /**
      * The constructor
index 22a427f..f491473 100644 (file)
@@ -47,220 +47,220 @@ class DefaultFactory
         if (Bootstrap::usesComposerClassLoading()) {
             // In composer mode the links are configurable and might even be actual files
             // Ignore this structure in this case
-            $structureAdditional = array();
+            $structureAdditional = [];
         } else {
-            $structureAdditional = array(
-                array(
+            $structureAdditional = [
+                [
                     'name' => 'index.php',
                     'type' => LinkNode::class,
                     'target' => 'typo3_src/index.php',
-                ),
-                array(
+                ],
+                [
                     'name' => 'typo3',
                     'type' => LinkNode::class,
                     'target' => 'typo3_src/typo3',
-                ),
-                array(
+                ],
+                [
                     'name' => 'typo3_src',
                     'type' => LinkNode::class,
-                ),
-            );
+                ],
+            ];
         }
-        $structureBase = array(
-            array(
+        $structureBase = [
+            [
                 'name' => 'typo3temp',
                 'type' => DirectoryNode::class,
                 'targetPermission' => $directoryPermission,
-                'children' => array(
-                    array(
+                'children' => [
+                    [
                         'name' => 'index.html',
                         'type' => FileNode::class,
                         'targetPermission' => $filePermission,
                         'targetContent' => '',
-                    ),
-                    array(
+                    ],
+                    [
                         'name' => 'assets',
                         'type' => DirectoryNode::class,
                         'targetPermission' => $directoryPermission,
-                        'children' => array(
-                            array(
+                        'children' => [
+                            [
                                 'name' => 'compressed',
                                 'type' => DirectoryNode::class,
                                 'targetPermission' => $directoryPermission
-                            ),
-                            array(
+                            ],
+                            [
                                 'name' => 'css',
                                 'type' => DirectoryNode::class,
                                 'targetPermission' => $directoryPermission
-                            ),
-                            array(
+                            ],
+                            [
                                 'name' => 'js',
                                 'type' => DirectoryNode::class,
                                 'targetPermission' => $directoryPermission
-                            ),
-                            array(
+                            ],
+                            [
                                 'name' => 'images',
                                 'type' => DirectoryNode::class,
                                 'targetPermission' => $directoryPermission
-                            ),
-                            array(
+                            ],
+                            [
                                 'name' => '_processed_',
                                 'type' => DirectoryNode::class,
                                 'targetPermission' => $directoryPermission
-                            )
-                        )
-                    ),
-                    array(
+                            ]
+                        ]
+                    ],
+                    [
                         'name' => 'var',
                         'type' => DirectoryNode::class,
                         'targetPermission' => $directoryPermission,
-                        'children' => array(
-                            array(
+                        'children' => [
+                            [
                                 'name' => '.htaccess',
                                 'type' => FileNode::class,
                                 'targetPermission' => $filePermission,
                                 'targetContentFile' => PATH_site . 'typo3/sysext/install/Resources/Private/FolderStructureTemplateFiles/typo3temp-var-htaccess',
-                            ),
-                            array(
+                            ],
+                            [
                                 'name' => 'charset',
                                 'type' => DirectoryNode::class,
                                 'targetPermission' => $directoryPermission,
-                            ),
-                            array(
+                            ],
+                            [
                                 'name' => 'Cache',
                                 'type' => DirectoryNode::class,
                                 'targetPermission' => $directoryPermission,
-                            ),
-                            array(
+                            ],
+                            [
                                 'name' => 'locks',
                                 'type' => DirectoryNode::class,
                                 'targetPermission' => $directoryPermission,
-                            )
-                        )
-                    ),
-                ),
-            ),
-            array(
+                            ]
+                        ]
+                    ],
+                ],
+            ],
+            [
                 'name' => 'typo3conf',
                 'type' => DirectoryNode::class,
                 'targetPermission' => $directoryPermission,
-                'children' => array(
-                    array(
+                'children' => [
+                    [
                         'name' => 'ext',
                         'type' => DirectoryNode::class,
                         'targetPermission' => $directoryPermission,
-                    ),
-                    array(
+                    ],
+                    [
                         'name' => 'l10n',
                         'type' => DirectoryNode::class,
                         'targetPermission' => $directoryPermission,
-                    ),
-                ),
-            ),
-            array(
+                    ],
+                ],
+            ],
+            [
                 'name' => 'uploads',
                 'type' => DirectoryNode::class,
                 'targetPermission' => $directoryPermission,
-                'children' => array(
-                    array(
+                'children' => [
+                    [
                         'name' => 'index.html',
                         'type' => FileNode::class,
                         'targetPermission' => $filePermission,
                         'targetContentFile' => PATH_site . 'typo3/sysext/install/Resources/Private/FolderStructureTemplateFiles/uploads-index.html',
-                    ),
-                    array(
+                    ],
+                    [
                         'name' => 'media',
                         'type' => DirectoryNode::class,
                         'targetPermission' => $directoryPermission,
-                        'children' => array(
-                            array(
+                        'children' => [
+                            [
                                 'name' => 'index.html',
                                 'type' => FileNode::class,
                                 'targetPermission' => $filePermission,
                                 'targetContent' => '',
-                            ),
-                        ),
-                    ),
-                ),
-            ),
-            array(
+                            ],
+                        ],
+                    ],
+                ],
+            ],
+            [
                 'name' => !empty($GLOBALS['TYPO3_CONF_VARS']['BE']['fileadminDir']) ? rtrim($GLOBALS['TYPO3_CONF_VARS']['BE']['fileadminDir'], '/') : 'fileadmin',
                 'type' => DirectoryNode::class,
                 'targetPermission' => $directoryPermission,
-                'children' => array(
-                    array(
+                'children' => [
+                    [
                         'name' => '_temp_',
                         'type' => DirectoryNode::class,
                         'targetPermission' => $directoryPermission,
-                        'children' => array(
-                            array(
+                        'children' => [
+                            [
                                 'name' => '.htaccess',
                                 'type' => FileNode::class,
                                 'targetPermission' => $filePermission,
                                 'targetContentFile' => PATH_site . 'typo3/sysext/install/Resources/Private/FolderStructureTemplateFiles/fileadmin-temp-htaccess',
-                            ),
-                            array(
+                            ],
+                            [
                                 'name' => 'index.html',
                                 'type' => FileNode::class,
                                 'targetPermission' => $filePermission,
                                 'targetContentFile' => PATH_site . 'typo3/sysext/install/Resources/Private/FolderStructureTemplateFiles/fileadmin-temp-index.html',
-                            ),
-                        ),
-                    ),
-                    array(
+                            ],
+                        ],
+                    ],
+                    [
                         'name' => 'user_upload',
                         'type' => DirectoryNode::class,
                         'targetPermission' => $directoryPermission,
-                        'children' => array(
-                            array(
+                        'children' => [
+                            [
                                 'name' => '_temp_',
                                 'type' => DirectoryNode::class,
                                 'targetPermission' => $directoryPermission,
-                                'children' => array(
-                                    array(
+                                'children' => [
+                                    [
                                         'name' => 'index.html',
                                         'type' => FileNode::class,
                                         'targetPermission' => $filePermission,
                                         'targetContent' => '',
-                                    ),
-                                    array(
+                                    ],
+                                    [
                                         'name' => 'importexport',
                                         'type' => DirectoryNode::class,
                                         'targetPermission' => $directoryPermission,
-                                        'children' => array(
-                                            array(
+                                        'children' => [
+                                            [
                                                 'name' => '.htaccess',
                                                 'type' => FileNode::class,
                                                 'targetPermission' => $filePermission,
                                                 'targetContentFile' => PATH_site . 'typo3/sysext/install/Resources/Private/FolderStructureTemplateFiles/fileadmin-user_upload-temp-importexport-htaccess',
-                                            ),
-                                            array(
+                                            ],
+                                            [
                                                 'name' => 'index.html',
                                                 'type' => FileNode::class,
                                                 'targetPermission' => $filePermission,
                                                 'targetContentFile' => PATH_site . 'typo3/sysext/install/Resources/Private/FolderStructureTemplateFiles/fileadmin-temp-index.html',
-                                            ),
-                                        ),
-                                    ),
-                                ),
-                            ),
-                            array(
+                                            ],
+                                        ],
+                                    ],
+                                ],
+                            ],
+                            [
                                 'name' => 'index.html',
                                 'type' => FileNode::class,
                                 'targetPermission' => $filePermission,
                                 'targetContent' => '',
-                            ),
-                        ),
-                    ),
-                ),
-            ),
-        );
+                            ],
+                        ],
+                    ],
+                ],
+            ],
+        ];
 
-        return array(
+        return [
             // Cut off trailing forward / from PATH_site, so root node has no trailing slash like all others
             'name' => substr(PATH_site, 0, -1),
             'targetPermission' => $directoryPermission,
             'children' => array_merge($structureAdditional, $structureBase)
-        );
+        ];
     }
 }
index 4891f4c..08edf78 100644 (file)
@@ -269,7 +269,7 @@ class DirectoryNode extends AbstractNode implements NodeInterface
     protected function isDirectory()
     {
         $path = $this->getAbsolutePath();
-        return (!@is_link($path) && @is_dir($path));
+        return !@is_link($path) && @is_dir($path);
     }
 
     /**
index aa98af5..c63a63d 100644 (file)
@@ -306,6 +306,6 @@ class FileNode extends AbstractNode implements NodeInterface
     protected function isFile()
     {
         $path = $this->getAbsolutePath();
-        return (!is_link($path) && is_file($path));
+        return !is_link($path) && is_file($path);
     }
 }
index 0f36957..e1f256d 100644 (file)
@@ -62,6 +62,6 @@ class ContextService
      */
     public function getContextString()
     {
-        return ($this->isBackendContext() ? 'backend' : 'standalone');
+        return $this->isBackendContext() ? 'backend' : 'standalone';
     }
 }
index eef574c..d9bebff 100644 (file)
@@ -194,7 +194,7 @@ class EnableFileService
     protected static function getFirstInstallFilePaths()
     {
         $files = array_filter(scandir(self::$sitePath), function ($file) {
-            return (@is_file(self::$sitePath . $file) && preg_match('~^' . self::FIRST_INSTALL_FILE_PATH . '.*~i', $file));
+            return @is_file(self::$sitePath . $file) && preg_match('~^' . self::FIRST_INSTALL_FILE_PATH . '.*~i', $file);
         });
         return $files;
     }
index 224a8d5..1d5257f 100644 (file)
@@ -198,7 +198,7 @@ class SessionService implements \TYPO3\CMS\Core\SingletonInterface
      */
     public function hasSession()
     {
-        return ($_SESSION['active'] === true);
+        return $_SESSION['active'] === true;
     }
 
     /**
index 896a3f3..b149259 100644 (file)
@@ -288,7 +288,9 @@ class SqlSchemaMigrationService
                                         // "PRIMARY KEY" is being returned from the DB in upper case.
                                         $fieldC = preg_replace_callback(
                                             '/^([a-zA-Z0-9]+)(\([^)]*\)\s.*)/',
-                                            function ($matches) { return strtolower($matches[1]) . $matches[2]; },
+                                            function ($matches) {
+                                                return strtolower($matches[1]) . $matches[2];
+                                            },
                                             $fieldC
                                         );
 
index 242fba7..4f97c61 100644 (file)
@@ -71,7 +71,7 @@ class RegistryService
     {
         $namespace = (is_string($namespace) ? $namespace : $this->namespaceIdentifier);
         $value = $this->registry->get($namespace, $name, '__NOTFOUND__');
-        return ($value !== '__NOTFOUND__');
+        return $value !== '__NOTFOUND__';
     }
 
     /**
index 7c168d3..3ba3a4f 100644 (file)
@@ -98,7 +98,7 @@ class InternalLinktype extends AbstractLinktype
             $this->setErrorParams($this->errorParams);
         }
 
-        return ($this->responsePage && $this->responseContent);
+        return $this->responsePage && $this->responseContent;
     }
 
     /**
index 05cb589..31d2373 100644 (file)
@@ -229,7 +229,7 @@ class RecordList extends AbstractModule
         // Initialize menu
         $this->menuConfig();
         // Store session data
-        $backendUser->setAndSaveSessionData(RecordList::class, $sessionData);
+        $backendUser->setAndSaveSessionData(self::class, $sessionData);
         $this->getPageRenderer()->addInlineLanguageLabelFile('EXT:lang/locallang_mod_web_list.xlf');
     }
 
index 5eed386..85a2a4d 100644 (file)
@@ -66,12 +66,12 @@ class RsaAuthService extends \TYPO3\CMS\Sv\AuthenticationService
                     $isProcessed = true;
                 } else {
                     if ($this->pObj->writeDevLog) {
-                        GeneralUtility::devLog('Process login data: Failed to RSA decrypt password', RsaAuthService::class);
+                        GeneralUtility::devLog('Process login data: Failed to RSA decrypt password', self::class);
                     }
                 }
             } else {
                 if ($this->pObj->writeDevLog) {
-                    GeneralUtility::devLog('Process login data: passwordTransmissionStrategy has been set to "rsa" but no rsa encrypted password has been found.', RsaAuthService::class);
+                    GeneralUtility::devLog('Process login data: passwordTransmissionStrategy has been set to "rsa" but no rsa encrypted password has been found.', self::class);
                 }
             }
         }
index fff071c..d33f352 100644 (file)
@@ -123,7 +123,7 @@ class ExtensionManagerConfigurationUtility
             case FlashMessage::OK:
                 $class = 'success';
                 break;
-            case FlashMessage::WARNING;
+            case FlashMessage::WARNING:
                 $class = 'warning';
                 break;
             case FlashMessage::ERROR:
index a336013..9ee1a43 100644 (file)
@@ -51,7 +51,7 @@ class TableGarbageCollectionTask extends AbstractTask
      */
     public function execute()
     {
-        $tableConfigurations = $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['scheduler']['tasks'][TableGarbageCollectionTask::class]['options']['tables'];
+        $tableConfigurations = $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['scheduler']['tasks'][self::class]['options']['tables'];
         $tableHandled = false;
         foreach ($tableConfigurations as $tableName => $configuration) {
             if ($this->allTables || $tableName === $this->table) {
@@ -60,7 +60,7 @@ class TableGarbageCollectionTask extends AbstractTask
             }
         }
         if (!$tableHandled) {
-            throw new \RuntimeException(TableGarbageCollectionTask::class . ' misconfiguration: ' . $this->table . ' does not exist in configuration', 1308354399);
+            throw new \RuntimeException(self::class . ' misconfiguration: ' . $this->table . ' does not exist in configuration', 1308354399);
         }
         return true;
     }
@@ -91,7 +91,7 @@ class TableGarbageCollectionTask extends AbstractTask
                 $deleteTimestamp = strtotime('-' . $this->numberOfDays . 'days');
             } else {
                 if (!isset($configuration['expirePeriod'])) {
-                    throw new \RuntimeException(TableGarbageCollectionTask::class . ' misconfiguration: No expirePeriod defined for table ' . $table, 1308355095);
+                    throw new \RuntimeException(self::class . ' misconfiguration: No expirePeriod defined for table ' . $table, 1308355095);
                 }
                 $deleteTimestamp = strtotime('-' . $configuration['expirePeriod'] . 'days');
             }
@@ -99,13 +99,13 @@ class TableGarbageCollectionTask extends AbstractTask
                 $queryBuilder->expr()->lt($configuration['dateField'], $deleteTimestamp)
             );
         } else {
-            throw new \RuntimeException(TableGarbageCollectionTask::class . ' misconfiguration: Either expireField or dateField must be defined for table ' . $table, 1308355268);
+            throw new \RuntimeException(self::class . ' misconfiguration: Either expireField or dateField must be defined for table ' . $table, 1308355268);
         }
 
         try {
             $queryBuilder->execute();
         } catch (DBALException $e) {
-            throw new \RuntimeException(TableGarbageCollectionTask::class . ' failed for table ' . $this->table . ' with error: ' . $e->getMessage(), 1308255491);
+            throw new \RuntimeException(self::class . ' failed for table ' . $this->table . ' with error: ' . $e->getMessage(), 1308255491);
         }
         return true;
     }
index 9413376..872ce6f 100644 (file)
@@ -68,7 +68,7 @@ class AuthenticationService extends AbstractAuthenticationService
             GeneralUtility::sysLog(sprintf('Login-attempt from %s (%s), username \'%s\' not found!', $this->authInfo['REMOTE_ADDR'], $this->authInfo['REMOTE_HOST'], $this->login['uname']), 'core', GeneralUtility::SYSLOG_SEVERITY_WARNING);
         } else {
             if ($this->writeDevLog) {
-                GeneralUtility::devLog('User found: ' . GeneralUtility::arrayToLogString($user, [$this->db_user['userid_column'], $this->db_user['username_column']]), AuthenticationService::class);
+                GeneralUtility::devLog('User found: ' . GeneralUtility::arrayToLogString($user, [$this->db_user['userid_column'], $this->db_user['username_column']]), self::class);
             }
         }
         return $user;
@@ -102,7 +102,7 @@ class AuthenticationService extends AbstractAuthenticationService
                     GeneralUtility::sysLog(sprintf('Login-attempt from %s (%s), username \'%s\', password not accepted!', $this->authInfo['REMOTE_ADDR'], $this->authInfo['REMOTE_HOST'], $this->login['uname']), 'core', GeneralUtility::SYSLOG_SEVERITY_WARNING);
                 }
                 if ($this->writeDevLog) {
-                    GeneralUtility::devLog('Password not accepted: ' . $this->login['uident'], AuthenticationService::class, 2);
+                    GeneralUtility::devLog('Password not accepted: ' . $this->login['uident'], self::class, 2);
                 }
             }
             // Checking the domain (lockToDomain)
@@ -179,7 +179,7 @@ class AuthenticationService extends AbstractAuthenticationService
                 }
             } else {
                 if ($this->writeDevLog) {
-                    GeneralUtility::devLog('No usergroups found.', AuthenticationService::class, 2);
+                    GeneralUtility::devLog('No usergroups found.', self::class, 2);
                 }
             }
         }
index dcaac9d..fa51437 100644 (file)
@@ -243,7 +243,7 @@ class ActionTask implements \TYPO3\CMS\Taskcenter\TaskInterface
                     ) . $editActionLink,
                 'link' => $this->moduleUrl
                     . '&SET[function]=sys_action.'
-                    . ActionTask::class
+                    . self::class
                     . '&show='
                     . (int)$actionRow['uid']
             ];
index 7297096..84a3b31 100644 (file)
@@ -683,8 +683,8 @@ page.10.value = HELLO WORLD!
      */
     protected function getHookObjectForAction($action)
     {
-        if (!empty($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS'][TypoScriptTemplateModuleController::class][$action])) {
-            return $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS'][TypoScriptTemplateModuleController::class][$action];
+        if (!empty($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS'][self::class][$action])) {
+            return $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS'][self::class][$action];
         }
         return null;
     }
index 32589a3..efb6364 100644 (file)
@@ -132,7 +132,7 @@ class PreviewController extends AbstractController
         // @todo - handle new pages here
         // branchpoints are not handled anymore because this feature is not supposed anymore
         if (WorkspaceService::isNewPage($this->pageId)) {
-            $wsNewPageUri = $uriBuilder->uriFor('newPage', [], PreviewController::class, 'workspaces', 'web_workspacesworkspaces');
+            $wsNewPageUri = $uriBuilder->uriFor('newPage', [], self::class, 'workspaces', 'web_workspacesworkspaces');
             $wsNewPageParams = '&tx_workspaces_web_workspacesworkspaces[controller]=Preview';
             $liveUrl = $wsSettingsPath . $wsNewPageUri . $wsNewPageParams . '&ADMCMD_prev=IGNORE';
         } else {
index 91aab21..f156edc 100644 (file)
@@ -74,7 +74,7 @@ class StageRecord extends AbstractRecord
         if (empty($record)) {
             $record = static::fetch('sys_workspace_stage', $uid);
         }
-        return new StageRecord($workspace, $record);
+        return new self($workspace, $record);
     }
 
     /**
@@ -196,7 +196,7 @@ class StageRecord extends AbstractRecord
      */
     public function isEditStage()
     {
-        return ($this->getUid() === StagesService::STAGE_EDIT_ID);
+        return $this->getUid() === StagesService::STAGE_EDIT_ID;
     }
 
     /**
@@ -204,7 +204,7 @@ class StageRecord extends AbstractRecord
      */
     public function isPublishStage()
     {
-        return ($this->getUid() === StagesService::STAGE_PUBLISH_ID);
+        return $this->getUid() === StagesService::STAGE_PUBLISH_ID;
     }
 
     /**
@@ -212,7 +212,7 @@ class StageRecord extends AbstractRecord
      */
     public function isExecuteStage()
     {
-        return ($this->getUid() === StagesService::STAGE_PUBLISH_EXECUTE_ID);
+        return $this->getUid() === StagesService::STAGE_PUBLISH_EXECUTE_ID;
     }
 
     /**
@@ -220,7 +220,7 @@ class StageRecord extends AbstractRecord
      */
     public function isDialogEnabled()
     {
-        return (((int)$this->record['allow_notificaton_settings'] & 1) > 0);
+        return ((int)$this->record['allow_notificaton_settings'] & 1) > 0;
     }
 
     /**
@@ -228,7 +228,7 @@ class StageRecord extends AbstractRecord
      */
     public function isPreselectionChangeable()
     {
-        return (((int)$this->record['allow_notificaton_settings'] & 2) > 0);
+        return ((int)$this->record['allow_notificaton_settings'] & 2) > 0;
     }
 
     /**
@@ -236,7 +236,7 @@ class StageRecord extends AbstractRecord
      */
     public function areOwnersPreselected()
     {
-        return (((int)$this->record['notification_preselection'] & 1) > 0);
+        return ((int)$this->record['notification_preselection'] & 1) > 0;
     }
 
     /**
@@ -244,7 +244,7 @@ class StageRecord extends AbstractRecord
      */
     public function areMembersPreselected()
     {
-        return (((int)$this->record['notification_preselection'] & 2) > 0);
+        return ((int)$this->record['notification_preselection'] & 2) > 0;
     }
 
     /**
@@ -252,7 +252,7 @@ class StageRecord extends AbstractRecord
      */
     public function areEditorsPreselected()
     {
-        return (((int)$this->record['notification_preselection'] & 4) > 0);
+        return ((int)$this->record['notification_preselection'] & 4) > 0;
     }
 
     /**
@@ -260,7 +260,7 @@ class StageRecord extends AbstractRecord
      */
     public function areResponsiblePersonsPreselected()
     {
-        return (((int)$this->record['notification_preselection'] & 8) > 0);
+        return ((int)$this->record['notification_preselection'] & 8) > 0;
     }
 
     /**
@@ -268,12 +268,12 @@ class StageRecord extends AbstractRecord
      */
     public function hasPreselection()
     {
-        return (
+        return
             $this->areOwnersPreselected()
             || $this->areMembersPreselected()
             || $this->areEditorsPreselected()
             || $this->areResponsiblePersonsPreselected()
-        );
+        ;
     }
 
     /**
@@ -356,10 +356,10 @@ class StageRecord extends AbstractRecord
      */
     public function isAllowed()
     {
-        return (
+        return
             $this->isEditStage()
             || static::getBackendUser()->workspaceCheckStageForCurrent($this->getUid())
             || $this->isExecuteStage() && static::getBackendUser()->workspacePublishAccess($this->workspace->getUid())
-        );
+        ;
     }
 }
index 8e09e5a..3b8c90c 100644 (file)
@@ -458,10 +458,10 @@ class GridDataService
      */
     protected function isSortable(array $a, array $b)
     {
-        return (
+        return
             $a[self::GridColumn_CollectionLevel] === 0 && $b[self::GridColumn_CollectionLevel] === 0
             || $a[self::GridColumn_CollectionParent] === $b[self::GridColumn_CollectionParent]
-        );
+        ;
     }
 
     /**
index d04d5e3..f5be569 100644 (file)
@@ -228,7 +228,9 @@ class StagesService implements \TYPO3\CMS\Core\SingletonInterface
             }
         }
 
-        uasort($allowedStages, function (StageRecord $first, StageRecord $second) { return $first->determineOrder($second); });
+        uasort($allowedStages, function (StageRecord $first, StageRecord $second) {
+            return $first->determineOrder($second);
+        });
         return $this->prepareStagesArray($allowedStages);
     }