Update php-cs-fixer to 3.0.0

This commit is contained in:
Karyna committed 2021-07-29 16:05:33 +03:00
1 parent b2a9e91143
commit a330a1a757
3 files changed
+98 -179

No files matched your search

+5 -4
View File
@@ -21,8 +21,8 @@ $finder = PhpCsFixer\Finder::create()
->exclude('setup/vendor')
->exclude('var');
return PhpCsFixer\Config::create()
->setFinder($finder)
$config = new PhpCsFixer\Config();
$config->setFinder($finder)
->setRules([
'@PSR2' => true,
'array_syntax' => ['syntax' => 'short'],
@@ -30,11 +30,11 @@ return PhpCsFixer\Config::create()
'include' => true,
'new_with_braces' => true,
'no_empty_statement' => true,
'no_extra_consecutive_blank_lines' => true,
'no_extra_blank_lines' => true,
'no_leading_import_slash' => true,
'no_leading_namespace_whitespace' => true,
'no_multiline_whitespace_around_double_arrow' => true,
'no_multiline_whitespace_before_semicolons' => true,
'multiline_whitespace_before_semicolons' => true,
'no_singleline_whitespace_before_semicolons' => true,
'no_trailing_comma_in_singleline_array' => true,
'no_unused_imports' => true,
@@ -44,3 +44,4 @@ return PhpCsFixer\Config::create()
'standardize_not_equals' => true,
'ternary_operator_spaces' => true,
]);
return $config;
+1 -1
View File
@@ -81,7 +81,7 @@
"require-dev": {
"allure-framework/allure-phpunit": "~1.4",
"dealerdirect/phpcodesniffer-composer-installer": "^0.7.0",
"friendsofphp/php-cs-fixer": "~2.18.1",
"friendsofphp/php-cs-fixer": "~3.0.0",
"lusitanian/oauth": "~0.8.10",
"magento/magento-coding-standard": "*",
"magento/magento2-functional-testing-framework": "^3.0",
Generated
+92 -174
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": "81d5b34cad54e3beca3f7f98e0bd4e4d",
"content-hash": "0c579bc656fd7f9dd7e9e92bf737c9c0",
"packages": [
{
"name": "aws/aws-sdk-php",
@@ -5164,36 +5164,37 @@
},
{
"name": "symfony/console",
"version": "v4.4.26",
"version": "v4.4.27",
"source": {
"type": "git",
"url": "https://github.com/symfony/console.git",
"reference": "9aa1eb46c1b12fada74dc0c529e93d1ccef22576"
"reference": "e523c86d2c727b128ce339a72733c9688e002ed3"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/console/zipball/9aa1eb46c1b12fada74dc0c529e93d1ccef22576",
"reference": "9aa1eb46c1b12fada74dc0c529e93d1ccef22576",
"url": "https://api.github.com/repos/symfony/console/zipball/e523c86d2c727b128ce339a72733c9688e002ed3",
"reference": "e523c86d2c727b128ce339a72733c9688e002ed3",
"shasum": ""
},
"require": {
"php": ">=7.1.3",
"symfony/polyfill-mbstring": "~1.0",
"symfony/polyfill-php73": "^1.8",
"symfony/polyfill-php80": "^1.15",
"symfony/polyfill-php80": "^1.16",
"symfony/service-contracts": "^1.1|^2"
},
"conflict": {
"psr/log": ">=3",
"symfony/dependency-injection": "<3.4",
"symfony/event-dispatcher": "<4.3|>=5",
"symfony/lock": "<4.4",
"symfony/process": "<3.3"
},
"provide": {
"psr/log-implementation": "1.0"
"psr/log-implementation": "1.0|2.0"
},
"require-dev": {
"psr/log": "~1.0",
"psr/log": "^1|^2",
"symfony/config": "^3.4|^4.0|^5.0",
"symfony/dependency-injection": "^3.4|^4.0|^5.0",
"symfony/event-dispatcher": "^4.3",
@@ -5233,7 +5234,7 @@
"description": "Eases the creation of beautiful and testable command line interfaces",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/console/tree/v4.4.26"
"source": "https://github.com/symfony/console/tree/v4.4.27"
},
"funding": [
{
@@ -5249,7 +5250,7 @@
"type": "tidelift"
}
],
"time": "2021-06-06T09:12:27+00:00"
"time": "2021-07-22T08:29:31+00:00"
},
{
"name": "symfony/css-selector",
@@ -5611,21 +5612,22 @@
},
{
"name": "symfony/event-dispatcher",
"version": "v4.4.25",
"version": "v4.4.27",
"source": {
"type": "git",
"url": "https://github.com/symfony/event-dispatcher.git",
"reference": "047773e7016e4fd45102cedf4bd2558ae0d0c32f"
"reference": "958a128b184fcf0ba45ec90c0e88554c9327c2e9"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/047773e7016e4fd45102cedf4bd2558ae0d0c32f",
"reference": "047773e7016e4fd45102cedf4bd2558ae0d0c32f",
"url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/958a128b184fcf0ba45ec90c0e88554c9327c2e9",
"reference": "958a128b184fcf0ba45ec90c0e88554c9327c2e9",
"shasum": ""
},
"require": {
"php": ">=7.1.3",
"symfony/event-dispatcher-contracts": "^1.1"
"symfony/event-dispatcher-contracts": "^1.1",
"symfony/polyfill-php80": "^1.16"
},
"conflict": {
"symfony/dependency-injection": "<3.4"
@@ -5635,7 +5637,7 @@
"symfony/event-dispatcher-implementation": "1.1"
},
"require-dev": {
"psr/log": "~1.0",
"psr/log": "^1|^2|^3",
"symfony/config": "^3.4|^4.0|^5.0",
"symfony/dependency-injection": "^3.4|^4.0|^5.0",
"symfony/error-handler": "~3.4|~4.4",
@@ -5674,7 +5676,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/v4.4.25"
"source": "https://github.com/symfony/event-dispatcher/tree/v4.4.27"
},
"funding": [
{
@@ -5690,7 +5692,7 @@
"type": "tidelift"
}
],
"time": "2021-05-26T17:39:37+00:00"
"time": "2021-07-23T15:41:52+00:00"
},
{
"name": "symfony/event-dispatcher-contracts",
@@ -5773,21 +5775,22 @@
},
{
"name": "symfony/filesystem",
"version": "v5.3.3",
"version": "v5.3.4",
"source": {
"type": "git",
"url": "https://github.com/symfony/filesystem.git",
"reference": "19b71c8f313b411172dd5f470fd61f24466d79a9"
"reference": "343f4fe324383ca46792cae728a3b6e2f708fb32"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/filesystem/zipball/19b71c8f313b411172dd5f470fd61f24466d79a9",
"reference": "19b71c8f313b411172dd5f470fd61f24466d79a9",
"url": "https://api.github.com/repos/symfony/filesystem/zipball/343f4fe324383ca46792cae728a3b6e2f708fb32",
"reference": "343f4fe324383ca46792cae728a3b6e2f708fb32",
"shasum": ""
},
"require": {
"php": ">=7.2.5",
"symfony/polyfill-ctype": "~1.8"
"symfony/polyfill-ctype": "~1.8",
"symfony/polyfill-php80": "^1.16"
},
"type": "library",
"autoload": {
@@ -5815,7 +5818,7 @@
"description": "Provides basic utilities for the filesystem",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/filesystem/tree/v5.3.3"
"source": "https://github.com/symfony/filesystem/tree/v5.3.4"
},
"funding": [
{
@@ -5831,24 +5834,25 @@
"type": "tidelift"
}
],
"time": "2021-06-30T07:27:52+00:00"
"time": "2021-07-21T12:40:44+00:00"
},
{
"name": "symfony/finder",
"version": "v5.3.0",
"version": "v5.3.4",
"source": {
"type": "git",
"url": "https://github.com/symfony/finder.git",
"reference": "0ae3f047bed4edff6fd35b26a9a6bfdc92c953c6"
"reference": "17f50e06018baec41551a71a15731287dbaab186"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/finder/zipball/0ae3f047bed4edff6fd35b26a9a6bfdc92c953c6",
"reference": "0ae3f047bed4edff6fd35b26a9a6bfdc92c953c6",
"url": "https://api.github.com/repos/symfony/finder/zipball/17f50e06018baec41551a71a15731287dbaab186",
"reference": "17f50e06018baec41551a71a15731287dbaab186",
"shasum": ""
},
"require": {
"php": ">=7.2.5"
"php": ">=7.2.5",
"symfony/polyfill-php80": "^1.16"
},
"type": "library",
"autoload": {
@@ -5876,7 +5880,7 @@
"description": "Finds files and directories via an intuitive fluent interface",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/finder/tree/v5.3.0"
"source": "https://github.com/symfony/finder/tree/v5.3.4"
},
"funding": [
{
@@ -5892,7 +5896,7 @@
"type": "tidelift"
}
],
"time": "2021-05-26T12:52:38+00:00"
"time": "2021-07-23T15:54:19+00:00"
},
{
"name": "symfony/http-client-contracts",
@@ -6798,20 +6802,21 @@
},
{
"name": "symfony/process",
"version": "v4.4.26",
"version": "v4.4.27",
"source": {
"type": "git",
"url": "https://github.com/symfony/process.git",
"reference": "7e812c84c3f2dba173d311de6e510edf701685a8"
"reference": "0b7dc5599ac4aa6d7b936c8f7d10abae64f6cf7f"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/process/zipball/7e812c84c3f2dba173d311de6e510edf701685a8",
"reference": "7e812c84c3f2dba173d311de6e510edf701685a8",
"url": "https://api.github.com/repos/symfony/process/zipball/0b7dc5599ac4aa6d7b936c8f7d10abae64f6cf7f",
"reference": "0b7dc5599ac4aa6d7b936c8f7d10abae64f6cf7f",
"shasum": ""
},
"require": {
"php": ">=7.1.3"
"php": ">=7.1.3",
"symfony/polyfill-php80": "^1.16"
},
"type": "library",
"autoload": {
@@ -6839,7 +6844,7 @@
"description": "Executes commands in sub-processes",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/process/tree/v4.4.26"
"source": "https://github.com/symfony/process/tree/v4.4.27"
},
"funding": [
{
@@ -6855,7 +6860,7 @@
"type": "tidelift"
}
],
"time": "2021-06-09T14:57:04+00:00"
"time": "2021-07-23T15:41:52+00:00"
},
{
"name": "symfony/service-contracts",
@@ -8791,57 +8796,54 @@
},
{
"name": "friendsofphp/php-cs-fixer",
"version": "v2.18.7",
"version": "v3.0.0",
"source": {
"type": "git",
"url": "https://github.com/FriendsOfPHP/PHP-CS-Fixer.git",
"reference": "b3281bbe07e8d45759e9e3e8032b4c5fa3463b21"
"reference": "c15377bdfa8d1ecf186f1deadec39c89984e1167"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/b3281bbe07e8d45759e9e3e8032b4c5fa3463b21",
"reference": "b3281bbe07e8d45759e9e3e8032b4c5fa3463b21",
"url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/c15377bdfa8d1ecf186f1deadec39c89984e1167",
"reference": "c15377bdfa8d1ecf186f1deadec39c89984e1167",
"shasum": ""
},
"require": {
"composer/semver": "^1.4 || ^2.0 || ^3.0",
"composer/xdebug-handler": "^1.2 || ^2.0",
"doctrine/annotations": "^1.2",
"composer/semver": "^3.2",
"composer/xdebug-handler": "^2.0",
"doctrine/annotations": "^1.12",
"ext-json": "*",
"ext-tokenizer": "*",
"php": "^5.6 || ^7.0 || ^8.0",
"php-cs-fixer/diff": "^1.3",
"symfony/console": "^3.4.43 || ^4.1.6 || ^5.0",
"symfony/event-dispatcher": "^3.0 || ^4.0 || ^5.0",
"symfony/filesystem": "^3.0 || ^4.0 || ^5.0",
"symfony/finder": "^3.0 || ^4.0 || ^5.0",
"symfony/options-resolver": "^3.0 || ^4.0 || ^5.0",
"symfony/polyfill-php70": "^1.0",
"symfony/polyfill-php72": "^1.4",
"symfony/process": "^3.0 || ^4.0 || ^5.0",
"symfony/stopwatch": "^3.0 || ^4.0 || ^5.0"
"php": "^7.1.3 || ^8.0",
"php-cs-fixer/diff": "^2.0",
"symfony/console": "^4.4.20 || ^5.1.3",
"symfony/event-dispatcher": "^4.4.20 || ^5.0",
"symfony/filesystem": "^4.4.20 || ^5.0",
"symfony/finder": "^4.4.20 || ^5.0",
"symfony/options-resolver": "^4.4.20 || ^5.0",
"symfony/polyfill-php72": "^1.22",
"symfony/process": "^4.4.20 || ^5.0",
"symfony/stopwatch": "^4.4.20 || ^5.0"
},
"require-dev": {
"justinrainbow/json-schema": "^5.0",
"justinrainbow/json-schema": "^5.2",
"keradus/cli-executor": "^1.4",
"mikey179/vfsstream": "^1.6",
"php-coveralls/php-coveralls": "^2.4.2",
"php-cs-fixer/accessible-object": "^1.0",
"mikey179/vfsstream": "^1.6.8",
"php-coveralls/php-coveralls": "^2.4.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.10.3",
"phpspec/prophecy-phpunit": "^1.1 || ^2.0",
"phpunit/phpunit": "^5.7.27 || ^6.5.14 || ^7.5.20 || ^8.5.13 || ^9.5",
"phpunit/phpunit": "^7.5.20 || ^8.5.14 || ^9.5",
"phpunitgoodpractices/polyfill": "^1.5",
"phpunitgoodpractices/traits": "^1.9.1",
"sanmai/phpunit-legacy-adapter": "^6.4 || ^8.2.1",
"symfony/phpunit-bridge": "^5.2.1",
"symfony/yaml": "^3.0 || ^4.0 || ^5.0"
"symfony/phpunit-bridge": "^5.2.4",
"symfony/yaml": "^4.4.20 || ^5.0"
},
"suggest": {
"ext-dom": "For handling output formats in XML",
"ext-mbstring": "For handling non-UTF8 characters.",
"php-cs-fixer/phpunit-constraint-isidenticalstring": "For IsIdenticalString constraint.",
"php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "For XmlMatchesXsd constraint.",
"symfony/polyfill-mbstring": "When enabling `ext-mbstring` is not possible."
},
"bin": [
@@ -8851,20 +8853,7 @@
"autoload": {
"psr-4": {
"PhpCsFixer\\": "src/"
},
"classmap": [
"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/IntegrationCaseFactoryInterface.php",
"tests/Test/InternalIntegrationCaseFactory.php",
"tests/Test/IsIdenticalConstraint.php",
"tests/Test/TokensWithObservedTransformers.php",
"tests/TestCase.php"
]
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
@@ -8883,7 +8872,7 @@
"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/v2.18.7"
"source": "https://github.com/FriendsOfPHP/PHP-CS-Fixer/tree/v3.0.0"
},
"funding": [
{
@@ -8891,7 +8880,7 @@
"type": "github"
}
],
"time": "2021-05-03T21:36:45+00:00"
"time": "2021-05-03T21:51:58+00:00"
},
{
"name": "hoa/consistency",
@@ -10218,16 +10207,16 @@
},
{
"name": "php-cs-fixer/diff",
"version": "v1.3.1",
"version": "v2.0.2",
"source": {
"type": "git",
"url": "https://github.com/PHP-CS-Fixer/diff.git",
"reference": "dbd31aeb251639ac0b9e7e29405c1441907f5759"
"reference": "29dc0d507e838c4580d018bd8b5cb412474f7ec3"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/PHP-CS-Fixer/diff/zipball/dbd31aeb251639ac0b9e7e29405c1441907f5759",
"reference": "dbd31aeb251639ac0b9e7e29405c1441907f5759",
"url": "https://api.github.com/repos/PHP-CS-Fixer/diff/zipball/29dc0d507e838c4580d018bd8b5cb412474f7ec3",
"reference": "29dc0d507e838c4580d018bd8b5cb412474f7ec3",
"shasum": ""
},
"require": {
@@ -10255,21 +10244,18 @@
{
"name": "Kore Nordmann",
"email": "mail@kore-nordmann.de"
},
{
"name": "SpacePossum"
}
],
"description": "sebastian/diff v2 backport support for PHP5.6",
"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/v1.3.1"
"source": "https://github.com/PHP-CS-Fixer/diff/tree/v2.0.2"
},
"time": "2020-10-14T08:39:05+00:00"
"time": "2020-10-14T08:32:19+00:00"
},
{
"name": "php-webdriver/webdriver",
@@ -12468,23 +12454,23 @@
},
{
"name": "symfony/options-resolver",
"version": "v5.3.0",
"version": "v5.3.4",
"source": {
"type": "git",
"url": "https://github.com/symfony/options-resolver.git",
"reference": "162e886ca035869866d233a2bfef70cc28f9bbe5"
"reference": "a603e5701bd6e305cfc777a8b50bf081ef73105e"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/options-resolver/zipball/162e886ca035869866d233a2bfef70cc28f9bbe5",
"reference": "162e886ca035869866d233a2bfef70cc28f9bbe5",
"url": "https://api.github.com/repos/symfony/options-resolver/zipball/a603e5701bd6e305cfc777a8b50bf081ef73105e",
"reference": "a603e5701bd6e305cfc777a8b50bf081ef73105e",
"shasum": ""
},
"require": {
"php": ">=7.2.5",
"symfony/deprecation-contracts": "^2.1",
"symfony/polyfill-php73": "~1.0",
"symfony/polyfill-php80": "^1.15"
"symfony/polyfill-php80": "^1.16"
},
"type": "library",
"autoload": {
@@ -12517,7 +12503,7 @@
"options"
],
"support": {
"source": "https://github.com/symfony/options-resolver/tree/v5.3.0"
"source": "https://github.com/symfony/options-resolver/tree/v5.3.4"
},
"funding": [
{
@@ -12533,88 +12519,20 @@
"type": "tidelift"
}
],
"time": "2021-05-26T17:43:10+00:00"
},
{
"name": "symfony/polyfill-php70",
"version": "v1.20.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php70.git",
"reference": "5f03a781d984aae42cebd18e7912fa80f02ee644"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/5f03a781d984aae42cebd18e7912fa80f02ee644",
"reference": "5f03a781d984aae42cebd18e7912fa80f02ee644",
"shasum": ""
},
"require": {
"php": ">=7.1"
},
"type": "metapackage",
"extra": {
"branch-alias": {
"dev-main": "1.20-dev"
},
"thanks": {
"name": "symfony/polyfill",
"url": "https://github.com/symfony/polyfill"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Nicolas Grekas",
"email": "p@tchwork.com"
},
{
"name": "Symfony Community",
"homepage": "https://symfony.com/contributors"
}
],
"description": "Symfony polyfill backporting some PHP 7.0+ features to lower PHP versions",
"homepage": "https://symfony.com",
"keywords": [
"compatibility",
"polyfill",
"portable",
"shim"
],
"support": {
"source": "https://github.com/symfony/polyfill-php70/tree/v1.20.0"
},
"funding": [
{
"url": "https://symfony.com/sponsor",
"type": "custom"
},
{
"url": "https://github.com/fabpot",
"type": "github"
},
{
"url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
"type": "tidelift"
}
],
"time": "2020-10-23T14:02:19+00:00"
"time": "2021-07-23T15:55:36+00:00"
},
{
"name": "symfony/stopwatch",
"version": "v5.3.0",
"version": "v5.3.4",
"source": {
"type": "git",
"url": "https://github.com/symfony/stopwatch.git",
"reference": "313d02f59d6543311865007e5ff4ace05b35ee65"
"reference": "b24c6a92c6db316fee69e38c80591e080e41536c"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/stopwatch/zipball/313d02f59d6543311865007e5ff4ace05b35ee65",
"reference": "313d02f59d6543311865007e5ff4ace05b35ee65",
"url": "https://api.github.com/repos/symfony/stopwatch/zipball/b24c6a92c6db316fee69e38c80591e080e41536c",
"reference": "b24c6a92c6db316fee69e38c80591e080e41536c",
"shasum": ""
},
"require": {
@@ -12647,7 +12565,7 @@
"description": "Provides a way to profile code",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/stopwatch/tree/v5.3.0"
"source": "https://github.com/symfony/stopwatch/tree/v5.3.4"
},
"funding": [
{
@@ -12663,7 +12581,7 @@
"type": "tidelift"
}
],
"time": "2021-05-26T17:43:10+00:00"
"time": "2021-07-10T08:58:57+00:00"
},
{
"name": "symfony/yaml",