Update php-cs-fixer to 3.9 and fix new violations

This commit is contained in:
Christian Münch committed 2023-01-25 15:26:01 +01:00
1 parent a318cd9797
commit 2ed1b2bdc9
11 files changed
+81 -144

No files matched your search

+2 -2
View File
@@ -20,11 +20,11 @@ return (new PhpCsFixer\Config())
'no_multiline_whitespace_around_double_arrow' => true,
'multiline_whitespace_before_semicolons' => false,
'no_singleline_whitespace_before_semicolons' => true,
'no_trailing_comma_in_singleline_array' => true,
'no_trailing_comma_in_singleline' => true,
'no_unused_imports' => true,
'no_whitespace_in_blank_line' => true,
'object_operator_without_whitespace' => true,
'ordered_imports' => true,
'standardize_not_equals' => true,
'ternary_operator_spaces' => true,
]);
]);
+1 -1
View File
@@ -51,7 +51,7 @@
"require-dev": {
"bamarni/symfony-console-autocomplete": "^1.2.0",
"captainhook/captainhook": "^5.3",
"friendsofphp/php-cs-fixer": "~3.4.0",
"friendsofphp/php-cs-fixer": "^3.8",
"mikey179/vfsstream": "^1.6",
"phpstan/phpstan": "^1.8.5",
"phpunit/phpunit": "^9",
Generated
+73 -126
View File
@@ -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": "55537da0814d2fb72250feb6c7b8f7c8",
"content-hash": "2794309fa18feb180491709129504e95",
"packages": [
{
"name": "dflydev/dot-access-data",
@@ -946,16 +946,16 @@
},
{
"name": "symfony/event-dispatcher",
"version": "v5.4.17",
"version": "v5.4.19",
"source": {
"type": "git",
"url": "https://github.com/symfony/event-dispatcher.git",
"reference": "8e18a9d559eb8ebc2220588f1faa726a2fcd31c9"
"reference": "abf49cc084c087d94b4cb939c3f3672971784e0c"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/8e18a9d559eb8ebc2220588f1faa726a2fcd31c9",
"reference": "8e18a9d559eb8ebc2220588f1faa726a2fcd31c9",
"url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/abf49cc084c087d94b4cb939c3f3672971784e0c",
"reference": "abf49cc084c087d94b4cb939c3f3672971784e0c",
"shasum": ""
},
"require": {
@@ -1011,7 +1011,7 @@
"description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/event-dispatcher/tree/v5.4.17"
"source": "https://github.com/symfony/event-dispatcher/tree/v5.4.19"
},
"funding": [
{
@@ -1027,7 +1027,7 @@
"type": "tidelift"
}
],
"time": "2022-12-12T15:54:21+00:00"
"time": "2023-01-01T08:32:19+00:00"
},
{
"name": "symfony/event-dispatcher-contracts",
@@ -2546,30 +2546,30 @@
},
{
"name": "composer/pcre",
"version": "1.0.1",
"version": "3.1.0",
"source": {
"type": "git",
"url": "https://github.com/composer/pcre.git",
"reference": "67a32d7d6f9f560b726ab25a061b38ff3a80c560"
"reference": "4bff79ddd77851fe3cdd11616ed3f92841ba5bd2"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/composer/pcre/zipball/67a32d7d6f9f560b726ab25a061b38ff3a80c560",
"reference": "67a32d7d6f9f560b726ab25a061b38ff3a80c560",
"url": "https://api.github.com/repos/composer/pcre/zipball/4bff79ddd77851fe3cdd11616ed3f92841ba5bd2",
"reference": "4bff79ddd77851fe3cdd11616ed3f92841ba5bd2",
"shasum": ""
},
"require": {
"php": "^5.3.2 || ^7.0 || ^8.0"
"php": "^7.4 || ^8.0"
},
"require-dev": {
"phpstan/phpstan": "^1.3",
"phpstan/phpstan-strict-rules": "^1.1",
"symfony/phpunit-bridge": "^4.2 || ^5"
"symfony/phpunit-bridge": "^5"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-main": "1.x-dev"
"dev-main": "3.x-dev"
}
},
"autoload": {
@@ -2597,7 +2597,7 @@
],
"support": {
"issues": "https://github.com/composer/pcre/issues",
"source": "https://github.com/composer/pcre/tree/1.0.1"
"source": "https://github.com/composer/pcre/tree/3.1.0"
},
"funding": [
{
@@ -2613,7 +2613,7 @@
"type": "tidelift"
}
],
"time": "2022-01-21T20:24:37+00:00"
"time": "2022-11-17T09:50:14+00:00"
},
{
"name": "composer/semver",
@@ -2698,27 +2698,27 @@
},
{
"name": "composer/xdebug-handler",
"version": "2.0.5",
"version": "3.0.3",
"source": {
"type": "git",
"url": "https://github.com/composer/xdebug-handler.git",
"reference": "9e36aeed4616366d2b690bdce11f71e9178c579a"
"reference": "ced299686f41dce890debac69273b47ffe98a40c"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/composer/xdebug-handler/zipball/9e36aeed4616366d2b690bdce11f71e9178c579a",
"reference": "9e36aeed4616366d2b690bdce11f71e9178c579a",
"url": "https://api.github.com/repos/composer/xdebug-handler/zipball/ced299686f41dce890debac69273b47ffe98a40c",
"reference": "ced299686f41dce890debac69273b47ffe98a40c",
"shasum": ""
},
"require": {
"composer/pcre": "^1",
"php": "^5.3.2 || ^7.0 || ^8.0",
"composer/pcre": "^1 || ^2 || ^3",
"php": "^7.2.5 || ^8.0",
"psr/log": "^1 || ^2 || ^3"
},
"require-dev": {
"phpstan/phpstan": "^1.0",
"phpstan/phpstan-strict-rules": "^1.1",
"symfony/phpunit-bridge": "^4.2 || ^5.0 || ^6.0"
"symfony/phpunit-bridge": "^6.0"
},
"type": "library",
"autoload": {
@@ -2744,7 +2744,7 @@
"support": {
"irc": "irc://irc.freenode.org/composer",
"issues": "https://github.com/composer/xdebug-handler/issues",
"source": "https://github.com/composer/xdebug-handler/tree/2.0.5"
"source": "https://github.com/composer/xdebug-handler/tree/3.0.3"
},
"funding": [
{
@@ -2760,7 +2760,7 @@
"type": "tidelift"
}
],
"time": "2022-02-24T20:20:32+00:00"
"time": "2022-02-25T21:32:43+00:00"
},
{
"name": "doctrine/annotations",
@@ -3031,52 +3031,52 @@
},
{
"name": "friendsofphp/php-cs-fixer",
"version": "v3.4.0",
"version": "v3.13.2",
"source": {
"type": "git",
"url": "https://github.com/FriendsOfPHP/PHP-CS-Fixer.git",
"reference": "47177af1cfb9dab5d1cc4daf91b7179c2efe7fad"
"url": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git",
"reference": "3952f08a81bd3b1b15e11c3de0b6bf037faa8496"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/47177af1cfb9dab5d1cc4daf91b7179c2efe7fad",
"reference": "47177af1cfb9dab5d1cc4daf91b7179c2efe7fad",
"url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/3952f08a81bd3b1b15e11c3de0b6bf037faa8496",
"reference": "3952f08a81bd3b1b15e11c3de0b6bf037faa8496",
"shasum": ""
},
"require": {
"composer/semver": "^3.2",
"composer/xdebug-handler": "^2.0",
"doctrine/annotations": "^1.12",
"composer/xdebug-handler": "^3.0.3",
"doctrine/annotations": "^1.13",
"ext-json": "*",
"ext-tokenizer": "*",
"php": "^7.2.5 || ^8.0",
"php-cs-fixer/diff": "^2.0",
"symfony/console": "^4.4.20 || ^5.1.3 || ^6.0",
"symfony/event-dispatcher": "^4.4.20 || ^5.0 || ^6.0",
"symfony/filesystem": "^4.4.20 || ^5.0 || ^6.0",
"symfony/finder": "^4.4.20 || ^5.0 || ^6.0",
"symfony/options-resolver": "^4.4.20 || ^5.0 || ^6.0",
"php": "^7.4 || ^8.0",
"sebastian/diff": "^4.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.23",
"symfony/polyfill-php81": "^1.23",
"symfony/process": "^4.4.20 || ^5.0 || ^6.0",
"symfony/stopwatch": "^4.4.20 || ^5.0 || ^6.0"
"symfony/polyfill-php80": "^1.25",
"symfony/polyfill-php81": "^1.25",
"symfony/process": "^5.4 || ^6.0",
"symfony/stopwatch": "^5.4 || ^6.0"
},
"require-dev": {
"justinrainbow/json-schema": "^5.2",
"keradus/cli-executor": "^1.5",
"mikey179/vfsstream": "^1.6.8",
"keradus/cli-executor": "^2.0",
"mikey179/vfsstream": "^1.6.10",
"php-coveralls/php-coveralls": "^2.5.2",
"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-phpunit": "^1.1 || ^2.0",
"phpunit/phpunit": "^8.5.21 || ^9.5",
"phpunitgoodpractices/polyfill": "^1.5",
"phpunitgoodpractices/traits": "^1.9.1",
"symfony/phpunit-bridge": "^5.2.4 || ^6.0",
"symfony/yaml": "^4.4.20 || ^5.0 || ^6.0"
"phpspec/prophecy-phpunit": "^2.0",
"phpunit/phpunit": "^9.5",
"phpunitgoodpractices/polyfill": "^1.6",
"phpunitgoodpractices/traits": "^1.9.2",
"symfony/phpunit-bridge": "^6.0",
"symfony/yaml": "^5.4 || ^6.0"
},
"suggest": {
"ext-dom": "For handling output formats in XML",
@@ -3107,8 +3107,8 @@
],
"description": "A tool to automatically fix PHP code style",
"support": {
"issues": "https://github.com/FriendsOfPHP/PHP-CS-Fixer/issues",
"source": "https://github.com/FriendsOfPHP/PHP-CS-Fixer/tree/v3.4.0"
"issues": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues",
"source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.13.2"
},
"funding": [
{
@@ -3116,7 +3116,7 @@
"type": "github"
}
],
"time": "2021-12-11T16:25:08+00:00"
"time": "2023-01-02T23:53:50+00:00"
},
{
"name": "mikey179/vfsstream",
@@ -3339,59 +3339,6 @@
},
"time": "2022-02-21T01:04:05+00:00"
},
{
"name": "php-cs-fixer/diff",
"version": "v2.0.2",
"source": {
"type": "git",
"url": "https://github.com/PHP-CS-Fixer/diff.git",
"reference": "29dc0d507e838c4580d018bd8b5cb412474f7ec3"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/PHP-CS-Fixer/diff/zipball/29dc0d507e838c4580d018bd8b5cb412474f7ec3",
"reference": "29dc0d507e838c4580d018bd8b5cb412474f7ec3",
"shasum": ""
},
"require": {
"php": "^5.6 || ^7.0 || ^8.0"
},
"require-dev": {
"phpunit/phpunit": "^5.7.23 || ^6.4.3 || ^7.0",
"symfony/process": "^3.3"
},
"type": "library",
"autoload": {
"classmap": [
"src/"
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"BSD-3-Clause"
],
"authors": [
{
"name": "Sebastian Bergmann",
"email": "sebastian@phpunit.de"
},
{
"name": "Kore Nordmann",
"email": "mail@kore-nordmann.de"
}
],
"description": "sebastian/diff v3 backport support for PHP 5.6+",
"homepage": "https://github.com/PHP-CS-Fixer",
"keywords": [
"diff"
],
"support": {
"issues": "https://github.com/PHP-CS-Fixer/diff/issues",
"source": "https://github.com/PHP-CS-Fixer/diff/tree/v2.0.2"
},
"abandoned": true,
"time": "2020-10-14T08:32:19+00:00"
},
{
"name": "phpstan/phpstan",
"version": "1.9.14",
@@ -5723,16 +5670,16 @@
},
{
"name": "symfony/filesystem",
"version": "v5.4.13",
"version": "v5.4.19",
"source": {
"type": "git",
"url": "https://github.com/symfony/filesystem.git",
"reference": "ac09569844a9109a5966b9438fc29113ce77cf51"
"reference": "648bfaca6a494f3e22378123bcee2894045dc9d8"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/filesystem/zipball/ac09569844a9109a5966b9438fc29113ce77cf51",
"reference": "ac09569844a9109a5966b9438fc29113ce77cf51",
"url": "https://api.github.com/repos/symfony/filesystem/zipball/648bfaca6a494f3e22378123bcee2894045dc9d8",
"reference": "648bfaca6a494f3e22378123bcee2894045dc9d8",
"shasum": ""
},
"require": {
@@ -5767,7 +5714,7 @@
"description": "Provides basic utilities for the filesystem",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/filesystem/tree/v5.4.13"
"source": "https://github.com/symfony/filesystem/tree/v5.4.19"
},
"funding": [
{
@@ -5783,20 +5730,20 @@
"type": "tidelift"
}
],
"time": "2022-09-21T19:53:16+00:00"
"time": "2023-01-14T19:14:44+00:00"
},
{
"name": "symfony/options-resolver",
"version": "v5.4.11",
"version": "v5.4.19",
"source": {
"type": "git",
"url": "https://github.com/symfony/options-resolver.git",
"reference": "54f14e36aa73cb8f7261d7686691fd4d75ea2690"
"reference": "b03c99236445492f20c61666e8f7e5d388b078e5"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/options-resolver/zipball/54f14e36aa73cb8f7261d7686691fd4d75ea2690",
"reference": "54f14e36aa73cb8f7261d7686691fd4d75ea2690",
"url": "https://api.github.com/repos/symfony/options-resolver/zipball/b03c99236445492f20c61666e8f7e5d388b078e5",
"reference": "b03c99236445492f20c61666e8f7e5d388b078e5",
"shasum": ""
},
"require": {
@@ -5836,7 +5783,7 @@
"options"
],
"support": {
"source": "https://github.com/symfony/options-resolver/tree/v5.4.11"
"source": "https://github.com/symfony/options-resolver/tree/v5.4.19"
},
"funding": [
{
@@ -5852,20 +5799,20 @@
"type": "tidelift"
}
],
"time": "2022-07-20T13:00:38+00:00"
"time": "2023-01-01T08:32:19+00:00"
},
{
"name": "symfony/stopwatch",
"version": "v5.4.13",
"version": "v5.4.19",
"source": {
"type": "git",
"url": "https://github.com/symfony/stopwatch.git",
"reference": "6df7a3effde34d81717bbef4591e5ffe32226d69"
"reference": "bd2b066090fd6a67039371098fa25a84cb2679ec"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/stopwatch/zipball/6df7a3effde34d81717bbef4591e5ffe32226d69",
"reference": "6df7a3effde34d81717bbef4591e5ffe32226d69",
"url": "https://api.github.com/repos/symfony/stopwatch/zipball/bd2b066090fd6a67039371098fa25a84cb2679ec",
"reference": "bd2b066090fd6a67039371098fa25a84cb2679ec",
"shasum": ""
},
"require": {
@@ -5898,7 +5845,7 @@
"description": "Provides a way to profile code",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/stopwatch/tree/v5.4.13"
"source": "https://github.com/symfony/stopwatch/tree/v5.4.19"
},
"funding": [
{
@@ -5914,7 +5861,7 @@
"type": "tidelift"
}
],
"time": "2022-09-28T13:19:49+00:00"
"time": "2023-01-01T08:32:19+00:00"
},
{
"name": "theseer/tokenizer",
@@ -5988,5 +5935,5 @@
"platform-overrides": {
"php": "7.4.0"
},
"plugin-api-version": "2.3.0"
"plugin-api-version": "2.2.0"
}
@@ -137,7 +137,6 @@ class AutoloaderDecorator implements AutoloaderInterface
private function mirrorPsr4Pathes(ClassLoader $n98MagerunAutoloader)
{
foreach ($n98MagerunAutoloader->getPrefixesPsr4() as $prefixPsr4 => $pathes) {
/**
* Do not use n98-magerun2 bundled composer for Magento autoloader.
* Magento could have a different Composer version bundled.
@@ -54,7 +54,6 @@ class CheckCompatibility implements EventSubscriberInterface, ApplicationAwareIn
}
$productMetadata = $objectManager->get(\Magento\Framework\App\ProductMetadataInterface::class);
$currentMagentoVersion = $productMetadata->getVersion();
if ($this->isStableVersion($currentMagentoVersion) && version_compare($currentMagentoVersion, '2.3.0', '<')) {
@@ -74,7 +74,6 @@ class ListCommand extends AbstractMagentoCommand
$tableData = [];
foreach ($cacheTypes as $cacheType) {
// If 'enabled' option is set, filter those who match
if ($input->getOption('enabled') !== null && $input->getOption('enabled') != $cacheType->getStatus()) {
unset($cacheTypes[$cacheType->getId()]);
@@ -113,7 +113,6 @@ class DeleteCommand extends AbstractCustomerCommand
// OR
// all
if (!($id || ($website && ($email || ($lastname && $firstname)))) && ($range || $all || $fuzzy)) {
// Delete more than one customer ?
$question = new Question('<question>Delete more than 1 customer?</question> <comment>[n]</comment>: ');
$batchDelete = $questionHelper->ask($input, $output, $question);
@@ -83,7 +83,6 @@ class ListCommand extends AbstractMagentoCommand
switch ($integration->getStatus()) {
case Integration::STATUS_ACTIVE:
break;
}
$table[] = [
@@ -126,7 +126,6 @@ class MagentoCoreProxyCommand extends AbstractMagentoCommand
private function processInputDefinitionOptions(InputDefinition $inputDefinition, array $options): void
{
foreach ($options as $option) {
// remove "--" at start
$normalizedName = substr($option['name'], 2);
$normalizedShortcut = substr($option['name'], 1);
+3 -7
View File
@@ -145,18 +145,15 @@ HELP;
$firstChar = substr($commandString, 0, 1);
switch ($firstChar) {
// comment
case '#':
// comment
break;
// set var
case '$':
// set var
$this->registerVariable($input, $output, $commandString);
break;
// run shell script
case '!':
// run shell script
$this->runShellCommand($output, $commandString);
break;
@@ -216,7 +213,6 @@ HELP;
{
if (preg_match('/^(\$\{[a-zA-Z0-9-_.]+\})=(.+)/', $commandString, $matches)) {
if (isset($matches[2]) && $matches[2][0] === '?') {
// Variable is already defined
if (isset($this->scriptVars[$matches[1]])) {
return $this->scriptVars[$matches[1]];
@@ -147,7 +147,6 @@ HELP;
}
foreach ($urls as $url) {
// pre-process
$line = $input->getArgument('linetemplate');
$line = str_replace('{url}', $url, $line);
@@ -165,9 +164,10 @@ HELP;
}
/**
* @param $entityCollection
* @param string $linkBaseUrl
* @param string $storeId
* @param array $urls
* @param array $urls
*
* @return array
*/