From d11b4dad99afabd8d2e684c575d4c7bed1879258 Mon Sep 17 00:00:00 2001 From: Oliver Wand <wand@itaw.de> Date: Sat, 9 Sep 2023 16:19:06 +0200 Subject: [PATCH] [BUGFIX] Fix deprecation rule in cs fixer tests When performing `Build/Scripts/runTests.sh -s cglGit` with latest cs fixer version a rule dependency error is thrown. This patch exchanges the deprecation with the current recommended rule. Used command(s): > composer require --dev \ "friendsofphp/php-cs-fixer":"^3.26.1" > Build/Scripts/runTests.sh -s cgl Resolves: #101888 Releases: main, 11.5, 12.4 Change-Id: Ie139ef841c92461e116732923991c6474e888a5e Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/80936 Tested-by: Anja Leichsenring <aleichsenring@ab-softlab.de> Tested-by: core-ci <typo3@b13.com> Reviewed-by: Anja Leichsenring <aleichsenring@ab-softlab.de> --- Build/php-cs-fixer/config.php | 2 +- composer.json | 2 +- composer.lock | 17 ++++++++--------- .../backend/Classes/Attribute/Controller.php | 2 +- .../ElementInformationController.php | 2 +- .../Classes/Controller/LiveSearchController.php | 2 +- .../Classes/Controller/LoginController.php | 2 +- .../Classes/Form/InlineStackProcessor.php | 2 +- .../Classes/RecordList/DatabaseRecordList.php | 4 ++-- .../SiteConfiguration/site_language.php | 2 +- .../Controller/Page/TreeControllerTest.php | 8 ++++---- .../Controller/ResetPasswordControllerTest.php | 2 +- .../Tests/Unit/Utility/BackendUtilityTest.php | 2 +- .../AbstractUserAuthentication.php | 6 +++--- .../Classes/Authentication/Mfa/MfaViewType.php | 4 ++-- .../core/Classes/DataHandling/DataHandler.php | 12 ++++++------ .../Localization/DataMapProcessor.php | 2 +- .../Query/Expression/CompositeExpression.php | 6 +++--- .../core/Classes/Database/RelationHandler.php | 2 +- .../ServiceProviderCompilationPass.php | 2 +- typo3/sysext/core/Classes/Html/SimpleParser.php | 16 ++++++++-------- .../core/Classes/Imaging/ImageDimension.php | 2 +- .../LegacyLinkNotationConverter.php | 2 +- .../core/Classes/Localization/DateFormatter.php | 2 +- .../Routing/Aspect/PersistedPatternMapper.php | 2 +- .../ContentSecurityPolicy/PolicyProvider.php | 2 +- .../IncludeTree/TreeFromLineStreamBuilder.php | 6 +++--- .../Utility/ExtensionManagementUtility.php | 2 +- .../core/Classes/Utility/StringUtility.php | 8 ++++---- typo3/sysext/core/Configuration/TCA/pages.php | 2 +- .../Configuration/TCA/sys_file_metadata.php | 2 +- .../Acceptance/Application/Impexp/UsersCest.php | 4 ++-- .../Resource/StorageRepositoryTest.php | 2 +- .../Functional/Utility/RootlineUtilityTest.php | 2 +- .../BackendUserAuthenticationTest.php | 4 ++-- .../Authentication/Mfa/Provider/TotpTest.php | 4 ++-- .../PasswordHashing/Pbkdf2PasswordHashTest.php | 2 +- .../ConsoleCommandPassTest.php | 2 +- .../Unit/Session/UserSessionManagerTest.php | 6 +++--- .../Tests/Unit/Utility/GeneralUtilityTest.php | 2 +- .../Classes/Annotation/IgnoreValidation.php | 2 +- .../extbase/Classes/Annotation/Validate.php | 2 +- .../Generic/Storage/Typo3DbBackend.php | 2 +- .../Classes/Routing/ExtbasePluginEnhancer.php | 4 ++-- .../TCA/tx_blogexample_domain_model_blog.php | 2 +- .../TCA/tx_blogexample_domain_model_post.php | 2 +- .../Tests/Functional/Persistence/CountTest.php | 4 ++-- .../Unit/Mvc/Web/Routing/UriBuilderTest.php | 2 +- .../Classes/ViewHelpers/FormViewHelper.php | 2 +- .../Format/CurrencyViewHelperTest.php | 2 +- .../Mvc/Validation/FileSizeValidatorTest.php | 2 +- .../Persistence/FormPersistenceManagerTest.php | 10 +++++----- .../ContentObject/ContentObjectRenderer.php | 2 +- .../Classes/DataProcessing/GalleryProcessor.php | 4 ++-- .../Middleware/PageArgumentValidator.php | 2 +- .../FrontendGenerationPageIndexingTrigger.php | 2 +- .../Classes/FolderStructure/DefaultFactory.php | 2 +- .../ExtensionScanner/Php/ClassNameMatcher.php | 2 +- .../UpgradeAnalysis/DocumentationFileTest.php | 4 ++-- .../L18nDiffsourceToJsonMigrationTest.php | 6 +++--- .../Classes/Command/MissingRelationsCommand.php | 2 +- .../CleanUpLocalProcessedFilesService.php | 2 +- .../Classes/Repository/ReactionRepository.php | 2 +- .../Classes/Service/GridDataService.php | 2 +- 64 files changed, 112 insertions(+), 113 deletions(-) diff --git a/Build/php-cs-fixer/config.php b/Build/php-cs-fixer/config.php index 87cb160403eb..241f74c2bac7 100644 --- a/Build/php-cs-fixer/config.php +++ b/Build/php-cs-fixer/config.php @@ -57,7 +57,7 @@ return (new \PhpCsFixer\Config()) 'declare_parentheses' => true, 'dir_constant' => true, 'function_to_constant' => ['functions' => ['get_called_class', 'get_class', 'get_class_this', 'php_sapi_name', 'phpversion', 'pi']], - 'function_typehint_space' => true, + 'type_declaration_spaces' => true, 'global_namespace_import' => ['import_classes' => false, 'import_constants' => false, 'import_functions' => false], 'list_syntax' => ['syntax' => 'short'], 'modernize_strpos' => true, diff --git a/composer.json b/composer.json index f4817e8199fc..d80da272a770 100644 --- a/composer.json +++ b/composer.json @@ -109,7 +109,7 @@ "codeception/module-filesystem": "^3.0.0", "codeception/module-webdriver": "^4.0.0", "composer/composer": "^2.5.5", - "friendsofphp/php-cs-fixer": "^3.16.0", + "friendsofphp/php-cs-fixer": "^3.26.1", "friendsoftypo3/phpstan-typo3": "^0.9.0", "php-webdriver/webdriver": "^1.14.0", "phpstan/phpstan": "^1.10.32", diff --git a/composer.lock b/composer.lock index 6e147b9b0b11..7be6ea35f3ca 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "89b0c5aa2dff022c787e32d5371363e5", + "content-hash": "e52fd4005a288e97210463682015f7fd", "packages": [ { "name": "bacon/bacon-qr-code", @@ -6083,23 +6083,21 @@ }, { "name": "friendsofphp/php-cs-fixer", - "version": "v3.16.0", + "version": "v3.26.1", "source": { "type": "git", "url": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git", - "reference": "d40f9436e1c448d309fa995ab9c14c5c7a96f2dc" + "reference": "d023ba6684055f6ea1da1352d8a02baca0426983" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/d40f9436e1c448d309fa995ab9c14c5c7a96f2dc", - "reference": "d40f9436e1c448d309fa995ab9c14c5c7a96f2dc", + "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/d023ba6684055f6ea1da1352d8a02baca0426983", + "reference": "d023ba6684055f6ea1da1352d8a02baca0426983", "shasum": "" }, "require": { "composer/semver": "^3.3", "composer/xdebug-handler": "^3.0.3", - "doctrine/annotations": "^2", - "doctrine/lexer": "^2 || ^3", "ext-json": "*", "ext-tokenizer": "*", "php": "^7.4 || ^8.0", @@ -6116,6 +6114,7 @@ "symfony/stopwatch": "^5.4 || ^6.0" }, "require-dev": { + "facile-it/paraunit": "^1.3 || ^2.0", "justinrainbow/json-schema": "^5.2", "keradus/cli-executor": "^2.0", "mikey179/vfsstream": "^1.6.11", @@ -6167,7 +6166,7 @@ ], "support": { "issues": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues", - "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.16.0" + "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.26.1" }, "funding": [ { @@ -6175,7 +6174,7 @@ "type": "github" } ], - "time": "2023-04-02T19:30:06+00:00" + "time": "2023-09-08T19:09:07+00:00" }, { "name": "friendsoftypo3/phpstan-typo3", diff --git a/typo3/sysext/backend/Classes/Attribute/Controller.php b/typo3/sysext/backend/Classes/Attribute/Controller.php index 8deed45cb2a7..bd08983a5d8f 100644 --- a/typo3/sysext/backend/Classes/Attribute/Controller.php +++ b/typo3/sysext/backend/Classes/Attribute/Controller.php @@ -23,7 +23,7 @@ namespace TYPO3\CMS\Backend\Attribute; #[\Attribute(\Attribute::TARGET_CLASS)] class Controller { - public const TAG_NAME='backend.controller'; + public const TAG_NAME = 'backend.controller'; public function __construct() { diff --git a/typo3/sysext/backend/Classes/Controller/ContentElement/ElementInformationController.php b/typo3/sysext/backend/Classes/Controller/ContentElement/ElementInformationController.php index 775fae8d716e..e4e6e88938d9 100644 --- a/typo3/sysext/backend/Classes/Controller/ContentElement/ElementInformationController.php +++ b/typo3/sysext/backend/Classes/Controller/ContentElement/ElementInformationController.php @@ -196,7 +196,7 @@ class ElementInformationController // Check if there is a FileRenderer if ($fileRenderer !== null) { $preview['fileRenderer'] = $fileRenderer->render($this->fileObject, $width, $height); - // else check if we can create an Image preview + // else check if we can create an Image preview } elseif ($this->fileObject->isImage()) { $preview['fileObject'] = $this->fileObject; $preview['width'] = $width; diff --git a/typo3/sysext/backend/Classes/Controller/LiveSearchController.php b/typo3/sysext/backend/Classes/Controller/LiveSearchController.php index 69daf4b3ffc1..accdef4d114b 100644 --- a/typo3/sysext/backend/Classes/Controller/LiveSearchController.php +++ b/typo3/sysext/backend/Classes/Controller/LiveSearchController.php @@ -58,7 +58,7 @@ class LiveSearchController 'currentPage' => $pagination->getPaginator()->getCurrentPageNumber(), 'firstPage' => $pagination->getFirstPageNumber(), 'lastPage' => $pagination->getLastPageNumber(), - 'allPageNumbers'=> $pagination->getAllPageNumbers(), + 'allPageNumbers' => $pagination->getAllPageNumbers(), 'previousPageNumber' => $pagination->getPreviousPageNumber(), 'nextPageNumber' => $pagination->getNextPageNumber(), 'hasMorePages' => $pagination->getHasMorePages(), diff --git a/typo3/sysext/backend/Classes/Controller/LoginController.php b/typo3/sysext/backend/Classes/Controller/LoginController.php index 53d59e0445c0..321e532ac4bb 100644 --- a/typo3/sysext/backend/Classes/Controller/LoginController.php +++ b/typo3/sysext/backend/Classes/Controller/LoginController.php @@ -393,7 +393,7 @@ class LoginController if ($this->loginRefresh) { $formProtection->setSessionTokenFromRegistry(); $formProtection->persistSessionToken(); - // triggering `TYPO3/CMS/Backend/LoginRefresh` module happens in `TYPO3/CMS/Backend/Login` + // triggering `TYPO3/CMS/Backend/LoginRefresh` module happens in `TYPO3/CMS/Backend/Login` } else { $formProtection->storeSessionTokenInRegistry(); $this->redirectToUrl(); diff --git a/typo3/sysext/backend/Classes/Form/InlineStackProcessor.php b/typo3/sysext/backend/Classes/Form/InlineStackProcessor.php index 1596a20c1a86..604791577b86 100644 --- a/typo3/sysext/backend/Classes/Form/InlineStackProcessor.php +++ b/typo3/sysext/backend/Classes/Form/InlineStackProcessor.php @@ -280,7 +280,7 @@ class InlineStackProcessor $parts[] = implode('][', $levelData['flexform']); } $name = '[' . implode('][', $parts) . ']'; - // Use in object id attributes: + // Use in object id attributes: } else { $name = implode('-', $parts); diff --git a/typo3/sysext/backend/Classes/RecordList/DatabaseRecordList.php b/typo3/sysext/backend/Classes/RecordList/DatabaseRecordList.php index ec117254a0f4..0d83a8ff65b7 100644 --- a/typo3/sysext/backend/Classes/RecordList/DatabaseRecordList.php +++ b/typo3/sysext/backend/Classes/RecordList/DatabaseRecordList.php @@ -1311,7 +1311,7 @@ class DatabaseRecordList 'currentUrl' => $this->listURL('', $table, 'pointer'), 'currentPage' => $currentPage, 'totalPages' => $totalPages, - 'firstElement' => ((($currentPage -1) * $itemsPerPage) + 1), + 'firstElement' => ((($currentPage - 1) * $itemsPerPage) + 1), 'lastElement' => $lastElementNumber, 'colspan' => $paginationColumns, ]) @@ -1501,7 +1501,7 @@ class DatabaseRecordList $params = [ 'edit' => [ $table => [ - (0-(($row['_MOVE_PLH'] ?? 0) ? $row['_MOVE_PLH_uid'] : $row['uid'])) => 'new', + (0 - (($row['_MOVE_PLH'] ?? 0) ? $row['_MOVE_PLH_uid'] : $row['uid'])) => 'new', ], ], 'returnUrl' => $this->listURL(), diff --git a/typo3/sysext/backend/Configuration/SiteConfiguration/site_language.php b/typo3/sysext/backend/Configuration/SiteConfiguration/site_language.php index 31e147327460..6299cd202658 100644 --- a/typo3/sysext/backend/Configuration/SiteConfiguration/site_language.php +++ b/typo3/sysext/backend/Configuration/SiteConfiguration/site_language.php @@ -70,7 +70,7 @@ return [ 'placeholder' => 'en-US', 'valuePicker' => [ 'mode' => '', - 'items' =>\TYPO3\CMS\Backend\Configuration\TCA\UserFunctions::getAllSystemLocales(), + 'items' => \TYPO3\CMS\Backend\Configuration\TCA\UserFunctions::getAllSystemLocales(), ], ], ], diff --git a/typo3/sysext/backend/Tests/Functional/Controller/Page/TreeControllerTest.php b/typo3/sysext/backend/Tests/Functional/Controller/Page/TreeControllerTest.php index 0fa746ca51b8..80958ab21a59 100644 --- a/typo3/sysext/backend/Tests/Functional/Controller/Page/TreeControllerTest.php +++ b/typo3/sysext/backend/Tests/Functional/Controller/Page/TreeControllerTest.php @@ -327,7 +327,7 @@ final class TreeControllerTest extends FunctionalTestCase [ 'uid' => 0, 'title' => 'New TYPO3 site', - '_children' =>[ + '_children' => [ [ 'uid' => 1000, 'title' => 'ACME Inc', @@ -434,7 +434,7 @@ final class TreeControllerTest extends FunctionalTestCase [ 'uid' => 0, 'title' => 'New TYPO3 site', - '_children' =>[ + '_children' => [ [ 'uid' => 1210, 'title' => 'EN: Frontend Editing', @@ -468,7 +468,7 @@ final class TreeControllerTest extends FunctionalTestCase [ 'uid' => 0, 'title' => 'New TYPO3 site', - '_children' =>[ + '_children' => [ [ 'uid' => 1000, 'title' => 'ACME Inc', @@ -652,7 +652,7 @@ final class TreeControllerTest extends FunctionalTestCase [ 'uid' => 0, 'title' => 'New TYPO3 site', - '_children' =>[ + '_children' => [ [ 'uid' => 1000, 'title' => 'ACME Inc', diff --git a/typo3/sysext/backend/Tests/Functional/Controller/ResetPasswordControllerTest.php b/typo3/sysext/backend/Tests/Functional/Controller/ResetPasswordControllerTest.php index ad36edd9cfb7..81dc893cafa4 100644 --- a/typo3/sysext/backend/Tests/Functional/Controller/ResetPasswordControllerTest.php +++ b/typo3/sysext/backend/Tests/Functional/Controller/ResetPasswordControllerTest.php @@ -148,7 +148,7 @@ final class ResetPasswordControllerTest extends FunctionalTestCase */ public function initiatePasswordResetValidatesGivenEmailAddress(): void { - $request = $this->request->withParsedBody(['email' =>'email..email@example.com']); + $request = $this->request->withParsedBody(['email' => 'email..email@example.com']); $GLOBALS['TYPO3_REQUEST'] = $request; self::assertStringContainsString( 'The entered email address is invalid. Please try again.', diff --git a/typo3/sysext/backend/Tests/Unit/Utility/BackendUtilityTest.php b/typo3/sysext/backend/Tests/Unit/Utility/BackendUtilityTest.php index 0fa33f482773..ca2f4f23a399 100644 --- a/typo3/sysext/backend/Tests/Unit/Utility/BackendUtilityTest.php +++ b/typo3/sysext/backend/Tests/Unit/Utility/BackendUtilityTest.php @@ -1289,7 +1289,7 @@ final class BackendUtilityTest extends UnitTestCase { $GLOBALS['BE_USER'] = new BackendUserAuthentication(); $GLOBALS['TCA']['myTable'] = [ - 'ctrl'=> [ + 'ctrl' => [ 'tstamp' => 'updatedon', // Won't be added due to defined in "columns" 'crdate' => 'createdon', diff --git a/typo3/sysext/core/Classes/Authentication/AbstractUserAuthentication.php b/typo3/sysext/core/Classes/Authentication/AbstractUserAuthentication.php index 9d99df6c7b2d..8cb82e4ab33f 100644 --- a/typo3/sysext/core/Classes/Authentication/AbstractUserAuthentication.php +++ b/typo3/sysext/core/Classes/Authentication/AbstractUserAuthentication.php @@ -540,7 +540,7 @@ abstract class AbstractUserAuthentication implements LoggerAwareInterface if ($ret < 100) { $authenticated = true; } - // $ret is between 100 and 199 which means "I'm not responsible, ask others" + // $ret is between 100 and 199 which means "I'm not responsible, ask others" } else { // $ret is < 0 $authenticated = false; @@ -553,8 +553,8 @@ abstract class AbstractUserAuthentication implements LoggerAwareInterface break; } } - // mimic user authentication to mitigate observable timing discrepancies - // @link https://cwe.mitre.org/data/definitions/208.html + // mimic user authentication to mitigate observable timing discrepancies + // @link https://cwe.mitre.org/data/definitions/208.html } elseif ($activeLogin) { $subType = 'authUser' . $this->loginType; foreach ($this->getAuthServices($subType, $loginData, $authenticatedUserFromSession, $request) as $serviceObj) { diff --git a/typo3/sysext/core/Classes/Authentication/Mfa/MfaViewType.php b/typo3/sysext/core/Classes/Authentication/Mfa/MfaViewType.php index dc708b26fde6..45d020559b31 100644 --- a/typo3/sysext/core/Classes/Authentication/Mfa/MfaViewType.php +++ b/typo3/sysext/core/Classes/Authentication/Mfa/MfaViewType.php @@ -25,6 +25,6 @@ use TYPO3\CMS\Core\Type\Enumeration; class MfaViewType extends Enumeration { public const SETUP = 'setup'; - public const EDIT ='edit'; - public const AUTH ='auth'; + public const EDIT = 'edit'; + public const AUTH = 'auth'; } diff --git a/typo3/sysext/core/Classes/DataHandling/DataHandler.php b/typo3/sysext/core/Classes/DataHandling/DataHandler.php index 4008f4724545..da1d3ccb14db 100644 --- a/typo3/sysext/core/Classes/DataHandling/DataHandler.php +++ b/typo3/sysext/core/Classes/DataHandling/DataHandler.php @@ -4235,7 +4235,7 @@ class DataHandler implements LoggerAwareInterface } else { if (!MathUtility::canBeInterpretedAsInteger($realDestPid)) { $newId = $this->copyRecord($v['table'], $v['id'], -(int)($v['id'])); - // If the destination page id is a NEW string, keep it on the same page + // If the destination page id is a NEW string, keep it on the same page } elseif ($this->BE_USER->workspace > 0 && BackendUtility::isTableWorkspaceEnabled($v['table'])) { // A filled $workspaceOptions indicated that this call // has it's origin in previous versionizeRecord() processing @@ -4249,7 +4249,7 @@ class DataHandler implements LoggerAwareInterface $workspaceOptions['label'] ?? 'Auto-created for WS #' . $this->BE_USER->workspace, $workspaceOptions['delete'] ?? false ); - // Otherwise just use plain copyRecord() to create placeholders etc. + // Otherwise just use plain copyRecord() to create placeholders etc. } else { // If a record has been copied already during this request, // prevent superfluous duplication and use the existing copy @@ -8528,15 +8528,15 @@ class DataHandler implements LoggerAwareInterface default: $result = (string)$submittedValue === (string)$storedValue; } - // Null values are allowed, but currently there's a real (not NULL) value. - // Thus, ensure no NULL value was submitted and fallback to the regular behaviour. + // Null values are allowed, but currently there's a real (not NULL) value. + // Thus, ensure no NULL value was submitted and fallback to the regular behaviour. } elseif ($storedValue !== null) { $result = ( $submittedValue !== null && $this->isSubmittedValueEqualToStoredValue($submittedValue, $storedValue, $storedType, false) ); - // Null values are allowed, and currently there's a NULL value. - // Thus, check whether a NULL value was submitted. + // Null values are allowed, and currently there's a NULL value. + // Thus, check whether a NULL value was submitted. } else { $result = ($submittedValue === null); } diff --git a/typo3/sysext/core/Classes/DataHandling/Localization/DataMapProcessor.php b/typo3/sysext/core/Classes/DataHandling/Localization/DataMapProcessor.php index cce37df8cdd5..0b275df5730c 100644 --- a/typo3/sysext/core/Classes/DataHandling/Localization/DataMapProcessor.php +++ b/typo3/sysext/core/Classes/DataHandling/Localization/DataMapProcessor.php @@ -1026,7 +1026,7 @@ class DataMapProcessor // implicit: use origin pointer if table cannot be translated if (!$isTranslatable) { $ancestorId = (int)$dependentElement[$fieldNames['origin']]; - // only consider element if it reflects the desired language + // only consider element if it reflects the desired language } elseif ((int)$dependentElement[$fieldNames['language']] === $desiredLanguage) { $ancestorId = $this->resolveAncestorId($fieldNames, $dependentElement); } else { diff --git a/typo3/sysext/core/Classes/Database/Query/Expression/CompositeExpression.php b/typo3/sysext/core/Classes/Database/Query/Expression/CompositeExpression.php index b91d32e3e561..c55ec89ea50e 100644 --- a/typo3/sysext/core/Classes/Database/Query/Expression/CompositeExpression.php +++ b/typo3/sysext/core/Classes/Database/Query/Expression/CompositeExpression.php @@ -125,7 +125,7 @@ class CompositeExpression extends \Doctrine\DBAL\Query\Expression\CompositeExpre * @param self|string|null $part * @param self|string|null ...$parts */ - public static function and($part=null, ...$parts): self + public static function and($part = null, ...$parts): self { $mergedParts = array_merge([$part], $parts); array_filter($mergedParts, static fn ($value) => !is_null($value)); @@ -136,7 +136,7 @@ class CompositeExpression extends \Doctrine\DBAL\Query\Expression\CompositeExpre * @param self|string|null $part * @param self|string|null ...$parts */ - public static function or($part=null, ...$parts): self + public static function or($part = null, ...$parts): self { $mergedParts = array_merge([$part], $parts); array_filter($mergedParts, static fn ($value) => !is_null($value)); @@ -149,7 +149,7 @@ class CompositeExpression extends \Doctrine\DBAL\Query\Expression\CompositeExpre * @param self|string|null $part * @param self|string|null ...$parts */ - public function with($part=null, ...$parts): self + public function with($part = null, ...$parts): self { $mergedParts = array_merge([$part], $parts); $that = clone $this; diff --git a/typo3/sysext/core/Classes/Database/RelationHandler.php b/typo3/sysext/core/Classes/Database/RelationHandler.php index 3923835a540c..7a3e13a6a9e4 100644 --- a/typo3/sysext/core/Classes/Database/RelationHandler.php +++ b/typo3/sysext/core/Classes/Database/RelationHandler.php @@ -1322,7 +1322,7 @@ class RelationHandler } $purgedItemIds = []; - $callable =[$this, $purgeCallback]; + $callable = [$this, $purgeCallback]; if (is_callable($callable)) { $purgedItemIds = $callable($itemTableName, $itemIds); } diff --git a/typo3/sysext/core/Classes/DependencyInjection/ServiceProviderCompilationPass.php b/typo3/sysext/core/Classes/DependencyInjection/ServiceProviderCompilationPass.php index f69b4b405d16..0c40cbbc9309 100644 --- a/typo3/sysext/core/Classes/DependencyInjection/ServiceProviderCompilationPass.php +++ b/typo3/sysext/core/Classes/DependencyInjection/ServiceProviderCompilationPass.php @@ -236,7 +236,7 @@ class ServiceProviderCompilationPass implements CompilerPassInterface } return [ $serviceName . '_decorated_' . $counter, - $counter === 1 ? $serviceName : $serviceName . '_decorated_' . ($counter-1), + $counter === 1 ? $serviceName : $serviceName . '_decorated_' . ($counter - 1), ]; } } diff --git a/typo3/sysext/core/Classes/Html/SimpleParser.php b/typo3/sysext/core/Classes/Html/SimpleParser.php index 7c9528cfa211..b2bab6b1d950 100644 --- a/typo3/sysext/core/Classes/Html/SimpleParser.php +++ b/typo3/sysext/core/Classes/Html/SimpleParser.php @@ -128,53 +128,53 @@ class SimpleParser $this->next(SimpleNode::TYPE_CDATA); $this->append('<![CDATA['); $skip = 8; - // comment start + // comment start } elseif ($character === '<' && $this->isType(SimpleNode::TYPE_TEXT) && substr($string, $i, 4) === '<!--' ) { $this->next(SimpleNode::TYPE_COMMENT); $this->append('<!--'); $skip = 3; - // element start + // element start } elseif ($character === '<' && $this->isType(SimpleNode::TYPE_TEXT) && preg_match('#^</?[a-z]#i', substr($string, $i, 3)) ) { $this->next(SimpleNode::TYPE_ELEMENT); $this->append($character); - // CDATA end + // CDATA end } elseif ($character === ']' && $this->isType(SimpleNode::TYPE_CDATA) && substr($string, $i, 3) === ']]>' ) { $this->append(']]>'); $this->next(SimpleNode::TYPE_TEXT); $skip = 2; - // comment end + // comment end } elseif ($character === '-' && $this->isType(SimpleNode::TYPE_COMMENT) && substr($string, $i, 3) === '-->' ) { $this->append('-->'); $this->next(SimpleNode::TYPE_TEXT); $skip = 2; - // element end + // element end } elseif ($character === '>' && $this->isType(SimpleNode::TYPE_ELEMENT) && !$this->inAttribute() ) { $this->append($character); $this->next(SimpleNode::TYPE_TEXT); - // element attribute start + // element attribute start } elseif (($character === '"' || $character === "'") && $this->isType(SimpleNode::TYPE_ELEMENT) && !$this->inAttribute() ) { $this->attribute = $character; $this->append($character); - // element attribute end + // element attribute end } elseif (($character === '"' || $character === "'") && $this->isType(SimpleNode::TYPE_ELEMENT) && $this->attribute === $character ) { $this->append($character); $this->attribute = null; - // anything else (put to current type) + // anything else (put to current type) } else { $this->append($character); } diff --git a/typo3/sysext/core/Classes/Imaging/ImageDimension.php b/typo3/sysext/core/Classes/Imaging/ImageDimension.php index ea39a7e28305..8bd1e46412d9 100644 --- a/typo3/sysext/core/Classes/Imaging/ImageDimension.php +++ b/typo3/sysext/core/Classes/Imaging/ImageDimension.php @@ -72,7 +72,7 @@ class ImageDimension (int)$processedFile->getOriginalFile()->getProperty('height') ); } - if ($imageDimension->width <=0 || $imageDimension->height <=0) { + if ($imageDimension->width <= 0 || $imageDimension->height <= 0) { throw new \BadMethodCallException('Width and height of the image must be greater than zero', 1597310560); } $result = GeneralUtility::makeInstance(GraphicalFunctions::class)->getImageScale( diff --git a/typo3/sysext/core/Classes/LinkHandling/LegacyLinkNotationConverter.php b/typo3/sysext/core/Classes/LinkHandling/LegacyLinkNotationConverter.php index 9ac39b3bca5d..889b484a297c 100644 --- a/typo3/sysext/core/Classes/LinkHandling/LegacyLinkNotationConverter.php +++ b/typo3/sysext/core/Classes/LinkHandling/LegacyLinkNotationConverter.php @@ -145,7 +145,7 @@ class LegacyLinkNotationConverter if (!$isIdOrAlias && $isLocalFile !== 1 && $urlChar && (!$containsSlash || $urlChar < $fileChar)) { $result['type'] = LinkService::TYPE_URL; $result['url'] = UrlLinkHandler::getDefaultScheme() . '://' . $linkParameter; - // file (internal) or folder + // file (internal) or folder } elseif ($containsSlash || $isLocalFile) { $result = $this->getFileOrFolderObjectFromMixedIdentifier($linkParameter); } else { diff --git a/typo3/sysext/core/Classes/Localization/DateFormatter.php b/typo3/sysext/core/Classes/Localization/DateFormatter.php index be6fa5f72dd3..e651a3a38be6 100644 --- a/typo3/sysext/core/Classes/Localization/DateFormatter.php +++ b/typo3/sysext/core/Classes/Localization/DateFormatter.php @@ -153,7 +153,7 @@ class DateFormatter }, '%j' => function (\DateTimeInterface $timestamp, string $_): string { // Day number in year, 001 to 366 - return sprintf('%03d', (int)($timestamp->format('z'))+1); + return sprintf('%03d', (int)($timestamp->format('z')) + 1); }, '%u' => 'N', '%w' => 'w', diff --git a/typo3/sysext/core/Classes/Routing/Aspect/PersistedPatternMapper.php b/typo3/sysext/core/Classes/Routing/Aspect/PersistedPatternMapper.php index 040c2ac2d63f..054680cca570 100644 --- a/typo3/sysext/core/Classes/Routing/Aspect/PersistedPatternMapper.php +++ b/typo3/sysext/core/Classes/Routing/Aspect/PersistedPatternMapper.php @@ -285,7 +285,7 @@ class PersistedPatternMapper implements PersistedMappableAspectInterface, Static $queryBuilder->expr()->eq('uid', $idParameter), $queryBuilder->expr()->eq($this->languageParentFieldName, $idParameter) ); - // otherwise - basically uid is not in pattern - restrict to languages and apply fallbacks + // otherwise - basically uid is not in pattern - restrict to languages and apply fallbacks } elseif ($languageAware) { $languageIds = $this->resolveAllRelevantLanguageIds(); $constraints[] = $queryBuilder->expr()->in( diff --git a/typo3/sysext/core/Classes/Security/ContentSecurityPolicy/PolicyProvider.php b/typo3/sysext/core/Classes/Security/ContentSecurityPolicy/PolicyProvider.php index 11db971af5f5..7a613db74afc 100644 --- a/typo3/sysext/core/Classes/Security/ContentSecurityPolicy/PolicyProvider.php +++ b/typo3/sysext/core/Classes/Security/ContentSecurityPolicy/PolicyProvider.php @@ -135,7 +135,7 @@ final class PolicyProvider $siteLanguage = $siteLanguage instanceof SiteLanguage ? $siteLanguage : $site->getDefaultLanguage(); $uri = $siteLanguage->getBase(); $uri = $uri->withPath(rtrim($uri->getPath(), '/') . '/'); - // otherwise fall back to current request URI + // otherwise fall back to current request URI } else { $uri = new Uri($normalizedParams->getSitePath()); } diff --git a/typo3/sysext/core/Classes/TypoScript/IncludeTree/TreeFromLineStreamBuilder.php b/typo3/sysext/core/Classes/TypoScript/IncludeTree/TreeFromLineStreamBuilder.php index b0970e9ae7ba..257d9f011b5f 100644 --- a/typo3/sysext/core/Classes/TypoScript/IncludeTree/TreeFromLineStreamBuilder.php +++ b/typo3/sysext/core/Classes/TypoScript/IncludeTree/TreeFromLineStreamBuilder.php @@ -366,7 +366,7 @@ final class TreeFromLineStreamBuilder private function processIncludeTyposcript(IncludeInterface $node, Token $includeTyposcriptValueToken, LineInterface $importKeywordOldLine): void { $fullString = $includeTyposcriptValueToken->getValue(); - $potentialSourceArray = preg_split('#.*(source="[^"]*").*|>#', $fullString, -1, PREG_SPLIT_DELIM_CAPTURE|PREG_SPLIT_NO_EMPTY); + $potentialSourceArray = preg_split('#.*(source="[^"]*").*|>#', $fullString, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY); $source = ''; foreach ($potentialSourceArray as $candidate) { $candidate = trim($candidate); @@ -380,7 +380,7 @@ final class TreeFromLineStreamBuilder // No 'source="..."' return; } - $potentialConditionArray = preg_split('#.*(condition="(?:\\\\\\\\|\\\\"|[^\"])*").*|>#', $fullString, 2, PREG_SPLIT_DELIM_CAPTURE|PREG_SPLIT_NO_EMPTY); + $potentialConditionArray = preg_split('#.*(condition="(?:\\\\\\\\|\\\\"|[^\"])*").*|>#', $fullString, 2, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY); $condition = ''; foreach ($potentialConditionArray as $candidate) { $candidate = trim($candidate); @@ -394,7 +394,7 @@ final class TreeFromLineStreamBuilder break; } } - $potentialExtensionsArray = preg_split('#.*(extensions*="[^"]*").*|>#', $fullString, 2, PREG_SPLIT_DELIM_CAPTURE|PREG_SPLIT_NO_EMPTY); + $potentialExtensionsArray = preg_split('#.*(extensions*="[^"]*").*|>#', $fullString, 2, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY); $extensions = []; foreach ($potentialExtensionsArray as $candidate) { $candidate = trim($candidate); diff --git a/typo3/sysext/core/Classes/Utility/ExtensionManagementUtility.php b/typo3/sysext/core/Classes/Utility/ExtensionManagementUtility.php index ba27a20ad66a..662bea904a4f 100644 --- a/typo3/sysext/core/Classes/Utility/ExtensionManagementUtility.php +++ b/typo3/sysext/core/Classes/Utility/ExtensionManagementUtility.php @@ -543,7 +543,7 @@ class ExtensionManagementUtility $fileFieldTCAConfig = [ 'type' => 'file', 'allowed' => $allowedFileExtensions, - 'disallowed'=> $disallowedFileExtensions, + 'disallowed' => $disallowedFileExtensions, ]; ArrayUtility::mergeRecursiveWithOverrule($fileFieldTCAConfig, $customSettingOverride); return $fileFieldTCAConfig; diff --git a/typo3/sysext/core/Classes/Utility/StringUtility.php b/typo3/sysext/core/Classes/Utility/StringUtility.php index 78c2a591e78d..884805e20f27 100644 --- a/typo3/sysext/core/Classes/Utility/StringUtility.php +++ b/typo3/sysext/core/Classes/Utility/StringUtility.php @@ -138,22 +138,22 @@ class StringUtility switch ($pad_type) { case STR_PAD_RIGHT: - $string .= str_repeat($pad_string, (int)(($length - $len)/$pad_string_len)); + $string .= str_repeat($pad_string, (int)(($length - $len) / $pad_string_len)); $string .= mb_substr($pad_string, 0, ($length - $len) % $pad_string_len); return $string; case STR_PAD_LEFT: - $leftPad = str_repeat($pad_string, (int)(($length - $len)/$pad_string_len)); + $leftPad = str_repeat($pad_string, (int)(($length - $len) / $pad_string_len)); $leftPad .= mb_substr($pad_string, 0, ($length - $len) % $pad_string_len); return $leftPad . $string; case STR_PAD_BOTH: - $leftPadCount = (int)(($length - $len)/2); + $leftPadCount = (int)(($length - $len) / 2); $len += $leftPadCount; $padded = ((int)($leftPadCount / $pad_string_len)) * $pad_string_len; $leftPad = str_repeat($pad_string, (int)($leftPadCount / $pad_string_len)); $leftPad .= mb_substr($pad_string, 0, $leftPadCount - $padded); - $string = $leftPad . $string . str_repeat($pad_string, (int)(($length - $len)/$pad_string_len)); + $string = $leftPad . $string . str_repeat($pad_string, (int)(($length - $len) / $pad_string_len)); $string .= mb_substr($pad_string, 0, ($length - $len) % $pad_string_len); return $string; } diff --git a/typo3/sysext/core/Configuration/TCA/pages.php b/typo3/sysext/core/Configuration/TCA/pages.php index 54169b41f4de..deb7dbbeb865 100644 --- a/typo3/sysext/core/Configuration/TCA/pages.php +++ b/typo3/sysext/core/Configuration/TCA/pages.php @@ -278,7 +278,7 @@ return [ ], ], 'categories' => [ - 'config'=> [ + 'config' => [ 'type' => 'category', ], ], diff --git a/typo3/sysext/core/Configuration/TCA/sys_file_metadata.php b/typo3/sysext/core/Configuration/TCA/sys_file_metadata.php index cbf81c426c84..9e29bc103637 100644 --- a/typo3/sysext/core/Configuration/TCA/sys_file_metadata.php +++ b/typo3/sysext/core/Configuration/TCA/sys_file_metadata.php @@ -37,7 +37,7 @@ return [ ], ], 'categories' => [ - 'config'=> [ + 'config' => [ 'type' => 'category', ], ], diff --git a/typo3/sysext/core/Tests/Acceptance/Application/Impexp/UsersCest.php b/typo3/sysext/core/Tests/Acceptance/Application/Impexp/UsersCest.php index 7dec38929517..c9f575cccda3 100644 --- a/typo3/sysext/core/Tests/Acceptance/Application/Impexp/UsersCest.php +++ b/typo3/sysext/core/Tests/Acceptance/Application/Impexp/UsersCest.php @@ -193,7 +193,7 @@ final class UsersCest extends AbstractCest } $I->waitForElementVisible($this->inModuleHeader . ' [name=BackendUserModuleMenu]'); - $I->selectOption($this->inModuleHeader . ' [name=BackendUserModuleMenu]', ['text'=>'Backend user groups']); + $I->selectOption($this->inModuleHeader . ' [name=BackendUserModuleMenu]', ['text' => 'Backend user groups']); $I->waitForText('Backend user groups'); $I->click('//table/tbody/tr[descendant::a[@data-contextmenu-uid="' . $userGroupId . '"]]/td[2]/a'); $I->waitForElementVisible('#EditDocumentController'); @@ -224,7 +224,7 @@ final class UsersCest extends AbstractCest } $I->waitForElementVisible($this->inModuleHeader . ' [name=BackendUserModuleMenu]'); - $I->selectOption($this->inModuleHeader . ' [name=BackendUserModuleMenu]', ['text'=>'Backend users']); + $I->selectOption($this->inModuleHeader . ' [name=BackendUserModuleMenu]', ['text' => 'Backend users']); $I->waitForElement('#typo3-backend-user-list'); $I->click('//table[@id="typo3-backend-user-list"]/tbody/tr[descendant::a[@data-contextmenu-uid="' . $userId . '"]]//a[@title="Edit"]'); $I->waitForElement('#EditDocumentController'); diff --git a/typo3/sysext/core/Tests/Functional/Resource/StorageRepositoryTest.php b/typo3/sysext/core/Tests/Functional/Resource/StorageRepositoryTest.php index 90d8463ec97a..0e3586038fef 100644 --- a/typo3/sysext/core/Tests/Functional/Resource/StorageRepositoryTest.php +++ b/typo3/sysext/core/Tests/Functional/Resource/StorageRepositoryTest.php @@ -156,7 +156,7 @@ final class StorageRepositoryTest extends FunctionalTestCase $processingFolder = $subject->getProcessingFolder($file); self::assertInstanceOf(Folder::class, $processingFolder); self::assertNotEquals($rootProcessingFolder, $processingFolder); - for ($i = ResourceStorage::PROCESSING_FOLDER_LEVELS; $i>0; $i--) { + for ($i = ResourceStorage::PROCESSING_FOLDER_LEVELS; $i > 0; $i--) { $processingFolder = $processingFolder->getParentFolder(); } self::assertEquals($rootProcessingFolder, $processingFolder); diff --git a/typo3/sysext/core/Tests/Functional/Utility/RootlineUtilityTest.php b/typo3/sysext/core/Tests/Functional/Utility/RootlineUtilityTest.php index bfc08b0d5143..2b3d03167401 100644 --- a/typo3/sysext/core/Tests/Functional/Utility/RootlineUtilityTest.php +++ b/typo3/sysext/core/Tests/Functional/Utility/RootlineUtilityTest.php @@ -125,7 +125,7 @@ final class RootlineUtilityTest extends FunctionalTestCase 'uid' => 1330, 't3ver_oid' => 0, 't3ver_wsid' => 0, - 't3ver_state' =>0, + 't3ver_state' => 0, 'title' => 'EN: Board Games', ], 1 => [ diff --git a/typo3/sysext/core/Tests/Unit/Authentication/BackendUserAuthenticationTest.php b/typo3/sysext/core/Tests/Unit/Authentication/BackendUserAuthenticationTest.php index 17a12f8921f8..0da56ba8639c 100644 --- a/typo3/sysext/core/Tests/Unit/Authentication/BackendUserAuthenticationTest.php +++ b/typo3/sysext/core/Tests/Unit/Authentication/BackendUserAuthenticationTest.php @@ -229,7 +229,7 @@ final class BackendUserAuthenticationTest extends UnitTestCase 1, [ 'addFile' => 0, - 'recursivedeleteFolder' =>0, + 'recursivedeleteFolder' => 0, ], [ 'addFile' => 0, @@ -254,7 +254,7 @@ final class BackendUserAuthenticationTest extends UnitTestCase 0, [ 'addFile' => 0, - 'recursivedeleteFolder' =>0, + 'recursivedeleteFolder' => 0, ], [ 'addFile' => false, diff --git a/typo3/sysext/core/Tests/Unit/Authentication/Mfa/Provider/TotpTest.php b/typo3/sysext/core/Tests/Unit/Authentication/Mfa/Provider/TotpTest.php index e425ccda8a1c..2ba45b6c2624 100644 --- a/typo3/sysext/core/Tests/Unit/Authentication/Mfa/Provider/TotpTest.php +++ b/typo3/sysext/core/Tests/Unit/Authentication/Mfa/Provider/TotpTest.php @@ -174,13 +174,13 @@ final class TotpTest extends UnitTestCase public function generateEncodedSecretTest(): void { // Check 100 times WITHOUT additional auth factors - for ($i=0; $i<100; $i++) { + for ($i = 0; $i < 100; $i++) { // Assert correct length and secret only contains allowed alphabet self::assertMatchesRegularExpression('/^[ABCDEFGHIJKLMNOPQRSTUVWXYZ234567]{32}$/', Totp::generateEncodedSecret()); } // Check 100 times WITH additional auth factors - for ($i=0; $i<100; $i++) { + for ($i = 0; $i < 100; $i++) { $authFactors = ['uid' => 5, 'username' => 'non.admin']; // Assert correct length and secret only contains allowed alphabet self::assertMatchesRegularExpression('/^[ABCDEFGHIJKLMNOPQRSTUVWXYZ234567]{32}$/', Totp::generateEncodedSecret($authFactors)); diff --git a/typo3/sysext/core/Tests/Unit/Crypto/PasswordHashing/Pbkdf2PasswordHashTest.php b/typo3/sysext/core/Tests/Unit/Crypto/PasswordHashing/Pbkdf2PasswordHashTest.php index 6a63b85a7064..c56a46520f80 100644 --- a/typo3/sysext/core/Tests/Unit/Crypto/PasswordHashing/Pbkdf2PasswordHashTest.php +++ b/typo3/sysext/core/Tests/Unit/Crypto/PasswordHashing/Pbkdf2PasswordHashTest.php @@ -234,7 +234,7 @@ final class Pbkdf2PasswordHashTest extends UnitTestCase */ public function checkPasswordIsCompatibleWithPythonPasslibHashes(): void { - $passlibSaltedHash= '$pbkdf2-sha256$6400$.6UI/S.nXIk8jcbdHx3Fhg$98jZicV16ODfEsEZeYPGHU3kbrUrvUEXOPimVSQDD44'; + $passlibSaltedHash = '$pbkdf2-sha256$6400$.6UI/S.nXIk8jcbdHx3Fhg$98jZicV16ODfEsEZeYPGHU3kbrUrvUEXOPimVSQDD44'; $subject = new Pbkdf2PasswordHash(['hash_count' => 1000]); self::assertTrue($subject->checkPassword('password', $passlibSaltedHash)); } diff --git a/typo3/sysext/core/Tests/Unit/DependencyInjection/ConsoleCommandPassTest.php b/typo3/sysext/core/Tests/Unit/DependencyInjection/ConsoleCommandPassTest.php index 55389294a208..e9acce06c44e 100644 --- a/typo3/sysext/core/Tests/Unit/DependencyInjection/ConsoleCommandPassTest.php +++ b/typo3/sysext/core/Tests/Unit/DependencyInjection/ConsoleCommandPassTest.php @@ -66,7 +66,7 @@ final class ConsoleCommandPassTest extends UnitTestCase 'serviceProvider' => CommandRegistryServiceProvider::class, ], 'package1' => [ - 'path' =>__DIR__ . '/Fixtures/Package1/', + 'path' => __DIR__ . '/Fixtures/Package1/', ], ]); diff --git a/typo3/sysext/core/Tests/Unit/Session/UserSessionManagerTest.php b/typo3/sysext/core/Tests/Unit/Session/UserSessionManagerTest.php index 16f3fb2cd939..416f7637fe4d 100644 --- a/typo3/sysext/core/Tests/Unit/Session/UserSessionManagerTest.php +++ b/typo3/sysext/core/Tests/Unit/Session/UserSessionManagerTest.php @@ -77,7 +77,7 @@ final class UserSessionManagerTest extends UnitTestCase 60, new IpLocker(0, 0) ); - $expiredSession = UserSession::createFromRecord('random-string', ['ses_tstamp' => time()-500]); + $expiredSession = UserSession::createFromRecord('random-string', ['ses_tstamp' => time() - 500]); self::assertTrue($subject->hasExpired($expiredSession)); $newSession = UserSession::createFromRecord('random-string', ['ses_tstamp' => time()]); self::assertFalse($subject->hasExpired($newSession)); @@ -167,7 +167,7 @@ final class UserSessionManagerTest extends UnitTestCase 60, new IpLocker(0, 0) ); - $session = UserSession::createFromRecord('random-string', ['ses_tstamp' => time()-500]); + $session = UserSession::createFromRecord('random-string', ['ses_tstamp' => time() - 500]); $session = $subject->updateSession($session); self::assertSame(7654321, $session->getLastUpdated()); } @@ -190,7 +190,7 @@ final class UserSessionManagerTest extends UnitTestCase 60, new IpLocker(0, 0) ); - $session = UserSession::createFromRecord('random-string', ['ses_tstamp' => time()-500]); + $session = UserSession::createFromRecord('random-string', ['ses_tstamp' => time() - 500]); $session = $subject->fixateAnonymousSession($session); self::assertSame(IpLocker::DISABLED_LOCK_VALUE, $session->getIpLock()); self::assertNull($session->getUserId()); diff --git a/typo3/sysext/core/Tests/Unit/Utility/GeneralUtilityTest.php b/typo3/sysext/core/Tests/Unit/Utility/GeneralUtilityTest.php index 96a989dcb2de..bdff547257dc 100644 --- a/typo3/sysext/core/Tests/Unit/Utility/GeneralUtilityTest.php +++ b/typo3/sysext/core/Tests/Unit/Utility/GeneralUtilityTest.php @@ -629,7 +629,7 @@ final class GeneralUtilityTest extends UnitTestCase 'emptyValuesAreRemoved' => [ '0,1,, 0, 2,,0', true, - [0=>0, 1=>1, 3=>0, 4=>2, 6=>0], // note does not renumber keys! + [0 => 0, 1 => 1, 3 => 0, 4 => 2, 6 => 0], // note does not renumber keys! ], ]; } diff --git a/typo3/sysext/extbase/Classes/Annotation/IgnoreValidation.php b/typo3/sysext/extbase/Classes/Annotation/IgnoreValidation.php index f6d59cae8f0e..6078f80f207f 100644 --- a/typo3/sysext/extbase/Classes/Annotation/IgnoreValidation.php +++ b/typo3/sysext/extbase/Classes/Annotation/IgnoreValidation.php @@ -21,7 +21,7 @@ namespace TYPO3\CMS\Extbase\Annotation; * @Annotation * @Target({"METHOD"}) */ -#[\Attribute(\Attribute::TARGET_METHOD|\Attribute::IS_REPEATABLE)] +#[\Attribute(\Attribute::TARGET_METHOD | \Attribute::IS_REPEATABLE)] class IgnoreValidation { /** diff --git a/typo3/sysext/extbase/Classes/Annotation/Validate.php b/typo3/sysext/extbase/Classes/Annotation/Validate.php index 7280e001ec43..106be4de1d43 100644 --- a/typo3/sysext/extbase/Classes/Annotation/Validate.php +++ b/typo3/sysext/extbase/Classes/Annotation/Validate.php @@ -23,7 +23,7 @@ use Doctrine\Common\Annotations\Annotation\Required; * @Annotation * @Target({"PROPERTY", "METHOD"}) */ -#[\Attribute(\Attribute::TARGET_PROPERTY|\Attribute::TARGET_METHOD|\Attribute::IS_REPEATABLE)] +#[\Attribute(\Attribute::TARGET_PROPERTY | \Attribute::TARGET_METHOD | \Attribute::IS_REPEATABLE)] class Validate { /** diff --git a/typo3/sysext/extbase/Classes/Persistence/Generic/Storage/Typo3DbBackend.php b/typo3/sysext/extbase/Classes/Persistence/Generic/Storage/Typo3DbBackend.php index 64c1aeb50a86..96944057d261 100644 --- a/typo3/sysext/extbase/Classes/Persistence/Generic/Storage/Typo3DbBackend.php +++ b/typo3/sysext/extbase/Classes/Persistence/Generic/Storage/Typo3DbBackend.php @@ -251,7 +251,7 @@ class Typo3DbBackend implements BackendInterface, SingletonInterface throw new SqlErrorException($e->getPrevious()->getMessage(), 1472064721, $e); } $rows = $result->fetchAllAssociative(); - // Prepared Doctrine DBAL statement + // Prepared Doctrine DBAL statement } elseif ($realStatement instanceof \Doctrine\DBAL\Statement) { try { $result = $realStatement->executeQuery($parameters); diff --git a/typo3/sysext/extbase/Classes/Routing/ExtbasePluginEnhancer.php b/typo3/sysext/extbase/Classes/Routing/ExtbasePluginEnhancer.php index 72d793cc8451..ca7cfc38dd4d 100644 --- a/typo3/sysext/extbase/Classes/Routing/ExtbasePluginEnhancer.php +++ b/typo3/sysext/extbase/Classes/Routing/ExtbasePluginEnhancer.php @@ -230,10 +230,10 @@ class ExtbasePluginEnhancer extends PluginEnhancer // use default action name if controller matches if ($tryUpdate && empty($target['action']) && $controllerName === ($target['controller'] ?? null)) { $target['action'] = $actionName; - // use default controller name if action is defined (implies: non-default-controllers must be given) + // use default controller name if action is defined (implies: non-default-controllers must be given) } elseif ($tryUpdate && empty($target['controller']) && !empty($target['action'])) { $target['controller'] = $controllerName; - // fallback and override + // fallback and override } else { $target['controller'] = $controllerName; $target['action'] = $actionName; diff --git a/typo3/sysext/extbase/Tests/Functional/Fixtures/Extensions/blog_example/Configuration/TCA/tx_blogexample_domain_model_blog.php b/typo3/sysext/extbase/Tests/Functional/Fixtures/Extensions/blog_example/Configuration/TCA/tx_blogexample_domain_model_blog.php index c673fb187ecc..438824c87e08 100644 --- a/typo3/sysext/extbase/Tests/Functional/Fixtures/Extensions/blog_example/Configuration/TCA/tx_blogexample_domain_model_blog.php +++ b/typo3/sysext/extbase/Tests/Functional/Fixtures/Extensions/blog_example/Configuration/TCA/tx_blogexample_domain_model_blog.php @@ -30,7 +30,7 @@ return [ ], ], 'categories' => [ - 'config'=> [ + 'config' => [ 'type' => 'category', ], ], diff --git a/typo3/sysext/extbase/Tests/Functional/Fixtures/Extensions/blog_example/Configuration/TCA/tx_blogexample_domain_model_post.php b/typo3/sysext/extbase/Tests/Functional/Fixtures/Extensions/blog_example/Configuration/TCA/tx_blogexample_domain_model_post.php index 5dd7d44f5492..4c049429f08a 100644 --- a/typo3/sysext/extbase/Tests/Functional/Fixtures/Extensions/blog_example/Configuration/TCA/tx_blogexample_domain_model_post.php +++ b/typo3/sysext/extbase/Tests/Functional/Fixtures/Extensions/blog_example/Configuration/TCA/tx_blogexample_domain_model_post.php @@ -39,7 +39,7 @@ return [ ], ], 'categories' => [ - 'config'=> [ + 'config' => [ 'type' => 'category', ], ], diff --git a/typo3/sysext/extbase/Tests/Functional/Persistence/CountTest.php b/typo3/sysext/extbase/Tests/Functional/Persistence/CountTest.php index 8e54472e1d50..4356130f7698 100644 --- a/typo3/sysext/extbase/Tests/Functional/Persistence/CountTest.php +++ b/typo3/sysext/extbase/Tests/Functional/Persistence/CountTest.php @@ -57,7 +57,7 @@ final class CountTest extends FunctionalTestCase public function offsetCountTest(): void { $query = $this->get(PostRepository::class)->createQuery(); - $query->setLimit($this->numberOfRecordsInFixture+1); + $query->setLimit($this->numberOfRecordsInFixture + 1); $query->setOffset(6); self::assertSame($this->numberOfRecordsInFixture - 6, $query->count()); } @@ -68,7 +68,7 @@ final class CountTest extends FunctionalTestCase public function exceedingOffsetCountTest(): void { $query = $this->get(PostRepository::class)->createQuery(); - $query->setLimit($this->numberOfRecordsInFixture+1); + $query->setLimit($this->numberOfRecordsInFixture + 1); $query->setOffset($this->numberOfRecordsInFixture + 5); self::assertSame(0, $query->count()); } diff --git a/typo3/sysext/extbase/Tests/Unit/Mvc/Web/Routing/UriBuilderTest.php b/typo3/sysext/extbase/Tests/Unit/Mvc/Web/Routing/UriBuilderTest.php index e252dbb6eb8c..459e9e09a6bc 100644 --- a/typo3/sysext/extbase/Tests/Unit/Mvc/Web/Routing/UriBuilderTest.php +++ b/typo3/sysext/extbase/Tests/Unit/Mvc/Web/Routing/UriBuilderTest.php @@ -129,7 +129,7 @@ final class UriBuilderTest extends UnitTestCase */ public function uriForPrefixesArgumentsWithExtensionAndPluginNameAndSetsControllerArgument(): void { - $expectedArguments =['foo' => 'bar', 'baz' => ['extbase' => 'fluid'], 'controller' => 'SomeController']; + $expectedArguments = ['foo' => 'bar', 'baz' => ['extbase' => 'fluid'], 'controller' => 'SomeController']; $GLOBALS['TSFE'] = null; $this->mockRequest->method('getAttribute')->with('applicationType')->willReturn(SystemEnvironmentBuilder::REQUESTTYPE_BE); $this->subject->uriFor(null, ['foo' => 'bar', 'baz' => ['extbase' => 'fluid']], 'SomeController', 'SomeExtension', 'SomePlugin'); diff --git a/typo3/sysext/fluid/Classes/ViewHelpers/FormViewHelper.php b/typo3/sysext/fluid/Classes/ViewHelpers/FormViewHelper.php index f1837b32a542..c943eb902d8d 100644 --- a/typo3/sysext/fluid/Classes/ViewHelpers/FormViewHelper.php +++ b/typo3/sysext/fluid/Classes/ViewHelpers/FormViewHelper.php @@ -468,7 +468,7 @@ class FormViewHelper extends AbstractFormViewHelper // basically "request token, yes" - uses form-action URI as scope if ($isTrulyRequestToken || $requestToken === '@nonce') { $requestToken = RequestToken::create($formAction); - // basically "request token with 'my-scope'" - uses 'my-scope' + // basically "request token with 'my-scope'" - uses 'my-scope' } elseif (is_string($requestToken) && $requestToken !== '') { $requestToken = RequestToken::create($requestToken); } diff --git a/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Format/CurrencyViewHelperTest.php b/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Format/CurrencyViewHelperTest.php index 620ab1d34f9b..5a6fce0d9cca 100644 --- a/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Format/CurrencyViewHelperTest.php +++ b/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Format/CurrencyViewHelperTest.php @@ -40,7 +40,7 @@ final class CurrencyViewHelperTest extends FunctionalTestCase '<f:format.currency currencySign="foo" prependCurrency="true" decimalSeparator="," thousandsSeparator=".">123</f:format.currency>', 'foo 123,00', ], - 'respects currency separator' =>[ + 'respects currency separator' => [ '<f:format.currency currencySign="foo" separateCurrency="false" prependCurrency="true" decimalSeparator="," thousandsSeparator=".">123</f:format.currency>', 'foo123,00', ], diff --git a/typo3/sysext/form/Tests/Functional/Mvc/Validation/FileSizeValidatorTest.php b/typo3/sysext/form/Tests/Functional/Mvc/Validation/FileSizeValidatorTest.php index 8b4d173c0001..9d21665664c2 100644 --- a/typo3/sysext/form/Tests/Functional/Mvc/Validation/FileSizeValidatorTest.php +++ b/typo3/sysext/form/Tests/Functional/Mvc/Validation/FileSizeValidatorTest.php @@ -72,7 +72,7 @@ final class FileSizeValidatorTest extends FunctionalTestCase $validator = new FileSizeValidator(); $validator->setOptions($options); $mockedStorage = $this->getMockBuilder(ResourceStorage::class)->disableOriginalConstructor()->getMock(); - $file = new File(['identifier' => '/foo', 'name'=> 'bar.txt', 'size' => '1'], $mockedStorage); + $file = new File(['identifier' => '/foo', 'name' => 'bar.txt', 'size' => '1'], $mockedStorage); self::assertTrue($validator->validate($file)->hasErrors()); } diff --git a/typo3/sysext/form/Tests/Unit/Mvc/Persistence/FormPersistenceManagerTest.php b/typo3/sysext/form/Tests/Unit/Mvc/Persistence/FormPersistenceManagerTest.php index 18d57bdbb62d..535b4d707876 100644 --- a/typo3/sysext/form/Tests/Unit/Mvc/Persistence/FormPersistenceManagerTest.php +++ b/typo3/sysext/form/Tests/Unit/Mvc/Persistence/FormPersistenceManagerTest.php @@ -42,7 +42,7 @@ final class FormPersistenceManagerTest extends UnitTestCase $mockFormPersistenceManager = $this->getAccessibleMock(FormPersistenceManager::class, null, [], '', false); - $runtimeCache= $this->getMockBuilder(VariableFrontend::class) + $runtimeCache = $this->getMockBuilder(VariableFrontend::class) ->onlyMethods(['get', 'set']) ->disableOriginalConstructor() ->getMock(); @@ -67,7 +67,7 @@ final class FormPersistenceManagerTest extends UnitTestCase $mockFormPersistenceManager = $this->getAccessibleMock(FormPersistenceManager::class, null, [], '', false); - $runtimeCache= $this->getMockBuilder(VariableFrontend::class) + $runtimeCache = $this->getMockBuilder(VariableFrontend::class) ->onlyMethods(['get', 'set']) ->disableOriginalConstructor() ->getMock(); @@ -132,7 +132,7 @@ final class FormPersistenceManagerTest extends UnitTestCase $mockFormPersistenceManager = $this->getAccessibleMock(FormPersistenceManager::class, null, [], '', false); - $runtimeCache= $this->getMockBuilder(VariableFrontend::class) + $runtimeCache = $this->getMockBuilder(VariableFrontend::class) ->onlyMethods(['get', 'set']) ->disableOriginalConstructor() ->getMock(); @@ -220,7 +220,7 @@ final class FormPersistenceManagerTest extends UnitTestCase $mockFormPersistenceManager = $this->getAccessibleMock(FormPersistenceManager::class, ['exists'], [], '', false); - $runtimeCache= $this->getMockBuilder(VariableFrontend::class) + $runtimeCache = $this->getMockBuilder(VariableFrontend::class) ->onlyMethods(['get', 'set']) ->disableOriginalConstructor() ->getMock(); @@ -288,7 +288,7 @@ final class FormPersistenceManagerTest extends UnitTestCase { $mockFormPersistenceManager = $this->getAccessibleMock(FormPersistenceManager::class, null, [], '', false); - $runtimeCache= $this->getMockBuilder(VariableFrontend::class) + $runtimeCache = $this->getMockBuilder(VariableFrontend::class) ->onlyMethods(['get', 'set']) ->disableOriginalConstructor() ->getMock(); diff --git a/typo3/sysext/frontend/Classes/ContentObject/ContentObjectRenderer.php b/typo3/sysext/frontend/Classes/ContentObject/ContentObjectRenderer.php index c194080ef2a6..6a3904289ad5 100644 --- a/typo3/sysext/frontend/Classes/ContentObject/ContentObjectRenderer.php +++ b/typo3/sysext/frontend/Classes/ContentObject/ContentObjectRenderer.php @@ -4366,7 +4366,7 @@ class ContentObjectRenderer implements LoggerAwareInterface if (method_exists($value, 'get' . ucfirst($currentKey))) { $getterMethod = 'get' . ucfirst($currentKey); $value = $value->$getterMethod(...)(); - // server request attribute, such as "routing" + // server request attribute, such as "routing" } elseif ($value instanceof ServerRequestInterface) { $value = $value->getAttribute($currentKey); } else { diff --git a/typo3/sysext/frontend/Classes/DataProcessing/GalleryProcessor.php b/typo3/sysext/frontend/Classes/DataProcessing/GalleryProcessor.php index 03a432797311..8510254d6f2c 100644 --- a/typo3/sysext/frontend/Classes/DataProcessing/GalleryProcessor.php +++ b/typo3/sysext/frontend/Classes/DataProcessing/GalleryProcessor.php @@ -422,7 +422,7 @@ class GalleryProcessor implements DataProcessorInterface // Recalculate gallery width $this->galleryData['width'] = floor($maximumRowWidth / $mediaScalingCorrection); - // User entered a predefined width + // User entered a predefined width } elseif ($this->equalMediaWidth) { $mediaScalingCorrection = 1; @@ -446,7 +446,7 @@ class GalleryProcessor implements DataProcessorInterface // Recalculate gallery width $this->galleryData['width'] = floor($totalRowWidth / $mediaScalingCorrection); - // Automatic setting of width and height + // Automatic setting of width and height } else { $maxMediaWidth = (int)($galleryWidthMinusBorderAndSpacing / $this->galleryData['count']['columns']); foreach ($this->fileObjects as $key => $fileObject) { diff --git a/typo3/sysext/frontend/Classes/Middleware/PageArgumentValidator.php b/typo3/sysext/frontend/Classes/Middleware/PageArgumentValidator.php index cf0c9fcceed2..701f288191fb 100644 --- a/typo3/sysext/frontend/Classes/Middleware/PageArgumentValidator.php +++ b/typo3/sysext/frontend/Classes/Middleware/PageArgumentValidator.php @@ -100,7 +100,7 @@ class PageArgumentValidator implements MiddlewareInterface, LoggerAwareInterface ['code' => PageAccessFailureReasons::CACHEHASH_COMPARISON_FAILED] ); } - // No cHash given but was required + // No cHash given but was required } elseif (!$this->evaluatePageArgumentsWithoutCacheHash($pageArguments, $pageNotFoundOnValidationError)) { return GeneralUtility::makeInstance(ErrorController::class)->pageNotFoundAction( $request, diff --git a/typo3/sysext/indexed_search/Classes/EventListener/FrontendGenerationPageIndexingTrigger.php b/typo3/sysext/indexed_search/Classes/EventListener/FrontendGenerationPageIndexingTrigger.php index 671ced815d0f..4c1643636541 100644 --- a/typo3/sysext/indexed_search/Classes/EventListener/FrontendGenerationPageIndexingTrigger.php +++ b/typo3/sysext/indexed_search/Classes/EventListener/FrontendGenerationPageIndexingTrigger.php @@ -94,7 +94,7 @@ class FrontendGenerationPageIndexingTrigger // Page id 'id' => $tsfe->id, // Page type - 'type'=> $pageArguments->getPageType(), + 'type' => $pageArguments->getPageType(), // site language id of the language of the indexing. 'sys_language_uid' => $languageAspect->getId(), // MP variable, if any (Mount Points) diff --git a/typo3/sysext/install/Classes/FolderStructure/DefaultFactory.php b/typo3/sysext/install/Classes/FolderStructure/DefaultFactory.php index c2441c2e7d19..97e941706520 100644 --- a/typo3/sysext/install/Classes/FolderStructure/DefaultFactory.php +++ b/typo3/sysext/install/Classes/FolderStructure/DefaultFactory.php @@ -147,7 +147,7 @@ class DefaultFactory } } else { // This is when the public path is a subfolder (e.g. public/ or web/) - $publicPath = substr(Environment::getPublicPath(), strlen(Environment::getProjectPath())+1); + $publicPath = substr(Environment::getPublicPath(), strlen(Environment::getProjectPath()) + 1); $publicPathSubStructure = [ [ diff --git a/typo3/sysext/install/Configuration/ExtensionScanner/Php/ClassNameMatcher.php b/typo3/sysext/install/Configuration/ExtensionScanner/Php/ClassNameMatcher.php index 7acd9b69863b..495afa5758cc 100644 --- a/typo3/sysext/install/Configuration/ExtensionScanner/Php/ClassNameMatcher.php +++ b/typo3/sysext/install/Configuration/ExtensionScanner/Php/ClassNameMatcher.php @@ -1100,7 +1100,7 @@ return [ 'Breaking-87193-DeprecatedFunctionalityRemoved.rst', ], ], - 'TYPO3\CMS\Fluid\Core\Parser\SyntaxTree\AbstractNode'=> [ + 'TYPO3\CMS\Fluid\Core\Parser\SyntaxTree\AbstractNode' => [ 'restFiles' => [ 'Deprecation-87277-FluidClassAliases.rst', 'Breaking-87193-DeprecatedFunctionalityRemoved.rst', diff --git a/typo3/sysext/install/Tests/Functional/UpgradeAnalysis/DocumentationFileTest.php b/typo3/sysext/install/Tests/Functional/UpgradeAnalysis/DocumentationFileTest.php index 7ade24cc84eb..022bbaa073a2 100644 --- a/typo3/sysext/install/Tests/Functional/UpgradeAnalysis/DocumentationFileTest.php +++ b/typo3/sysext/install/Tests/Functional/UpgradeAnalysis/DocumentationFileTest.php @@ -133,8 +133,8 @@ final class DocumentationFileTest extends FunctionalTestCase { $currentVersion = (int)explode('.', VersionNumberUtility::getNumericTypo3Version())[0]; $expected = [ - 0 => $currentVersion-2 . '.0', - 1 => $currentVersion-1 . '.0', + 0 => $currentVersion - 2 . '.0', + 1 => $currentVersion - 1 . '.0', 2 => $currentVersion . '.0', ]; $subject = new DocumentationFile(Environment::getPublicPath() . '/Changelog'); diff --git a/typo3/sysext/install/Tests/Unit/Updates/RowUpdater/L18nDiffsourceToJsonMigrationTest.php b/typo3/sysext/install/Tests/Unit/Updates/RowUpdater/L18nDiffsourceToJsonMigrationTest.php index e41065a1e8d7..0518bf8a648c 100644 --- a/typo3/sysext/install/Tests/Unit/Updates/RowUpdater/L18nDiffsourceToJsonMigrationTest.php +++ b/typo3/sysext/install/Tests/Unit/Updates/RowUpdater/L18nDiffsourceToJsonMigrationTest.php @@ -40,7 +40,7 @@ final class L18nDiffsourceToJsonMigrationTest extends UnitTestCase 'ctrl' => [ 'languageField' => 'sys_language_uid', 'transOrigPointerField' => 'l10n_parent', - 'transOrigDiffSourceField' =>'l10n_diffsource', + 'transOrigDiffSourceField' => 'l10n_diffsource', ], ]; self::assertTrue((new L18nDiffsourceToJsonMigration())->hasPotentialUpdateForTable('testTable')); @@ -53,7 +53,7 @@ final class L18nDiffsourceToJsonMigrationTest extends UnitTestCase { $GLOBALS['TCA']['testTable'] = [ 'ctrl' => [ - 'transOrigDiffSourceField' =>'l10n_diffsource', + 'transOrigDiffSourceField' => 'l10n_diffsource', ], ]; $row = []; @@ -117,7 +117,7 @@ final class L18nDiffsourceToJsonMigrationTest extends UnitTestCase { $GLOBALS['TCA']['testTable'] = [ 'ctrl' => [ - 'transOrigDiffSourceField' =>'l10n_diffsource', + 'transOrigDiffSourceField' => 'l10n_diffsource', ], ]; $row = ['l10n_diffsource' => $input]; diff --git a/typo3/sysext/lowlevel/Classes/Command/MissingRelationsCommand.php b/typo3/sysext/lowlevel/Classes/Command/MissingRelationsCommand.php index ce6b26ded9aa..456e670511a1 100644 --- a/typo3/sysext/lowlevel/Classes/Command/MissingRelationsCommand.php +++ b/typo3/sysext/lowlevel/Classes/Command/MissingRelationsCommand.php @@ -278,7 +278,7 @@ If you want to get more detailed information, use the --verbose option.') } else { $offlineVersionRecords[$idx][$rec['hash']] = $infoString; } - // reference to a deleted record + // reference to a deleted record } elseif (isset($GLOBALS['TCA'][$rec['ref_table']]['ctrl']['delete']) && $existingRecords[$idx][$GLOBALS['TCA'][$rec['ref_table']]['ctrl']['delete']]) { if ($isSoftReference) { $deletedRecordsInSoftReferenceRelations[] = $infoString; diff --git a/typo3/sysext/lowlevel/Classes/Service/CleanUpLocalProcessedFilesService.php b/typo3/sysext/lowlevel/Classes/Service/CleanUpLocalProcessedFilesService.php index e10a0f53cec6..1dac629d5854 100644 --- a/typo3/sysext/lowlevel/Classes/Service/CleanUpLocalProcessedFilesService.php +++ b/typo3/sysext/lowlevel/Classes/Service/CleanUpLocalProcessedFilesService.php @@ -152,7 +152,7 @@ class CleanUpLocalProcessedFilesService $iterator = new \RecursiveIteratorIterator( new \RecursiveDirectoryIterator( $basePath . $folder->getIdentifier(), - \FilesystemIterator::UNIX_PATHS|\FilesystemIterator::SKIP_DOTS|\FilesystemIterator::FOLLOW_SYMLINKS|\FilesystemIterator::CURRENT_AS_FILEINFO + \FilesystemIterator::UNIX_PATHS | \FilesystemIterator::SKIP_DOTS | \FilesystemIterator::FOLLOW_SYMLINKS | \FilesystemIterator::CURRENT_AS_FILEINFO ), \RecursiveIteratorIterator::SELF_FIRST, \RecursiveIteratorIterator::CATCH_GET_CHILD diff --git a/typo3/sysext/reactions/Classes/Repository/ReactionRepository.php b/typo3/sysext/reactions/Classes/Repository/ReactionRepository.php index 563f033fa59e..aa72148394f2 100644 --- a/typo3/sysext/reactions/Classes/Repository/ReactionRepository.php +++ b/typo3/sysext/reactions/Classes/Repository/ReactionRepository.php @@ -134,7 +134,7 @@ class ReactionRepository return new ReactionInstruction($row); } - protected function getQueryBuilder(bool $addDefaultOrderByClause=true): QueryBuilder + protected function getQueryBuilder(bool $addDefaultOrderByClause = true): QueryBuilder { // @todo ConnectionPool could be injected $queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class) diff --git a/typo3/sysext/workspaces/Classes/Service/GridDataService.php b/typo3/sysext/workspaces/Classes/Service/GridDataService.php index 1c75d08ae244..f69177220094 100644 --- a/typo3/sysext/workspaces/Classes/Service/GridDataService.php +++ b/typo3/sysext/workspaces/Classes/Service/GridDataService.php @@ -453,7 +453,7 @@ class GridDataService implements LoggerAwareInterface if ($a[$this->sort] == $b[$this->sort]) { $sortingResult = 0; } elseif ($this->sortDir === 'ASC') { - $sortingResult= $a[$this->sort] < $b[$this->sort] ? -1 : 1; + $sortingResult = $a[$this->sort] < $b[$this->sort] ? -1 : 1; } elseif ($this->sortDir === 'DESC') { $sortingResult = $a[$this->sort] > $b[$this->sort] ? -1 : 1; } else { -- GitLab