Commit 07e566f0 authored by Stefan Neufeind's avatar Stefan Neufeind Committed by Christian Kuhn
Browse files

[TASK] Update php-cs-fixer to v2.10.2

Adjusts comment-indentions for else/elseif.

Commands used:
* composer update friendsofphp/php-cs-fixer --with-dependencies
* Build/Scripts/cglFixMyCommit.sh (modified to run on all php-files)

Resolves: #83851
Releases: master
Change-Id: I0390b3fd612ea2c495696faf9364418a078cd586
Reviewed-on: https://review.typo3.org/55669


Tested-by: default avatarTYPO3com <no-reply@typo3.com>
Reviewed-by: Georg Ringer's avatarGeorg Ringer <georg.ringer@gmail.com>
Tested-by: Georg Ringer's avatarGeorg Ringer <georg.ringer@gmail.com>
Reviewed-by: default avatarTobi Kretschmann <tobi@tobishome.de>
Tested-by: default avatarTobi Kretschmann <tobi@tobishome.de>
Reviewed-by: Christian Kuhn's avatarChristian Kuhn <lolli@schwarzbu.ch>
Tested-by: Christian Kuhn's avatarChristian Kuhn <lolli@schwarzbu.ch>
parent f6a34fe1
......@@ -2089,16 +2089,16 @@
},
{
"name": "friendsofphp/php-cs-fixer",
"version": "v2.9.0",
"version": "v2.10.2",
"source": {
"type": "git",
"url": "https://github.com/FriendsOfPHP/PHP-CS-Fixer.git",
"reference": "454ddbe65da6a9297446f442bad244e8a99a9a38"
"reference": "74e4682a4073bc8bc2d4ff2b30a4873ac76cc1f1"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/454ddbe65da6a9297446f442bad244e8a99a9a38",
"reference": "454ddbe65da6a9297446f442bad244e8a99a9a38",
"url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/74e4682a4073bc8bc2d4ff2b30a4873ac76cc1f1",
"reference": "74e4682a4073bc8bc2d4ff2b30a4873ac76cc1f1",
"shasum": ""
},
"require": {
......@@ -2125,10 +2125,12 @@
"require-dev": {
"johnkary/phpunit-speedtrap": "^1.1 || ^2.0@dev",
"justinrainbow/json-schema": "^5.0",
"keradus/cli-executor": "^1.0",
"mikey179/vfsstream": "^1.6",
"php-coveralls/php-coveralls": "^2.0",
"php-cs-fixer/accessible-object": "^1.0",
"phpunit/phpunit": "^5.7.23 || ^6.4.3",
"phpunitgoodpractices/traits": "^1.0",
"symfony/phpunit-bridge": "^3.2.2 || ^4.0"
},
"suggest": {
......@@ -2144,11 +2146,15 @@
"PhpCsFixer\\": "src/"
},
"classmap": [
"tests/Test/Assert/AssertTokensTrait.php",
"tests/Test/AbstractFixerTestCase.php",
"tests/Test/AbstractIntegrationCaseFactory.php",
"tests/Test/AbstractIntegrationTestCase.php",
"tests/Test/Assert/AssertTokensTrait.php",
"tests/Test/IntegrationCase.php",
"tests/Test/IntegrationCaseFactory.php"
"tests/Test/IntegrationCaseFactory.php",
"tests/Test/IntegrationCaseFactoryInterface.php",
"tests/Test/InternalIntegrationCaseFactory.php",
"tests/TestCase.php"
]
},
"notification-url": "https://packagist.org/downloads/",
......@@ -2166,32 +2172,35 @@
}
],
"description": "A tool to automatically fix PHP code style",
"time": "2017-12-08T16:36:20+00:00"
"time": "2018-02-03T08:30:06+00:00"
},
{
"name": "gecko-packages/gecko-php-unit",
"version": "v3.0",
"version": "v3.1.1",
"source": {
"type": "git",
"url": "https://github.com/GeckoPackages/GeckoPHPUnit.git",
"reference": "6a866551dffc2154c1b091bae3a7877d39c25ca3"
"reference": "8b0320158e34c3d85e5133c341d55c4d6ec5e927"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/GeckoPackages/GeckoPHPUnit/zipball/6a866551dffc2154c1b091bae3a7877d39c25ca3",
"reference": "6a866551dffc2154c1b091bae3a7877d39c25ca3",
"url": "https://api.github.com/repos/GeckoPackages/GeckoPHPUnit/zipball/8b0320158e34c3d85e5133c341d55c4d6ec5e927",
"reference": "8b0320158e34c3d85e5133c341d55c4d6ec5e927",
"shasum": ""
},
"require": {
"php": "^7.0"
},
"conflict": {
"phpunit/phpunit": "<6.0 || >6.5"
},
"require-dev": {
"phpunit/phpunit": "^6.0"
},
"suggest": {
"ext-dom": "When testing with xml.",
"ext-libxml": "When testing with xml.",
"phpunit/phpunit": "This is an extension for it so make sure you have it some way."
"phpunit/phpunit": "This is an extension for PHPUnit so make sure you have that in some way."
},
"type": "library",
"extra": {
......@@ -2215,7 +2224,7 @@
"filesystem",
"phpunit"
],
"time": "2017-08-23T07:46:41+00:00"
"time": "2018-02-05T09:18:39+00:00"
},
{
"name": "mikey179/vfsStream",
......@@ -2457,16 +2466,16 @@
},
{
"name": "php-cs-fixer/diff",
"version": "v1.2.0",
"version": "v1.2.1",
"source": {
"type": "git",
"url": "https://github.com/PHP-CS-Fixer/diff.git",
"reference": "f0ef6133d674137e902fdf8a6f2e8e97e14a087b"
"reference": "b95b8c02c58670b15612cfc60873f3f7f5290484"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/PHP-CS-Fixer/diff/zipball/f0ef6133d674137e902fdf8a6f2e8e97e14a087b",
"reference": "f0ef6133d674137e902fdf8a6f2e8e97e14a087b",
"url": "https://api.github.com/repos/PHP-CS-Fixer/diff/zipball/b95b8c02c58670b15612cfc60873f3f7f5290484",
"reference": "b95b8c02c58670b15612cfc60873f3f7f5290484",
"shasum": ""
},
"require": {
......@@ -2483,6 +2492,9 @@
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"BSD-3-Clause"
],
"authors": [
{
"name": "Kore Nordmann",
......@@ -2501,7 +2513,7 @@
"keywords": [
"diff"
],
"time": "2017-10-19T09:58:18+00:00"
"time": "2017-10-21T10:28:17+00:00"
},
{
"name": "phpdocumentor/reflection-common",
......@@ -3877,16 +3889,16 @@
},
{
"name": "symfony/event-dispatcher",
"version": "v3.4.1",
"version": "v3.4.4",
"source": {
"type": "git",
"url": "https://github.com/symfony/event-dispatcher.git",
"reference": "ca20b8f9ef149f40ff656d52965f240d85f7a8e4"
"reference": "26b87b6bca8f8f797331a30b76fdae5342dc26ca"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/ca20b8f9ef149f40ff656d52965f240d85f7a8e4",
"reference": "ca20b8f9ef149f40ff656d52965f240d85f7a8e4",
"url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/26b87b6bca8f8f797331a30b76fdae5342dc26ca",
"reference": "26b87b6bca8f8f797331a30b76fdae5342dc26ca",
"shasum": ""
},
"require": {
......@@ -3936,20 +3948,20 @@
],
"description": "Symfony EventDispatcher Component",
"homepage": "https://symfony.com",
"time": "2017-11-09T14:14:31+00:00"
"time": "2018-01-03T07:37:34+00:00"
},
{
"name": "symfony/filesystem",
"version": "v4.0.1",
"version": "v4.0.4",
"source": {
"type": "git",
"url": "https://github.com/symfony/filesystem.git",
"reference": "c9d4a26759ff75a077e4e334315cb632739b661a"
"reference": "760e47a4ee64b4c48f4b30017011e09d4c0f05ed"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/filesystem/zipball/c9d4a26759ff75a077e4e334315cb632739b661a",
"reference": "c9d4a26759ff75a077e4e334315cb632739b661a",
"url": "https://api.github.com/repos/symfony/filesystem/zipball/760e47a4ee64b4c48f4b30017011e09d4c0f05ed",
"reference": "760e47a4ee64b4c48f4b30017011e09d4c0f05ed",
"shasum": ""
},
"require": {
......@@ -3985,20 +3997,20 @@
],
"description": "Symfony Filesystem Component",
"homepage": "https://symfony.com",
"time": "2017-11-21T14:14:53+00:00"
"time": "2018-01-03T07:38:00+00:00"
},
{
"name": "symfony/options-resolver",
"version": "v4.0.1",
"version": "v4.0.4",
"source": {
"type": "git",
"url": "https://github.com/symfony/options-resolver.git",
"reference": "ef617a2867c7d889d4ecee3c29595698d87474a4"
"reference": "371532a2cfe932f7a3766dd4c45364566def1dd0"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/options-resolver/zipball/ef617a2867c7d889d4ecee3c29595698d87474a4",
"reference": "ef617a2867c7d889d4ecee3c29595698d87474a4",
"url": "https://api.github.com/repos/symfony/options-resolver/zipball/371532a2cfe932f7a3766dd4c45364566def1dd0",
"reference": "371532a2cfe932f7a3766dd4c45364566def1dd0",
"shasum": ""
},
"require": {
......@@ -4039,7 +4051,7 @@
"configuration",
"options"
],
"time": "2017-11-07T14:45:01+00:00"
"time": "2018-01-18T22:19:33+00:00"
},
{
"name": "symfony/polyfill-php54",
......@@ -4101,16 +4113,16 @@
},
{
"name": "symfony/polyfill-php70",
"version": "v1.6.0",
"version": "v1.7.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php70.git",
"reference": "0442b9c0596610bd24ae7b5f0a6cdbbc16d9fcff"
"reference": "3532bfcd8f933a7816f3a0a59682fc404776600f"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/0442b9c0596610bd24ae7b5f0a6cdbbc16d9fcff",
"reference": "0442b9c0596610bd24ae7b5f0a6cdbbc16d9fcff",
"url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/3532bfcd8f933a7816f3a0a59682fc404776600f",
"reference": "3532bfcd8f933a7816f3a0a59682fc404776600f",
"shasum": ""
},
"require": {
......@@ -4120,7 +4132,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.6-dev"
"dev-master": "1.7-dev"
}
},
"autoload": {
......@@ -4156,20 +4168,20 @@
"portable",
"shim"
],
"time": "2017-10-11T12:05:26+00:00"
"time": "2018-01-30T19:27:44+00:00"
},
{
"name": "symfony/polyfill-php72",
"version": "v1.6.0",
"version": "v1.7.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php72.git",
"reference": "6de4f4884b97abbbed9f0a84a95ff2ff77254254"
"reference": "8eca20c8a369e069d4f4c2ac9895144112867422"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/6de4f4884b97abbbed9f0a84a95ff2ff77254254",
"reference": "6de4f4884b97abbbed9f0a84a95ff2ff77254254",
"url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/8eca20c8a369e069d4f4c2ac9895144112867422",
"reference": "8eca20c8a369e069d4f4c2ac9895144112867422",
"shasum": ""
},
"require": {
......@@ -4178,7 +4190,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.6-dev"
"dev-master": "1.7-dev"
}
},
"autoload": {
......@@ -4211,20 +4223,20 @@
"portable",
"shim"
],
"time": "2017-10-11T12:05:26+00:00"
"time": "2018-01-31T17:43:24+00:00"
},
{
"name": "symfony/process",
"version": "v3.4.1",
"version": "v3.4.4",
"source": {
"type": "git",
"url": "https://github.com/symfony/process.git",
"reference": "db25e810fd5e124085e3777257d0cf4ae533d0ea"
"reference": "09a5172057be8fc677840e591b17f385e58c7c0d"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/process/zipball/db25e810fd5e124085e3777257d0cf4ae533d0ea",
"reference": "db25e810fd5e124085e3777257d0cf4ae533d0ea",
"url": "https://api.github.com/repos/symfony/process/zipball/09a5172057be8fc677840e591b17f385e58c7c0d",
"reference": "09a5172057be8fc677840e591b17f385e58c7c0d",
"shasum": ""
},
"require": {
......@@ -4260,20 +4272,20 @@
],
"description": "Symfony Process Component",
"homepage": "https://symfony.com",
"time": "2017-11-22T12:18:49+00:00"
"time": "2018-01-29T09:03:43+00:00"
},
{
"name": "symfony/stopwatch",
"version": "v4.0.1",
"version": "v4.0.4",
"source": {
"type": "git",
"url": "https://github.com/symfony/stopwatch.git",
"reference": "ac0e49150555c703fef6b696d8eaba1db7a3ca03"
"reference": "d52321f0e2b596bd03b5d1dd6eebe71caa925704"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/stopwatch/zipball/ac0e49150555c703fef6b696d8eaba1db7a3ca03",
"reference": "ac0e49150555c703fef6b696d8eaba1db7a3ca03",
"url": "https://api.github.com/repos/symfony/stopwatch/zipball/d52321f0e2b596bd03b5d1dd6eebe71caa925704",
"reference": "d52321f0e2b596bd03b5d1dd6eebe71caa925704",
"shasum": ""
},
"require": {
......@@ -4309,7 +4321,7 @@
],
"description": "Symfony Stopwatch Component",
"homepage": "https://symfony.com",
"time": "2017-11-09T12:45:29+00:00"
"time": "2018-01-03T07:38:00+00:00"
},
{
"name": "theseer/tokenizer",
......
......@@ -306,7 +306,7 @@ class ElementInformationController
true
);
// else check if we can create an Image preview
// else check if we can create an Image preview
} elseif (GeneralUtility::inList($GLOBALS['TYPO3_CONF_VARS']['GFX']['imagefile_ext'], $fileExtension)) {
$preview['fileObject'] = $this->fileObject;
$preview['width'] = $width;
......
......@@ -283,7 +283,7 @@ class InlineStackProcessor
$parts[] = implode('][', $levelData['flexform']);
}
$name = '[' . implode('][', $parts) . ']';
// Use in object id attributes:
// Use in object id attributes:
} else {
$name = implode('-', $parts);
......
......@@ -3987,7 +3987,7 @@ class DataHandler implements LoggerAwareInterface
} else {
if (!MathUtility::canBeInterpretedAsInteger($realDestPid)) {
$newId = $this->copyRecord($v['table'], $v['id'], -$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
......@@ -4001,7 +4001,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
......@@ -7754,14 +7754,14 @@ 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.
// 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.
// Null values are allowed, and currently there's a NULL value.
// Thus, check whether a NULL value was submitted.
} else {
$result = ($submittedValue === null);
......
......@@ -972,7 +972,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 {
......
......@@ -1117,7 +1117,7 @@ class FileList
$theData[$field] .= '<span class="label label-danger label-space-left">'
. htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:warning.file_missing'))
. '</span>';
// Thumbnails?
// Thumbnails?
} elseif ($this->thumbs && ($this->isImage($ext) || $this->isMediaFile($ext))) {
$processedFile = $fileObject->process(
ProcessedFile::CONTEXT_IMAGEPREVIEW,
......
......@@ -1626,7 +1626,7 @@ abstract class AbstractMenuContentObject
// Links to emails should not have any target
if (stripos($externalUrl, 'mailto:') === 0) {
$LD['target'] = '';
// use external target for the URL
// use external target for the URL
} elseif (empty($LD['target']) && !empty($this->getTypoScriptFrontendController()->extTarget)) {
$LD['target'] = $this->getTypoScriptFrontendController()->extTarget;
}
......
......@@ -3043,7 +3043,7 @@ class TypoScriptFrontendController implements LoggerAwareInterface
// Actually $cachedRow contains content that we could show instead of rendering. Maybe we should do that to gain more performance but then we should set all the stuff done in $this->getFromCache()... For now we stick to this...
$this->set_no_cache('Another process wrote into the cache since the beginning of the render process', true);
// Since the new Locking API this should never be the case
// Since the new Locking API this should never be the case
} else {
$this->tempContent = true;
// This flag shows that temporary content is put in the cache
......
......@@ -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) {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment