diff --git a/composer.json b/composer.json index d66cbebbe146835af8a912271f7101d0af978258..2b5918b503cf439318d34a9b7079473b00c9dfa9 100644 --- a/composer.json +++ b/composer.json @@ -113,7 +113,7 @@ "composer/composer": "^2.2.12", "composer/package-versions-deprecated": "^1.11.99.4", "cweagans/composer-patches": "^1.7.1", - "friendsofphp/php-cs-fixer": "^3.12.0", + "friendsofphp/php-cs-fixer": "^3.26.1", "friendsoftypo3/phpstan-typo3": "^0.9.0", "jangregor/phpstan-prophecy": "^1.0", "php-webdriver/webdriver": "^1.12.0", diff --git a/composer.lock b/composer.lock index 3196b93e5a4a3844923b80849cbd1729ff88b8cd..16bc995ba174e18923608eadd97990e89de85d2a 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": "9e31c90d7e05b8ce336c7a91a64e88fa", + "content-hash": "26d40ee1351ef2c9870c7a5a153ad704", "packages": [ { "name": "bacon/bacon-qr-code", @@ -6492,51 +6492,51 @@ }, { "name": "friendsofphp/php-cs-fixer", - "version": "v3.12.0", + "version": "v3.26.1", "source": { "type": "git", - "url": "https://github.com/FriendsOfPHP/PHP-CS-Fixer.git", - "reference": "eae11d945e2885d86e1c080eec1bb30a2aa27998" + "url": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git", + "reference": "d023ba6684055f6ea1da1352d8a02baca0426983" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/eae11d945e2885d86e1c080eec1bb30a2aa27998", - "reference": "eae11d945e2885d86e1c080eec1bb30a2aa27998", + "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/d023ba6684055f6ea1da1352d8a02baca0426983", + "reference": "d023ba6684055f6ea1da1352d8a02baca0426983", "shasum": "" }, "require": { - "composer/semver": "^3.2", + "composer/semver": "^3.3", "composer/xdebug-handler": "^3.0.3", - "doctrine/annotations": "^1.13", "ext-json": "*", "ext-tokenizer": "*", "php": "^7.4 || ^8.0", - "sebastian/diff": "^4.0", + "sebastian/diff": "^4.0 || ^5.0", "symfony/console": "^5.4 || ^6.0", "symfony/event-dispatcher": "^5.4 || ^6.0", "symfony/filesystem": "^5.4 || ^6.0", "symfony/finder": "^5.4 || ^6.0", "symfony/options-resolver": "^5.4 || ^6.0", - "symfony/polyfill-mbstring": "^1.23", - "symfony/polyfill-php80": "^1.25", - "symfony/polyfill-php81": "^1.25", + "symfony/polyfill-mbstring": "^1.27", + "symfony/polyfill-php80": "^1.27", + "symfony/polyfill-php81": "^1.27", "symfony/process": "^5.4 || ^6.0", "symfony/stopwatch": "^5.4 || ^6.0" }, "require-dev": { + "facile-it/paraunit": "^1.3 || ^2.0", "justinrainbow/json-schema": "^5.2", - "keradus/cli-executor": "^1.5", - "mikey179/vfsstream": "^1.6.10", - "php-coveralls/php-coveralls": "^2.5.2", + "keradus/cli-executor": "^2.0", + "mikey179/vfsstream": "^1.6.11", + "php-coveralls/php-coveralls": "^2.5.3", "php-cs-fixer/accessible-object": "^1.1", "php-cs-fixer/phpunit-constraint-isidenticalstring": "^1.2", "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.2.1", - "phpspec/prophecy": "^1.15", + "phpspec/prophecy": "^1.16", "phpspec/prophecy-phpunit": "^2.0", "phpunit/phpunit": "^9.5", "phpunitgoodpractices/polyfill": "^1.6", "phpunitgoodpractices/traits": "^1.9.2", - "symfony/phpunit-bridge": "^6.0", + "symfony/phpunit-bridge": "^6.2.3", "symfony/yaml": "^5.4 || ^6.0" }, "suggest": { @@ -6567,9 +6567,15 @@ } ], "description": "A tool to automatically fix PHP code style", + "keywords": [ + "Static code analysis", + "fixer", + "standards", + "static analysis" + ], "support": { - "issues": "https://github.com/FriendsOfPHP/PHP-CS-Fixer/issues", - "source": "https://github.com/FriendsOfPHP/PHP-CS-Fixer/tree/v3.12.0" + "issues": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues", + "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.26.1" }, "funding": [ { @@ -6577,7 +6583,7 @@ "type": "github" } ], - "time": "2022-10-12T14:20:51+00:00" + "time": "2023-09-08T19:09:07+00:00" }, { "name": "friendsoftypo3/phpstan-typo3", @@ -9253,5 +9259,5 @@ "platform-overrides": { "php": "7.4.1" }, - "plugin-api-version": "2.3.0" + "plugin-api-version": "2.6.0" } diff --git a/typo3/sysext/backend/Classes/Controller/ContentElement/ElementInformationController.php b/typo3/sysext/backend/Classes/Controller/ContentElement/ElementInformationController.php index ee6442e2ed62af1b514a99705cb286ab51e5b7d0..6b98b6125be8e5814632fa89c547b2b30cf873b1 100644 --- a/typo3/sysext/backend/Classes/Controller/ContentElement/ElementInformationController.php +++ b/typo3/sysext/backend/Classes/Controller/ContentElement/ElementInformationController.php @@ -314,7 +314,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/LoginController.php b/typo3/sysext/backend/Classes/Controller/LoginController.php index 64c0252b72491245b3b6e8918e19a35803c8c69d..9e53771ad5e19d32aff9202c74661c632faa0727 100644 --- a/typo3/sysext/backend/Classes/Controller/LoginController.php +++ b/typo3/sysext/backend/Classes/Controller/LoginController.php @@ -406,7 +406,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/Domain/Repository/Module/BackendModuleRepository.php b/typo3/sysext/backend/Classes/Domain/Repository/Module/BackendModuleRepository.php index 05dd59f90dc3153f700e925d422c7850f64c60f5..ce4690e326605b6ee040795c631d146842334801 100644 --- a/typo3/sysext/backend/Classes/Domain/Repository/Module/BackendModuleRepository.php +++ b/typo3/sysext/backend/Classes/Domain/Repository/Module/BackendModuleRepository.php @@ -184,7 +184,7 @@ class BackendModuleRepository implements SingletonInterface // @deprecated since TYPO3 v11, will be removed in TYPO3 v12.0 if (!empty($module['navigationFrameScript']) && is_string($module['navigationFrameScript'])) { $entry->setNavigationFrameScript($module['navigationFrameScript']); - // @deprecated since TYPO3 v11, will be removed in TYPO3 v12.0 + // @deprecated since TYPO3 v11, will be removed in TYPO3 v12.0 } elseif (!empty($module['parentNavigationFrameScript']) && is_string($module['parentNavigationFrameScript'])) { $entry->setNavigationFrameScript($module['parentNavigationFrameScript']); } diff --git a/typo3/sysext/backend/Classes/Form/InlineStackProcessor.php b/typo3/sysext/backend/Classes/Form/InlineStackProcessor.php index c25b0511f4b379ac672446515dde1e66288388c2..786db00e568bffb73ea33aae424cb10a2b04e48e 100644 --- a/typo3/sysext/backend/Classes/Form/InlineStackProcessor.php +++ b/typo3/sysext/backend/Classes/Form/InlineStackProcessor.php @@ -284,7 +284,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/Configuration/SiteConfiguration/site_language.php b/typo3/sysext/backend/Configuration/SiteConfiguration/site_language.php index 3cab4dc5a3d8923810cc5a617a0980ba420148bc..f223e14c16cc157a80e8352cd90c17ca8cfafbcb 100644 --- a/typo3/sysext/backend/Configuration/SiteConfiguration/site_language.php +++ b/typo3/sysext/backend/Configuration/SiteConfiguration/site_language.php @@ -66,7 +66,7 @@ return [ 'placeholder' => 'en_US.UTF-8', '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 fd85bbaeb0506fbf7e2699dbf65f9ccbbb3ed73d..627f20ea25447b81bb243643fb378c2b03d52b49 100644 --- a/typo3/sysext/backend/Tests/Functional/Controller/Page/TreeControllerTest.php +++ b/typo3/sysext/backend/Tests/Functional/Controller/Page/TreeControllerTest.php @@ -338,7 +338,7 @@ class TreeControllerTest extends FunctionalTestCase [ 'uid' => 0, 'title' => 'New TYPO3 site', - '_children' =>[ + '_children' => [ [ 'uid' => 1000, 'title' => 'ACME Inc', @@ -445,7 +445,7 @@ class TreeControllerTest extends FunctionalTestCase [ 'uid' => 0, 'title' => 'New TYPO3 site', - '_children' =>[ + '_children' => [ [ 'uid' => 1210, 'title' => 'EN: Frontend Editing', @@ -479,7 +479,7 @@ class TreeControllerTest extends FunctionalTestCase [ 'uid' => 0, 'title' => 'New TYPO3 site', - '_children' =>[ + '_children' => [ [ 'uid' => 1000, 'title' => 'ACME Inc', @@ -666,7 +666,7 @@ 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 320e068193f383639cf31e6622a8858efe554a52..81d4c4a36633a1bc03c70bdf2317eb940da6ddab 100644 --- a/typo3/sysext/backend/Tests/Functional/Controller/ResetPasswordControllerTest.php +++ b/typo3/sysext/backend/Tests/Functional/Controller/ResetPasswordControllerTest.php @@ -148,7 +148,7 @@ 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/Form/FormDataProvider/TcaSelectItemsTest.php b/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/TcaSelectItemsTest.php index 3950501557657a753263c1736c2ee8b8b4c42317..c91eb41630dcf00e9d1b12b59de6bc2e900adeb1 100644 --- a/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/TcaSelectItemsTest.php +++ b/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/TcaSelectItemsTest.php @@ -1446,7 +1446,7 @@ class TcaSelectItemsTest extends UnitTestCase 'label' => 'icon', 'selicon_field' => 'icon', ], - 'columns' =>[ + 'columns' => [ 'icon' => [], ], ]; diff --git a/typo3/sysext/backend/Tests/Unit/Utility/BackendUtilityTest.php b/typo3/sysext/backend/Tests/Unit/Utility/BackendUtilityTest.php index e47b8236d061f09eee7c73eaa4586ed9af75903a..32e1c8983978bfafcd9e02eda4ed3c8f43388f36 100644 --- a/typo3/sysext/backend/Tests/Unit/Utility/BackendUtilityTest.php +++ b/typo3/sysext/backend/Tests/Unit/Utility/BackendUtilityTest.php @@ -1294,7 +1294,7 @@ 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 495a42b50348cf622c0ee869d1b189ed980a57f0..dd111504a0b2dbd2fb84d422600e9eecb93851d6 100644 --- a/typo3/sysext/core/Classes/Authentication/AbstractUserAuthentication.php +++ b/typo3/sysext/core/Classes/Authentication/AbstractUserAuthentication.php @@ -591,8 +591,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, $authInfo) as $serviceObj) { diff --git a/typo3/sysext/core/Classes/Authentication/Mfa/MfaViewType.php b/typo3/sysext/core/Classes/Authentication/Mfa/MfaViewType.php index dc708b26fde6edd0eb7e85bf6a09157f70e86c28..45d020559b31c1ade99762e62166b3a88055bb58 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 755c07c5c903fb8728d67b33d40881e19eb44dca..15b1f73320eefe0a91cab1c3f3748694ebfd0fda 100644 --- a/typo3/sysext/core/Classes/DataHandling/DataHandler.php +++ b/typo3/sysext/core/Classes/DataHandling/DataHandler.php @@ -3862,7 +3862,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 @@ -3876,7 +3876,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 @@ -8132,15 +8132,15 @@ class DataHandler implements LoggerAwareInterface // Thus, check whether strings are the same or whether integer values are empty ("0" or ""). if (!$allowNull) { $result = (string)$submittedValue === (string)$storedValue || $storedType === 'int' && (int)$storedValue === (int)$submittedValue; - // 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 241256f67d143db216bf79fa94e497b8e4de9f9e..6db66afd611ed092fb73d0985a4bf443b0e19755 100644 --- a/typo3/sysext/core/Classes/DataHandling/Localization/DataMapProcessor.php +++ b/typo3/sysext/core/Classes/DataHandling/Localization/DataMapProcessor.php @@ -1068,7 +1068,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 172c5c015bd55b94ef0599a764f5770028b7cba3..b71650489a24f001aef53ddd90b1b59512d96770 100644 --- a/typo3/sysext/core/Classes/Database/Query/Expression/CompositeExpression.php +++ b/typo3/sysext/core/Classes/Database/Query/Expression/CompositeExpression.php @@ -93,7 +93,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)); @@ -104,7 +104,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)); @@ -117,7 +117,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 b151ca3b77a2ea7cacc312cf75c69a1ce79f70a5..82de3668e3f1a778247f2c0e888c5f63fc71d881 100644 --- a/typo3/sysext/core/Classes/Database/RelationHandler.php +++ b/typo3/sysext/core/Classes/Database/RelationHandler.php @@ -1443,7 +1443,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 0323486c754824d20df7baba9765b01b28b3700e..6f8e106fa3ff45875d14e61dcb0aec83a8a2b0a7 100644 --- a/typo3/sysext/core/Classes/DependencyInjection/ServiceProviderCompilationPass.php +++ b/typo3/sysext/core/Classes/DependencyInjection/ServiceProviderCompilationPass.php @@ -263,7 +263,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 f38ee156b86fdd22eeb00c56c2cb43f93499d026..f2a86dcf948c1abe6cf99deb6fa0509b4378850a 100644 --- a/typo3/sysext/core/Classes/Html/SimpleParser.php +++ b/typo3/sysext/core/Classes/Html/SimpleParser.php @@ -132,53 +132,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 ea39a7e28305c6acbad1488d0023fb93647c7c24..8bd1e46412d92d41e20ba3afb4ebb5ed85c8fe73 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 740dd86c51a7487690ee472855f885cb6bf286b7..e439c27d9faa613441683b1f5ddf623b848c7071 100644 --- a/typo3/sysext/core/Classes/LinkHandling/LegacyLinkNotationConverter.php +++ b/typo3/sysext/core/Classes/LinkHandling/LegacyLinkNotationConverter.php @@ -140,7 +140,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/Routing/Aspect/PersistedPatternMapper.php b/typo3/sysext/core/Classes/Routing/Aspect/PersistedPatternMapper.php index 956d41c42f11f4d5a8c2ca8e256bdaa0c4108a03..e72568bf0add4bca77130bcb3661d715101b9488 100644 --- a/typo3/sysext/core/Classes/Routing/Aspect/PersistedPatternMapper.php +++ b/typo3/sysext/core/Classes/Routing/Aspect/PersistedPatternMapper.php @@ -292,7 +292,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/Utility/StringUtility.php b/typo3/sysext/core/Classes/Utility/StringUtility.php index 2b69abb8f38a9c8ebcd744d59dd0fb2e06295365..934233b600431c58744c03821df0f6da91cc6d61 100644 --- a/typo3/sysext/core/Classes/Utility/StringUtility.php +++ b/typo3/sysext/core/Classes/Utility/StringUtility.php @@ -220,22 +220,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 4273d87bd0fae05fb9301146919e22314c305aad..67b7eeb1aecce8a225152ca7c5c00dc997941797 100644 --- a/typo3/sysext/core/Configuration/TCA/pages.php +++ b/typo3/sysext/core/Configuration/TCA/pages.php @@ -285,7 +285,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 71caae0661c00757b8d211891d9fa22453f041b2..fb48fb3c5929beb6bd2cf4882c7987dc29f3168a 100644 --- a/typo3/sysext/core/Configuration/TCA/sys_file_metadata.php +++ b/typo3/sysext/core/Configuration/TCA/sys_file_metadata.php @@ -38,7 +38,7 @@ return [ ], ], 'categories' => [ - 'config'=> [ + 'config' => [ 'type' => 'category', ], ], diff --git a/typo3/sysext/core/Tests/Acceptance/Application/Impexp/AbstractCest.php b/typo3/sysext/core/Tests/Acceptance/Application/Impexp/AbstractCest.php index ddd93d44e380288523b7783d015644f03d484b32..43c58d987d380efa42b56988cbbd99b50a421ff6 100644 --- a/typo3/sysext/core/Tests/Acceptance/Application/Impexp/AbstractCest.php +++ b/typo3/sysext/core/Tests/Acceptance/Application/Impexp/AbstractCest.php @@ -72,7 +72,7 @@ abstract class 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 Group Listing'); $I->click('//table/tbody/tr[descendant::a[@data-uid="' . $userGroupId . '"]]/td[2]/a'); $I->waitForElementVisible('#EditDocumentController'); @@ -103,7 +103,7 @@ abstract class 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-uid="' . $userId . '"]]//a[@title="Edit"]'); $I->waitForElement('#EditDocumentController'); diff --git a/typo3/sysext/core/Tests/Acceptance/Application/Impexp/ExportCest.php b/typo3/sysext/core/Tests/Acceptance/Application/Impexp/ExportCest.php index 67a25cac3b674712b8eddf463745e79fbec5d642..a196d922e93b5aee5f2843de50889b242ad92684 100644 --- a/typo3/sysext/core/Tests/Acceptance/Application/Impexp/ExportCest.php +++ b/typo3/sysext/core/Tests/Acceptance/Application/Impexp/ExportCest.php @@ -225,9 +225,9 @@ class ExportCest extends AbstractCest $flashMessage = $I->grabTextFrom($this->inFlashMessages . ' .alert.alert-success .alert-message'); $I->assertMatchesRegularExpression('/Saved in ["][^"]+["], bytes/', $flashMessage); // TODO: find out how to clean this up, as it is impossible to determine the absolute file path from an url -// preg_match('/[^"]+"([^"]+)"[^"]+/', $flashMessage, $flashMessageParts); -// $saveFilePath = Environment::getProjectPath() . '/' . $flashMessageParts[1]; -// $this->testFilesToDelete[] = $saveFilePath; + // preg_match('/[^"]+"([^"]+)"[^"]+/', $flashMessage, $flashMessageParts); + // $saveFilePath = Environment::getProjectPath() . '/' . $flashMessageParts[1]; + // $this->testFilesToDelete[] = $saveFilePath; } public function exportTable(ApplicationTester $I): void @@ -267,9 +267,9 @@ class ExportCest extends AbstractCest $flashMessage = $I->grabTextFrom($this->inFlashMessages . ' .alert.alert-success .alert-message'); $I->assertMatchesRegularExpression('/Saved in ["][^"]+["], bytes/', $flashMessage); // TODO: find out how to clean this up, as it is impossible to determine the absolute file path from an url -// preg_match('/[^"]+"([^"]+)"[^"]+/', $flashMessage, $flashMessageParts); -// $saveFilePath = Environment::getProjectPath() . '/' . $flashMessageParts[1]; -// $this->testFilesToDelete[] = $saveFilePath; + // preg_match('/[^"]+"([^"]+)"[^"]+/', $flashMessage, $flashMessageParts); + // $saveFilePath = Environment::getProjectPath() . '/' . $flashMessageParts[1]; + // $this->testFilesToDelete[] = $saveFilePath; } public function exportRecord(ApplicationTester $I): void @@ -307,8 +307,8 @@ class ExportCest extends AbstractCest $flashMessage = $I->grabTextFrom($this->inFlashMessages . ' .alert.alert-success .alert-message'); $I->assertMatchesRegularExpression('/Saved in ["][^"]+["], bytes/', $flashMessage); // TODO: find out how to clean this up, as it is impossible to determine the absolute file path from an url -// preg_match('/[^"]+"([^"]+)"[^"]+/', $flashMessage, $flashMessageParts); -// $saveFilePath = Environment::getProjectPath() . '/' . $flashMessageParts[1]; -// $this->testFilesToDelete[] = $saveFilePath; + // preg_match('/[^"]+"([^"]+)"[^"]+/', $flashMessage, $flashMessageParts); + // $saveFilePath = Environment::getProjectPath() . '/' . $flashMessageParts[1]; + // $this->testFilesToDelete[] = $saveFilePath; } } diff --git a/typo3/sysext/core/Tests/Functional/Resource/ResourceStorageTest.php b/typo3/sysext/core/Tests/Functional/Resource/ResourceStorageTest.php index 428ada6d4f31fe93aabdc353dafcaf4e08f1a990..fd93aed3e1b56a9a1250f8834dc2db66a209d32c 100644 --- a/typo3/sysext/core/Tests/Functional/Resource/ResourceStorageTest.php +++ b/typo3/sysext/core/Tests/Functional/Resource/ResourceStorageTest.php @@ -70,7 +70,7 @@ class ResourceStorageTest extends FunctionalTestCase 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 5d3c726b959a65aca238c5f72b16a85108b4b9a0..66d01c233cf62e179b41bdaf1d5eba506ccba8ab 100644 --- a/typo3/sysext/core/Tests/Functional/Utility/RootlineUtilityTest.php +++ b/typo3/sysext/core/Tests/Functional/Utility/RootlineUtilityTest.php @@ -141,7 +141,7 @@ 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 35251d1ef02b4e678977dc0b20fb14e18b8b93b0..488eb9b2d3c8ca105f1e7cf1e40c03b43df91bd3 100644 --- a/typo3/sysext/core/Tests/Unit/Authentication/BackendUserAuthenticationTest.php +++ b/typo3/sysext/core/Tests/Unit/Authentication/BackendUserAuthenticationTest.php @@ -239,7 +239,7 @@ class BackendUserAuthenticationTest extends UnitTestCase 1, [ 'addFile' => 0, - 'recursivedeleteFolder' =>0, + 'recursivedeleteFolder' => 0, ], [ 'addFile' => 0, @@ -264,7 +264,7 @@ 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 c85eb5c44ca10bcdfd9d5246b51a117e90f7f3fd..7adc7b1935cfe774acae46aa800662117dc9dd5f 100644 --- a/typo3/sysext/core/Tests/Unit/Authentication/Mfa/Provider/TotpTest.php +++ b/typo3/sysext/core/Tests/Unit/Authentication/Mfa/Provider/TotpTest.php @@ -184,13 +184,13 @@ 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 d059e9826ac933301b296782dc6ad03619cd1ecd..c06cc62ca0854a1b7a2aa5d9a1be6d4d6534a53a 100644 --- a/typo3/sysext/core/Tests/Unit/Crypto/PasswordHashing/Pbkdf2PasswordHashTest.php +++ b/typo3/sysext/core/Tests/Unit/Crypto/PasswordHashing/Pbkdf2PasswordHashTest.php @@ -237,7 +237,7 @@ 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 7ab674f93c2fcb326d1b96baff99ed735c041361..f637eacb20cc589cfd3f9e6c09e6a2df0b36bd36 100644 --- a/typo3/sysext/core/Tests/Unit/DependencyInjection/ConsoleCommandPassTest.php +++ b/typo3/sysext/core/Tests/Unit/DependencyInjection/ConsoleCommandPassTest.php @@ -74,7 +74,7 @@ class ConsoleCommandPassTest extends UnitTestCase 'serviceProvider' => CommandRegistryServiceProvider::class, ], 'package1' => [ - 'path' =>__DIR__ . '/Fixtures/Package1/', + 'path' => __DIR__ . '/Fixtures/Package1/', ], ]); diff --git a/typo3/sysext/core/Tests/Unit/Messaging/FlashMessageQueueTest.php b/typo3/sysext/core/Tests/Unit/Messaging/FlashMessageQueueTest.php index ca080a36489ffa439682589788d30b0bee6b8529..396a7c7a5cb22f747aa26657e92302e3a6f994ec 100644 --- a/typo3/sysext/core/Tests/Unit/Messaging/FlashMessageQueueTest.php +++ b/typo3/sysext/core/Tests/Unit/Messaging/FlashMessageQueueTest.php @@ -32,7 +32,7 @@ class FlashMessageQueueTest extends UnitTestCase public function jsonSerializeReturnsArrayWithMessages(): void { $message = new FlashMessage('testMessage'); - $subject= (new FlashMessageQueue('testing'))->enqueue($message); + $subject = (new FlashMessageQueue('testing'))->enqueue($message); self::assertEquals([ $message ], $subject->jsonSerialize()); } } diff --git a/typo3/sysext/core/Tests/Unit/Session/UserSessionManagerTest.php b/typo3/sysext/core/Tests/Unit/Session/UserSessionManagerTest.php index a44b8de013407fbadb88be877b73521b93ce2c1b..9a66feb644aef46d1cc1f269f224b7fd956146ea 100644 --- a/typo3/sysext/core/Tests/Unit/Session/UserSessionManagerTest.php +++ b/typo3/sysext/core/Tests/Unit/Session/UserSessionManagerTest.php @@ -77,7 +77,7 @@ 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)); @@ -138,7 +138,7 @@ 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()); } @@ -161,7 +161,7 @@ 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/extbase/Classes/Persistence/Generic/Storage/Typo3DbBackend.php b/typo3/sysext/extbase/Classes/Persistence/Generic/Storage/Typo3DbBackend.php index 3fe7bba7e9b92d1b2a4c35bb6f1cb5d001a17a72..0694755ada7c96c4cf8965153a73c2c5ae15d980 100644 --- a/typo3/sysext/extbase/Classes/Persistence/Generic/Storage/Typo3DbBackend.php +++ b/typo3/sysext/extbase/Classes/Persistence/Generic/Storage/Typo3DbBackend.php @@ -278,7 +278,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 6cf8000386a1a738c2353123011719cc99c6800c..d846309dae475de292b15efcac780dc5d2af01a4 100644 --- a/typo3/sysext/extbase/Classes/Routing/ExtbasePluginEnhancer.php +++ b/typo3/sysext/extbase/Classes/Routing/ExtbasePluginEnhancer.php @@ -235,10 +235,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/Classes/Controller/BlogController.php b/typo3/sysext/extbase/Tests/Functional/Fixtures/Extensions/blog_example/Classes/Controller/BlogController.php index ff14b96503a5613ac0159265f0c1df7256893486..f6a7a9ec750bd86c13652c806ac7892c7747ba73 100644 --- a/typo3/sysext/extbase/Tests/Functional/Fixtures/Extensions/blog_example/Classes/Controller/BlogController.php +++ b/typo3/sysext/extbase/Tests/Functional/Fixtures/Extensions/blog_example/Classes/Controller/BlogController.php @@ -66,7 +66,7 @@ class BlogController extends ActionController return $this->htmlResponse(); } - public function detailsAction(Blog $blog=null): ResponseInterface + public function detailsAction(Blog $blog = null): ResponseInterface { return $this->htmlResponse($blog ? $blog->getTitle() : ''); } 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 16e58ccc9d73ce52a05cfd4e8e5ec0c75d206c06..24c5a633bee8d28cd3a973b0b5b6000454dd51a5 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 bf82be4e93f4bb337fa23fd9b208bfc7739d0aa7..90cc74dfd587eefeba70f0eaee630effc4a8c0fc 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 ec71d6df9e0f0c8e43397064c040a44d587ff4bd..1172fd9dd7fe0031e25c83b11366ce3a70e62f17 100644 --- a/typo3/sysext/extbase/Tests/Functional/Persistence/CountTest.php +++ b/typo3/sysext/extbase/Tests/Functional/Persistence/CountTest.php @@ -70,7 +70,7 @@ class CountTest extends FunctionalTestCase { $query = $this->postRepository->createQuery(); - $query->setLimit($this->numberOfRecordsInFixture+1); + $query->setLimit($this->numberOfRecordsInFixture + 1); $query->setOffset(6); self::assertSame($this->numberOfRecordsInFixture - 6, $query->count()); @@ -83,7 +83,7 @@ class CountTest extends FunctionalTestCase { $query = $this->postRepository->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/Persistence/Generic/Storage/Typo3DbQueryParserTest.php b/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/Storage/Typo3DbQueryParserTest.php index 696692e46c7dc86bae0a5a4938d3b3c450900c29..6c7041a8d63cfa284d5f8ad464a6990d538e9019 100644 --- a/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/Storage/Typo3DbQueryParserTest.php +++ b/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/Storage/Typo3DbQueryParserTest.php @@ -468,7 +468,7 @@ class Typo3DbQueryParserTest extends UnitTestCase $mockTypo3DbQueryParser = $this->getAccessibleMock(Typo3DbQueryParser::class, ['dummy'], [], '', false); $queryBuilderProphet = $this->getQueryBuilderProphetWithQueryBuilderForSubselect(); $mockTypo3DbQueryParser->_set('queryBuilder', $queryBuilderProphet->reveal()); - $compositeExpression= $mockTypo3DbQueryParser->_call('getLanguageStatement', $table, $table, $querySettings); + $compositeExpression = $mockTypo3DbQueryParser->_call('getLanguageStatement', $table, $table, $querySettings); $expectedSql = '(' . $table . '.sys_language_uid = -1) OR ((' . $table . '.sys_language_uid = 2) AND (' . $table . '.l10n_parent IN (SELECT ' . $table . '_dl.uid FROM ' . $table . ' ' . $table . '_dl WHERE (' . $table . '_dl.l10n_parent = 0) AND (' . $table . '_dl.sys_language_uid = 0) AND (' . $table . '_dl.deleted = 0)))) OR ((' . $table . '.sys_language_uid = 0) AND (' . $table . '.uid NOT IN (SELECT ' . $table . '_to.l10n_parent FROM ' . $table . ' ' . $table . '_dl, ' . $table . ' ' . $table . '_to WHERE (' . $table . '_to.l10n_parent > 0) AND (' . $table . '_to.sys_language_uid = 2) AND ((' . $table . '_dl.deleted = 0) AND (' . $table . '_to.deleted = 0)))))'; self::assertSame($expectedSql, $compositeExpression->__toString()); } diff --git a/typo3/sysext/filelist/Classes/Controller/File/EditFileController.php b/typo3/sysext/filelist/Classes/Controller/File/EditFileController.php index 74719dd6cbf35c64ea2031539376475c1f01d0f6..a1c26825341c0703a886b76985e8edbd9342837f 100644 --- a/typo3/sysext/filelist/Classes/Controller/File/EditFileController.php +++ b/typo3/sysext/filelist/Classes/Controller/File/EditFileController.php @@ -201,7 +201,7 @@ class EditFileController throw new \Exception('Files with that extension are not editable. Allowed extensions are: ' . $extList, 1476050135); } - $fullIdentifier= $this->fileObject->getCombinedIdentifier(); + $fullIdentifier = $this->fileObject->getCombinedIdentifier(); $returnUrl = (string)$this->uriBuilder->buildUriFromRoute('file_edit', ['target' => $fullIdentifier]); // Making the formfields diff --git a/typo3/sysext/filelist/Classes/FileList.php b/typo3/sysext/filelist/Classes/FileList.php index 9fb5895efbd513dd8f6390cabd19334f8505f9e3..cb547dfa1f75587d19f15f77701f11480b08be90 100644 --- a/typo3/sysext/filelist/Classes/FileList.php +++ b/typo3/sysext/filelist/Classes/FileList.php @@ -714,7 +714,7 @@ class FileList $theData[$field] .= '<span class="label label-danger label-space-left">' . htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:warning.file_missing')) . '</span>'; - // Thumbnails? + // Thumbnails? } elseif ($this->thumbs && ($fileObject->isImage() || $fileObject->isMediaFile())) { $processedFile = $fileObject->process( ProcessedFile::CONTEXT_IMAGEPREVIEW, @@ -1031,7 +1031,7 @@ class FileList if ($fileUrl) { $cells['download'] = '<a href="' . htmlspecialchars($fileUrl) . '" download="' . htmlspecialchars($fileOrFolderObject->getName()) . '" class="btn btn-default" title="' . htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:filelist/Resources/Private/Language/locallang.xlf:download')) . '">' . $this->iconFactory->getIcon('actions-download', Icon::SIZE_SMALL)->render() . '</a>'; } - // Folder download + // Folder download } elseif ($fileOrFolderObject instanceof Folder) { $cells['download'] = '<button type="button" data-folder-download="' . htmlspecialchars($this->uriBuilder->buildUriFromRoute('file_download')) . '" data-folder-identifier="' . htmlspecialchars($fileOrFolderObject->getCombinedIdentifier()) . '" class="btn btn-default" title="' . htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:filelist/Resources/Private/Language/locallang.xlf:download')) . '">' . $this->iconFactory->getIcon('actions-download', Icon::SIZE_SMALL)->render() . '</button>'; } diff --git a/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Format/CurrencyViewHelperTest.php b/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Format/CurrencyViewHelperTest.php index 2c4edf1d41e5dc99874eb22976f7c8b4b70873df..865cc55800f59d8648d4a493c521e2d3a44a3239 100644 --- a/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Format/CurrencyViewHelperTest.php +++ b/typo3/sysext/fluid/Tests/Functional/ViewHelpers/Format/CurrencyViewHelperTest.php @@ -42,7 +42,7 @@ 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/Unit/Mvc/Persistence/FormPersistenceManagerTest.php b/typo3/sysext/form/Tests/Unit/Mvc/Persistence/FormPersistenceManagerTest.php index 85eb3c9fb0a55365ffa2f5a806dc7f22db050089..da4ff64242daa25e8d5217fe3b427dcf462583c3 100644 --- a/typo3/sysext/form/Tests/Unit/Mvc/Persistence/FormPersistenceManagerTest.php +++ b/typo3/sysext/form/Tests/Unit/Mvc/Persistence/FormPersistenceManagerTest.php @@ -43,7 +43,7 @@ class FormPersistenceManagerTest extends UnitTestCase $mockFormPersistenceManager = $this->getAccessibleMock(FormPersistenceManager::class, ['dummy'], [], '', false); - $runtimeCache= $this->getMockBuilder(VariableFrontend::class) + $runtimeCache = $this->getMockBuilder(VariableFrontend::class) ->onlyMethods(['get', 'set']) ->disableOriginalConstructor() ->getMock(); @@ -68,7 +68,7 @@ class FormPersistenceManagerTest extends UnitTestCase $mockFormPersistenceManager = $this->getAccessibleMock(FormPersistenceManager::class, ['dummy'], [], '', false); - $runtimeCache= $this->getMockBuilder(VariableFrontend::class) + $runtimeCache = $this->getMockBuilder(VariableFrontend::class) ->onlyMethods(['get', 'set']) ->disableOriginalConstructor() ->getMock(); @@ -133,7 +133,7 @@ class FormPersistenceManagerTest extends UnitTestCase $mockFormPersistenceManager = $this->getAccessibleMock(FormPersistenceManager::class, ['dummy'], [], '', false); - $runtimeCache= $this->getMockBuilder(VariableFrontend::class) + $runtimeCache = $this->getMockBuilder(VariableFrontend::class) ->onlyMethods(['get', 'set']) ->disableOriginalConstructor() ->getMock(); @@ -221,7 +221,7 @@ 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(); @@ -289,7 +289,7 @@ class FormPersistenceManagerTest extends UnitTestCase { $mockFormPersistenceManager = $this->getAccessibleMock(FormPersistenceManager::class, ['dummy'], [], '', false); - $runtimeCache= $this->getMockBuilder(VariableFrontend::class) + $runtimeCache = $this->getMockBuilder(VariableFrontend::class) ->onlyMethods(['get', 'set']) ->disableOriginalConstructor() ->getMock(); diff --git a/typo3/sysext/form/Tests/Unit/Mvc/Validation/FileSizeValidatorTest.php b/typo3/sysext/form/Tests/Unit/Mvc/Validation/FileSizeValidatorTest.php index 027c00de74bab8d629d7042bfe212283baa785f8..daf5fb2d3779a3ec5d33d0826b2940de80d7215e 100644 --- a/typo3/sysext/form/Tests/Unit/Mvc/Validation/FileSizeValidatorTest.php +++ b/typo3/sysext/form/Tests/Unit/Mvc/Validation/FileSizeValidatorTest.php @@ -77,7 +77,7 @@ class FileSizeValidatorTest extends UnitTestCase ->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/frontend/Classes/DataProcessing/GalleryProcessor.php b/typo3/sysext/frontend/Classes/DataProcessing/GalleryProcessor.php index 44b88b53792011cdafd2490e63eaa2e3822cacf7..6aa9363e0934233ac3492e4b55ed4436abb05f8d 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 3ce21fffc8c24f006a39a575f7281ed0c0432357..e4e4e88f87d93ad8992ebc0fee365c6c0d5da944 100644 --- a/typo3/sysext/frontend/Classes/Middleware/PageArgumentValidator.php +++ b/typo3/sysext/frontend/Classes/Middleware/PageArgumentValidator.php @@ -118,7 +118,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/frontend/Tests/Functional/ContentObject/ContentObjectRendererTest.php b/typo3/sysext/frontend/Tests/Functional/ContentObject/ContentObjectRendererTest.php index 121bf132cdb6bbb7ad0bdf75f18618b8e094f2b9..007c4d4a8fd95fa22eb0067fd2077291300c30f2 100644 --- a/typo3/sysext/frontend/Tests/Functional/ContentObject/ContentObjectRendererTest.php +++ b/typo3/sysext/frontend/Tests/Functional/ContentObject/ContentObjectRendererTest.php @@ -633,16 +633,16 @@ And another one'; ]; // @todo Error: Object of class TYPO3\CMS\Core\Resource\FileReference could not be converted to string -// $altUrlConfiguration = $defaultConfiguration; -// $altUrlConfiguration['JSwindow.']['altUrl'] = '/alternative-url'; -// yield 'JSwindow.altUrl forces an alternative url.' => [ -// 'content' => $imageTag, -// 'configuration' => $altUrlConfiguration, -// 'expected' => [ -// '<a href="/alternative-url' => true, -// 'data-window-url="/alternative-url' => true, -// ], -// ]; + // $altUrlConfiguration = $defaultConfiguration; + // $altUrlConfiguration['JSwindow.']['altUrl'] = '/alternative-url'; + // yield 'JSwindow.altUrl forces an alternative url.' => [ + // 'content' => $imageTag, + // 'configuration' => $altUrlConfiguration, + // 'expected' => [ + // '<a href="/alternative-url' => true, + // 'data-window-url="/alternative-url' => true, + // ], + // ]; $altUrlConfigurationNoDefault = $defaultConfiguration; $altUrlConfigurationNoDefault['JSwindow.']['altUrl'] = '/alternative-url'; diff --git a/typo3/sysext/impexp/Tests/Functional/ExportTest.php b/typo3/sysext/impexp/Tests/Functional/ExportTest.php index 70789227985095dcec1f66ee3f59410c5226aaaf..379589781de607c309b454ccd7812336dc826b96 100644 --- a/typo3/sysext/impexp/Tests/Functional/ExportTest.php +++ b/typo3/sysext/impexp/Tests/Functional/ExportTest.php @@ -144,13 +144,13 @@ class ExportTest extends AbstractImportExportTestCase $this->exportMock->setRecordTypesIncludeFields($this->recordTypesIncludeFields); $this->exportMock->process(); $previewData = $this->exportMock->renderPreview(); -// file_put_contents( -// __DIR__ . '/Fixtures/ArrayAssertions/RenderPreviewExportPageAndRecords.php', -// str_replace( -// ['array (', '),', ');'], -// ['[', '],', '];'], -// '<?php' . "\n\nreturn " . var_export($previewData, true) . ";\n") -// ); + // file_put_contents( + // __DIR__ . '/Fixtures/ArrayAssertions/RenderPreviewExportPageAndRecords.php', + // str_replace( + // ['array (', '),', ');'], + // ['[', '],', '];'], + // '<?php' . "\n\nreturn " . var_export($previewData, true) . ";\n") + // ); self::assertEquals($renderPreviewExport, $previewData); } @@ -171,13 +171,13 @@ class ExportTest extends AbstractImportExportTestCase $this->exportMock->setRecordTypesIncludeFields($this->recordTypesIncludeFields); $this->exportMock->process(); $previewData = $this->exportMock->renderPreview(); -// file_put_contents( -// __DIR__ . '/Fixtures/ArrayAssertions/RenderPreviewExportPageAndRecordsWithSoftRefs.php', -// str_replace( -// ['array (', '),', ');'], -// ['[', '],', '];'], -// '<?php' . "\n\nreturn " . var_export($previewData, true) . ";\n") -// ); + // file_put_contents( + // __DIR__ . '/Fixtures/ArrayAssertions/RenderPreviewExportPageAndRecordsWithSoftRefs.php', + // str_replace( + // ['array (', '),', ');'], + // ['[', '],', '];'], + // '<?php' . "\n\nreturn " . var_export($previewData, true) . ";\n") + // ); self::assertEquals($renderPreviewExport, $previewData); } @@ -197,13 +197,13 @@ class ExportTest extends AbstractImportExportTestCase $this->exportMock->setRecordTypesIncludeFields($this->recordTypesIncludeFields); $this->exportMock->process(); $previewData = $this->exportMock->renderPreview(); -// file_put_contents( -// __DIR__ . '/Fixtures/ArrayAssertions/RenderPreviewExportTable.php', -// str_replace( -// ['array (', '),', ');'], -// ['[', '],', '];'], -// '<?php' . "\n\nreturn " . var_export($previewData, true) . ";\n") -// ); + // file_put_contents( + // __DIR__ . '/Fixtures/ArrayAssertions/RenderPreviewExportTable.php', + // str_replace( + // ['array (', '),', ');'], + // ['[', '],', '];'], + // '<?php' . "\n\nreturn " . var_export($previewData, true) . ";\n") + // ); self::assertEquals($renderPreviewExport, $previewData); } @@ -223,13 +223,13 @@ class ExportTest extends AbstractImportExportTestCase $this->exportMock->setRecordTypesIncludeFields($this->recordTypesIncludeFields); $this->exportMock->process(); $previewData = $this->exportMock->renderPreview(); -// file_put_contents( -// __DIR__ . '/Fixtures/ArrayAssertions/RenderPreviewExportRecords.php', -// str_replace( -// ['array (', '),', ');'], -// ['[', '],', '];'], -// '<?php' . "\n\nreturn " . var_export($previewData, true) . ";\n") -// ); + // file_put_contents( + // __DIR__ . '/Fixtures/ArrayAssertions/RenderPreviewExportRecords.php', + // str_replace( + // ['array (', '),', ');'], + // ['[', '],', '];'], + // '<?php' . "\n\nreturn " . var_export($previewData, true) . ";\n") + // ); self::assertEquals($renderPreviewExport, $previewData); } diff --git a/typo3/sysext/impexp/Tests/Functional/ImportTest.php b/typo3/sysext/impexp/Tests/Functional/ImportTest.php index 6b401f4ce4010924149ab0642d91afa552387fcf..74139682af06861fb9133ebaed0de3bc9dd06210 100644 --- a/typo3/sysext/impexp/Tests/Functional/ImportTest.php +++ b/typo3/sysext/impexp/Tests/Functional/ImportTest.php @@ -87,13 +87,13 @@ class ImportTest extends AbstractImportExportTestCase $importMock->setPid(0); $importMock->loadFile('EXT:impexp/Tests/Functional/Fixtures/XmlImports/pages-and-ttcontent.xml'); $previewData = $importMock->renderPreview(); -// file_put_contents( -// __DIR__ . '/Fixtures/ArrayAssertions/RenderPreviewImportPageAndRecords.php', -// str_replace( -// ['array (', '),', ');'], -// ['[', '],', '];'], -// '<?php' . "\n\nreturn " . var_export($previewData, true) . ";\n") -// ); + // file_put_contents( + // __DIR__ . '/Fixtures/ArrayAssertions/RenderPreviewImportPageAndRecords.php', + // str_replace( + // ['array (', '),', ');'], + // ['[', '],', '];'], + // '<?php' . "\n\nreturn " . var_export($previewData, true) . ";\n") + // ); self::assertEquals($renderPreviewImport, $previewData); } @@ -110,13 +110,13 @@ class ImportTest extends AbstractImportExportTestCase $importMock->importData(); $importMock->setUpdate(true); $previewData = $importMock->renderPreview(); -// file_put_contents( -// __DIR__ . '/Fixtures/ArrayAssertions/RenderPreviewImportPageAndRecordsByUpdate.php', -// str_replace( -// ['array (', '),', ');'], -// ['[', '],', '];'], -// '<?php' . "\n\nreturn " . var_export($previewData, true) . ";\n") -// ); + // file_put_contents( + // __DIR__ . '/Fixtures/ArrayAssertions/RenderPreviewImportPageAndRecordsByUpdate.php', + // str_replace( + // ['array (', '),', ');'], + // ['[', '],', '];'], + // '<?php' . "\n\nreturn " . var_export($previewData, true) . ";\n") + // ); self::assertEquals($renderPreviewImport, $previewData); } @@ -134,13 +134,13 @@ class ImportTest extends AbstractImportExportTestCase $importMock->setShowDiff(true); $importMock->loadFile('EXT:impexp/Tests/Functional/Fixtures/XmlImports/pages-and-ttcontent-with-two-images.xml'); $previewData = $importMock->renderPreview(); -// file_put_contents( -// __DIR__ . '/Fixtures/ArrayAssertions/RenderPreviewImportPageAndRecordsWithDiff.php', -// str_replace( -// ['array (', '),', ');'], -// ['[', '],', '];'], -// '<?php' . "\n\nreturn " . var_export($previewData, true) . ";\n") -// ); + // file_put_contents( + // __DIR__ . '/Fixtures/ArrayAssertions/RenderPreviewImportPageAndRecordsWithDiff.php', + // str_replace( + // ['array (', '),', ');'], + // ['[', '],', '];'], + // '<?php' . "\n\nreturn " . var_export($previewData, true) . ";\n") + // ); self::assertEquals($renderPreviewImport, $previewData); } @@ -159,13 +159,13 @@ class ImportTest extends AbstractImportExportTestCase $importMock->setUpdate(true); $importMock->loadFile('EXT:impexp/Tests/Functional/Fixtures/XmlImports/pages-and-ttcontent-with-two-images.xml'); $previewData = $importMock->renderPreview(); -// file_put_contents( -// __DIR__ . '/Fixtures/ArrayAssertions/RenderPreviewImportPageAndRecordsByUpdateWithDiff.php', -// str_replace( -// ['array (', '),', ');'], -// ['[', '],', '];'], -// '<?php' . "\n\nreturn " . var_export($previewData, true) . ";\n") -// ); + // file_put_contents( + // __DIR__ . '/Fixtures/ArrayAssertions/RenderPreviewImportPageAndRecordsByUpdateWithDiff.php', + // str_replace( + // ['array (', '),', ');'], + // ['[', '],', '];'], + // '<?php' . "\n\nreturn " . var_export($previewData, true) . ";\n") + // ); self::assertEquals($renderPreviewImport, $previewData); } @@ -180,13 +180,13 @@ class ImportTest extends AbstractImportExportTestCase $importMock->setPid(0); $importMock->loadFile('EXT:impexp/Tests/Functional/Fixtures/XmlImports/pages-and-ttcontent-with-softrefs.xml'); $previewData = $importMock->renderPreview(); -// file_put_contents( -// __DIR__ . '/Fixtures/ArrayAssertions/RenderPreviewImportPageAndRecordsWithSoftRefs.php', -// str_replace( -// ['array (', '),', ');'], -// ['[', '],', '];'], -// '<?php' . "\n\nreturn " . var_export($previewData, true) . ";\n") -// ); + // file_put_contents( + // __DIR__ . '/Fixtures/ArrayAssertions/RenderPreviewImportPageAndRecordsWithSoftRefs.php', + // str_replace( + // ['array (', '),', ');'], + // ['[', '],', '];'], + // '<?php' . "\n\nreturn " . var_export($previewData, true) . ";\n") + // ); self::assertEquals($renderPreviewImport, $previewData); } diff --git a/typo3/sysext/indexed_search/Classes/Hook/TypoScriptFrontendHook.php b/typo3/sysext/indexed_search/Classes/Hook/TypoScriptFrontendHook.php index 1cb32bf20e962b34b238c22bcb4aba7089db7726..c6e9834989624075baced57bc9cfae2d9b8e1895 100644 --- a/typo3/sysext/indexed_search/Classes/Hook/TypoScriptFrontendHook.php +++ b/typo3/sysext/indexed_search/Classes/Hook/TypoScriptFrontendHook.php @@ -88,7 +88,7 @@ class TypoScriptFrontendHook // Page id 'id' => $tsfe->id, // Page type - 'type'=> $tsfe->type, + 'type' => $tsfe->type, // sys_language UID 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 6d8d502681bede6c948a5d4746496ec9ca6ff4e8..b60402a0cfc330832d2f500dd0dc08ce3afd2971 100644 --- a/typo3/sysext/install/Classes/FolderStructure/DefaultFactory.php +++ b/typo3/sysext/install/Classes/FolderStructure/DefaultFactory.php @@ -143,7 +143,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 089f7522e926096ad49e8cb4d9007640d66590c7..a0d401b7614588b7d5c089e6fe90cc8b8e144a42 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/Unit/Updates/RowUpdater/L18nDiffsourceToJsonMigrationTest.php b/typo3/sysext/install/Tests/Unit/Updates/RowUpdater/L18nDiffsourceToJsonMigrationTest.php index 5c2de1eae86fca3b7fa3e771a65af91871c34ad4..e4b6e9927e0726eab3d4c89980250162277e8057 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 @@ 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 @@ class L18nDiffsourceToJsonMigrationTest extends UnitTestCase { $GLOBALS['TCA']['testTable'] = [ 'ctrl' => [ - 'transOrigDiffSourceField' =>'l10n_diffsource', + 'transOrigDiffSourceField' => 'l10n_diffsource', ], ]; $row = []; @@ -117,7 +117,7 @@ class L18nDiffsourceToJsonMigrationTest extends UnitTestCase { $GLOBALS['TCA']['testTable'] = [ 'ctrl' => [ - 'transOrigDiffSourceField' =>'l10n_diffsource', + 'transOrigDiffSourceField' => 'l10n_diffsource', ], ]; $row = ['l10n_diffsource' => $input]; diff --git a/typo3/sysext/install/Tests/Unit/UpgradeAnalysis/DocumentationFileTest.php b/typo3/sysext/install/Tests/Unit/UpgradeAnalysis/DocumentationFileTest.php index 7e8e5e9167ff8c53078dd716ab35545b22ca35ed..cfe752c6aea8c1c3a64252de4acffa7d082618ba 100644 --- a/typo3/sysext/install/Tests/Unit/UpgradeAnalysis/DocumentationFileTest.php +++ b/typo3/sysext/install/Tests/Unit/UpgradeAnalysis/DocumentationFileTest.php @@ -86,13 +86,13 @@ class DocumentationFileTest extends UnitTestCase '2.0' => [ 'Important-98574-Issue.rst' => implode("\n", $content_98574), ], - $currentVersion-3 . '.0' => [ + $currentVersion - 3 . '.0' => [ 'Important-98574-Issue.rst' => implode("\n", $content_98574), ], - $currentVersion-2 . '.0' => [ + $currentVersion - 2 . '.0' => [ 'Important-98574-Issue.rst' => implode("\n", $content_98574), ], - $currentVersion-1 . '.0' => [ + $currentVersion - 1 . '.0' => [ 'Important-98574-Issue.rst' => implode("\n", $content_98574), ], $currentVersion . '.0' => [ @@ -153,8 +153,8 @@ class DocumentationFileTest extends UnitTestCase { $currentVersion = (int)explode('.', VersionNumberUtility::getNumericTypo3Version())[0]; $expected = [ - $currentVersion-2 . '.0' => [], - $currentVersion-1 . '.0' => [], + $currentVersion - 2 . '.0' => [], + $currentVersion - 1 . '.0' => [], $currentVersion . '.0' => [], 'master' => [], ]; diff --git a/typo3/sysext/lowlevel/Classes/Command/MissingRelationsCommand.php b/typo3/sysext/lowlevel/Classes/Command/MissingRelationsCommand.php index 59f081195aaa6d069696880b7b45473cc81b90dc..f4ae4d81629d93edd1fbb4cd63f8baf821a0ef66 100644 --- a/typo3/sysext/lowlevel/Classes/Command/MissingRelationsCommand.php +++ b/typo3/sysext/lowlevel/Classes/Command/MissingRelationsCommand.php @@ -292,7 +292,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/recordlist/Classes/RecordList/DatabaseRecordList.php b/typo3/sysext/recordlist/Classes/RecordList/DatabaseRecordList.php index 7b5b72c8f19be956555c741c5661656e36849230..8d0b4c15af3663b485c084f06f76d70e8a2e6ef0 100644 --- a/typo3/sysext/recordlist/Classes/RecordList/DatabaseRecordList.php +++ b/typo3/sysext/recordlist/Classes/RecordList/DatabaseRecordList.php @@ -1378,7 +1378,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, ]) @@ -1558,7 +1558,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/redirects/Classes/Repository/RedirectRepository.php b/typo3/sysext/redirects/Classes/Repository/RedirectRepository.php index 182f8ca61fab602b568a83d036633b8fb3ef78eb..c1c35ee9ba350894d80f2bab6c0f6e7be92b9f39 100644 --- a/typo3/sysext/redirects/Classes/Repository/RedirectRepository.php +++ b/typo3/sysext/redirects/Classes/Repository/RedirectRepository.php @@ -73,7 +73,7 @@ class RedirectRepository $constraints = []; if ($demand->hasSourceHosts()) { - $constraints[] =$queryBuilder->expr()->in( + $constraints[] = $queryBuilder->expr()->in( 'source_host', $queryBuilder->createNamedParameter($demand->getSourceHosts(), Connection::PARAM_STR_ARRAY) ); diff --git a/typo3/sysext/redirects/Configuration/TCA/sys_redirect.php b/typo3/sysext/redirects/Configuration/TCA/sys_redirect.php index 80bd7de2bbb6bd1a7e6f8924a11fd74b8b6e9551..bdf36772d9dcbd67a786e959e0eabe73d43cb2d4 100644 --- a/typo3/sysext/redirects/Configuration/TCA/sys_redirect.php +++ b/typo3/sysext/redirects/Configuration/TCA/sys_redirect.php @@ -142,7 +142,7 @@ return [ 'label' => 'LLL:EXT:redirects/Resources/Private/Language/locallang_db.xlf:sys_redirect.target', 'config' => [ 'type' => 'input', - 'eval' =>'required', + 'eval' => 'required', 'renderType' => 'inputLink', 'softref' => 'typolink', 'fieldControl' => [