Bump php-cs-fixer to 3.4.0 (#14224)

Update ruleset
3.4.0 is the last PHP 7.3 version
This commit is contained in:
Tony Murray 2022-08-23 09:45:57 -05:00 committed by GitHub
parent 7cd61ef57f
commit 9ce05d7628
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 90 additions and 157 deletions

View File

@ -4,6 +4,7 @@ use PhpCsFixer\Config;
use PhpCsFixer\Finder; use PhpCsFixer\Finder;
$rules = [ $rules = [
'array_indentation' => true,
'array_syntax' => ['syntax' => 'short'], 'array_syntax' => ['syntax' => 'short'],
'binary_operator_spaces' => [ 'binary_operator_spaces' => [
'default' => 'single_space', 'default' => 'single_space',
@ -17,12 +18,22 @@ $rules = [
'braces' => true, 'braces' => true,
'cast_spaces' => true, 'cast_spaces' => true,
'class_attributes_separation' => [ 'class_attributes_separation' => [
'elements' => ['method' => 'one'], 'elements' => [
// 'const' => 'one',
'method' => 'one',
// 'property' => 'one',
'trait_import' => 'none',
],
],
'class_definition' => [
'multi_line_extends_each_single_line' => true,
'single_item_single_line' => true,
// 'single_line' => true,
], ],
'class_definition' => true,
'concat_space' => [ 'concat_space' => [
'spacing' => 'one', 'spacing' => 'one', // upstream none
], ],
'constant_case' => ['case' => 'lower'],
'declare_equal_normalize' => true, 'declare_equal_normalize' => true,
'elseif' => true, 'elseif' => true,
'encoding' => true, 'encoding' => true,
@ -38,20 +49,23 @@ $rules = [
'linebreak_after_opening_tag' => true, 'linebreak_after_opening_tag' => true,
'line_ending' => true, 'line_ending' => true,
'lowercase_cast' => true, 'lowercase_cast' => true,
'constant_case' => true,
'lowercase_keywords' => true, 'lowercase_keywords' => true,
'lowercase_static_reference' => true, // added from Symfony 'lowercase_static_reference' => true, // added from Symfony
'magic_method_casing' => true, // added from Symfony 'magic_method_casing' => true, // added from Symfony
'magic_constant_casing' => true, 'magic_constant_casing' => true,
'method_argument_space' => true, 'method_argument_space' => [
'on_multiline' => 'ignore',
],
'multiline_whitespace_before_semicolons' => [
'strategy' => 'no_multi_line',
],
'native_function_casing' => true, 'native_function_casing' => true,
'no_alias_functions' => false, // TODO: Enable? 'no_alias_functions' => true,
'no_extra_blank_lines' => [ 'no_extra_blank_lines' => [
'tokens' => [ 'tokens' => [
'extra', 'extra',
'throw', 'throw',
'use', 'use',
'use_trait',
], ],
], ],
'no_blank_lines_after_class_opening' => true, 'no_blank_lines_after_class_opening' => true,
@ -65,20 +79,21 @@ $rules = [
'use' => 'echo', 'use' => 'echo',
], ],
'no_multiline_whitespace_around_double_arrow' => true, 'no_multiline_whitespace_around_double_arrow' => true,
'multiline_whitespace_before_semicolons' => [
'strategy' => 'no_multi_line',
],
'no_short_bool_cast' => true, 'no_short_bool_cast' => true,
'no_singleline_whitespace_before_semicolons' => true, 'no_singleline_whitespace_before_semicolons' => true,
'no_spaces_after_function_name' => true, 'no_spaces_after_function_name' => true,
'no_spaces_around_offset' => true, 'no_spaces_around_offset' => [
'positions' => ['inside', 'outside'],
],
'no_spaces_inside_parenthesis' => true, 'no_spaces_inside_parenthesis' => true,
'no_trailing_comma_in_list_call' => true, 'no_trailing_comma_in_list_call' => true,
'no_trailing_comma_in_singleline_array' => true, 'no_trailing_comma_in_singleline_array' => true,
'no_trailing_whitespace' => true, 'no_trailing_whitespace' => true,
'no_trailing_whitespace_in_comment' => true, 'no_trailing_whitespace_in_comment' => true,
'no_unneeded_control_parentheses' => true, 'no_unneeded_control_parentheses' => [
'no_unreachable_default_argument_value' => false, // TODO: Enable? 'statements' => ['break', 'clone', 'continue', 'echo_print', 'return', 'switch_case', 'yield'],
],
'no_unreachable_default_argument_value' => true,
'no_useless_return' => true, 'no_useless_return' => true,
'no_whitespace_before_comma_in_array' => true, 'no_whitespace_before_comma_in_array' => true,
'no_whitespace_in_blank_line' => true, 'no_whitespace_in_blank_line' => true,
@ -86,6 +101,7 @@ $rules = [
'not_operator_with_successor_space' => true, 'not_operator_with_successor_space' => true,
'object_operator_without_whitespace' => true, 'object_operator_without_whitespace' => true,
'ordered_imports' => ['sort_algorithm' => 'alpha'], 'ordered_imports' => ['sort_algorithm' => 'alpha'],
'psr_autoloading' => true,
'phpdoc_indent' => true, 'phpdoc_indent' => true,
'phpdoc_inline_tag_normalizer' => true, 'phpdoc_inline_tag_normalizer' => true,
'phpdoc_no_access' => true, 'phpdoc_no_access' => true,
@ -94,18 +110,19 @@ $rules = [
'phpdoc_scalar' => true, 'phpdoc_scalar' => true,
'phpdoc_single_line_var_spacing' => true, 'phpdoc_single_line_var_spacing' => true,
'phpdoc_summary' => false, 'phpdoc_summary' => false,
'phpdoc_to_comment' => false, // override to preserve user preference
'phpdoc_tag_type' => true, 'phpdoc_tag_type' => true,
'phpdoc_to_comment' => false, // TODO: Enable?
'phpdoc_trim' => true, 'phpdoc_trim' => true,
'phpdoc_types' => true, 'phpdoc_types' => true,
'phpdoc_var_without_name' => true, 'phpdoc_var_without_name' => true,
'psr_autoloading' => false, // TODO: Enable?
'self_accessor' => false, // TODO: Enable? 'self_accessor' => false, // TODO: Enable?
'short_scalar_cast' => true, 'short_scalar_cast' => true,
'simplified_null_return' => false, // disabled by Shift 'simplified_null_return' => false, // disabled as "risky"
'single_blank_line_at_eof' => true, 'single_blank_line_at_eof' => true,
'single_blank_line_before_namespace' => true, 'single_blank_line_before_namespace' => true,
'single_class_element_per_statement' => true, 'single_class_element_per_statement' => [
'elements' => ['const', 'property'],
],
'single_import_per_statement' => true, 'single_import_per_statement' => true,
'single_line_after_imports' => true, 'single_line_after_imports' => true,
'single_line_comment_style' => [ 'single_line_comment_style' => [
@ -117,26 +134,33 @@ $rules = [
'switch_case_semicolon_to_colon' => true, 'switch_case_semicolon_to_colon' => true,
'switch_case_space' => true, 'switch_case_space' => true,
'ternary_operator_spaces' => true, 'ternary_operator_spaces' => true,
'trailing_comma_in_multiline' => true, 'trailing_comma_in_multiline' => ['elements' => ['arrays']],
'trim_array_spaces' => true, 'trim_array_spaces' => true,
'unary_operator_spaces' => true, 'unary_operator_spaces' => true,
'visibility_required' => [ 'visibility_required' => [
'elements' => ['property', 'method', 'const'], 'elements' => ['method', 'property'],
], ],
'whitespace_after_comma_in_array' => true, 'whitespace_after_comma_in_array' => true,
]; ];
$finder = Finder::create() $finder = Finder::create()
->in(__DIR__) ->in([
->exclude('storage') __DIR__ . '/app',
->exclude('bootstrap/cache') __DIR__ . '/config',
->exclude('vendor') __DIR__ . '/database',
__DIR__ . '/resources',
__DIR__ . '/routes',
__DIR__ . '/tests',
__DIR__ . '/LibreNMS',
])
->name('*.php') ->name('*.php')
->notName('*.blade.php') ->notName('*.blade.php')
->ignoreDotFiles(true) ->ignoreDotFiles(true)
->ignoreVCS(true); ->ignoreVCS(true);
return (new Config) return (new Config)
//->setRiskyAllowed(true)
->setFinder($finder) ->setFinder($finder)
->setRules($rules); ->setRules($rules)
->setRiskyAllowed(true)
->setUsingCache(true);

View File

@ -59,7 +59,7 @@
"barryvdh/laravel-ide-helper": "^2.8", "barryvdh/laravel-ide-helper": "^2.8",
"facade/ignition": "^2.5", "facade/ignition": "^2.5",
"fakerphp/faker": "^1.9.1", "fakerphp/faker": "^1.9.1",
"friendsofphp/php-cs-fixer": "^2.16", "friendsofphp/php-cs-fixer": "^v3.4",
"laravel/dusk": "^6.15", "laravel/dusk": "^6.15",
"mockery/mockery": "^1.4.2", "mockery/mockery": "^1.4.2",
"nunomaduro/collision": "^5.0", "nunomaduro/collision": "^5.0",

171
composer.lock generated
View File

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "6ae226d7d02a5cc5c60bb124d43a4f6c", "content-hash": "ab30c6215e7fdbe2c7b485ae9f4c1317",
"packages": [ "packages": [
{ {
"name": "amenadiel/jpgraph", "name": "amenadiel/jpgraph",
@ -9338,85 +9338,65 @@
}, },
{ {
"name": "friendsofphp/php-cs-fixer", "name": "friendsofphp/php-cs-fixer",
"version": "v2.19.3", "version": "v3.4.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/FriendsOfPHP/PHP-CS-Fixer.git", "url": "https://github.com/FriendsOfPHP/PHP-CS-Fixer.git",
"reference": "75ac86f33fab4714ea5a39a396784d83ae3b5ed8" "reference": "47177af1cfb9dab5d1cc4daf91b7179c2efe7fad"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/75ac86f33fab4714ea5a39a396784d83ae3b5ed8", "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/47177af1cfb9dab5d1cc4daf91b7179c2efe7fad",
"reference": "75ac86f33fab4714ea5a39a396784d83ae3b5ed8", "reference": "47177af1cfb9dab5d1cc4daf91b7179c2efe7fad",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"composer/semver": "^1.4 || ^2.0 || ^3.0", "composer/semver": "^3.2",
"composer/xdebug-handler": "^1.2 || ^2.0", "composer/xdebug-handler": "^2.0",
"doctrine/annotations": "^1.2", "doctrine/annotations": "^1.12",
"ext-json": "*", "ext-json": "*",
"ext-tokenizer": "*", "ext-tokenizer": "*",
"php": "^5.6 || ^7.0 || ^8.0", "php": "^7.2.5 || ^8.0",
"php-cs-fixer/diff": "^1.3", "php-cs-fixer/diff": "^2.0",
"symfony/console": "^3.4.43 || ^4.1.6 || ^5.0", "symfony/console": "^4.4.20 || ^5.1.3 || ^6.0",
"symfony/event-dispatcher": "^3.0 || ^4.0 || ^5.0", "symfony/event-dispatcher": "^4.4.20 || ^5.0 || ^6.0",
"symfony/filesystem": "^3.0 || ^4.0 || ^5.0", "symfony/filesystem": "^4.4.20 || ^5.0 || ^6.0",
"symfony/finder": "^3.0 || ^4.0 || ^5.0", "symfony/finder": "^4.4.20 || ^5.0 || ^6.0",
"symfony/options-resolver": "^3.0 || ^4.0 || ^5.0", "symfony/options-resolver": "^4.4.20 || ^5.0 || ^6.0",
"symfony/polyfill-php70": "^1.0", "symfony/polyfill-mbstring": "^1.23",
"symfony/polyfill-php72": "^1.4", "symfony/polyfill-php80": "^1.23",
"symfony/process": "^3.0 || ^4.0 || ^5.0", "symfony/polyfill-php81": "^1.23",
"symfony/stopwatch": "^3.0 || ^4.0 || ^5.0" "symfony/process": "^4.4.20 || ^5.0 || ^6.0",
"symfony/stopwatch": "^4.4.20 || ^5.0 || ^6.0"
}, },
"require-dev": { "require-dev": {
"justinrainbow/json-schema": "^5.0", "justinrainbow/json-schema": "^5.2",
"keradus/cli-executor": "^1.4", "keradus/cli-executor": "^1.5",
"mikey179/vfsstream": "^1.6", "mikey179/vfsstream": "^1.6.8",
"php-coveralls/php-coveralls": "^2.4.2", "php-coveralls/php-coveralls": "^2.5.2",
"php-cs-fixer/accessible-object": "^1.0", "php-cs-fixer/accessible-object": "^1.1",
"php-cs-fixer/phpunit-constraint-isidenticalstring": "^1.2", "php-cs-fixer/phpunit-constraint-isidenticalstring": "^1.2",
"php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.2.1", "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.2.1",
"phpspec/prophecy": "^1.15",
"phpspec/prophecy-phpunit": "^1.1 || ^2.0", "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": "^8.5.21 || ^9.5",
"phpunitgoodpractices/polyfill": "^1.5", "phpunitgoodpractices/polyfill": "^1.5",
"phpunitgoodpractices/traits": "^1.9.1", "phpunitgoodpractices/traits": "^1.9.1",
"sanmai/phpunit-legacy-adapter": "^6.4 || ^8.2.1", "symfony/phpunit-bridge": "^5.2.4 || ^6.0",
"symfony/phpunit-bridge": "^5.2.1", "symfony/yaml": "^4.4.20 || ^5.0 || ^6.0"
"symfony/yaml": "^3.0 || ^4.0 || ^5.0"
}, },
"suggest": { "suggest": {
"ext-dom": "For handling output formats in XML", "ext-dom": "For handling output formats in XML",
"ext-mbstring": "For handling non-UTF8 characters.", "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": [ "bin": [
"php-cs-fixer" "php-cs-fixer"
], ],
"type": "application", "type": "application",
"extra": {
"branch-alias": {
"dev-master": "2.19-dev"
}
},
"autoload": { "autoload": {
"psr-4": { "psr-4": {
"PhpCsFixer\\": "src/" "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/", "notification-url": "https://packagist.org/downloads/",
"license": [ "license": [
@ -9435,7 +9415,7 @@
"description": "A tool to automatically fix PHP code style", "description": "A tool to automatically fix PHP code style",
"support": { "support": {
"issues": "https://github.com/FriendsOfPHP/PHP-CS-Fixer/issues", "issues": "https://github.com/FriendsOfPHP/PHP-CS-Fixer/issues",
"source": "https://github.com/FriendsOfPHP/PHP-CS-Fixer/tree/v2.19.3" "source": "https://github.com/FriendsOfPHP/PHP-CS-Fixer/tree/v3.4.0"
}, },
"funding": [ "funding": [
{ {
@ -9443,7 +9423,7 @@
"type": "github" "type": "github"
} }
], ],
"time": "2021-11-15T17:17:55+00:00" "time": "2021-12-11T16:25:08+00:00"
}, },
{ {
"name": "hamcrest/hamcrest-php", "name": "hamcrest/hamcrest-php",
@ -10064,16 +10044,16 @@
}, },
{ {
"name": "php-cs-fixer/diff", "name": "php-cs-fixer/diff",
"version": "v1.3.1", "version": "v2.0.2",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/PHP-CS-Fixer/diff.git", "url": "https://github.com/PHP-CS-Fixer/diff.git",
"reference": "dbd31aeb251639ac0b9e7e29405c1441907f5759" "reference": "29dc0d507e838c4580d018bd8b5cb412474f7ec3"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/PHP-CS-Fixer/diff/zipball/dbd31aeb251639ac0b9e7e29405c1441907f5759", "url": "https://api.github.com/repos/PHP-CS-Fixer/diff/zipball/29dc0d507e838c4580d018bd8b5cb412474f7ec3",
"reference": "dbd31aeb251639ac0b9e7e29405c1441907f5759", "reference": "29dc0d507e838c4580d018bd8b5cb412474f7ec3",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -10101,21 +10081,18 @@
{ {
"name": "Kore Nordmann", "name": "Kore Nordmann",
"email": "mail@kore-nordmann.de" "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", "homepage": "https://github.com/PHP-CS-Fixer",
"keywords": [ "keywords": [
"diff" "diff"
], ],
"support": { "support": {
"issues": "https://github.com/PHP-CS-Fixer/diff/issues", "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-parallel-lint/php-parallel-lint", "name": "php-parallel-lint/php-parallel-lint",
@ -12500,74 +12477,6 @@
], ],
"time": "2022-01-02T09:53:40+00:00" "time": "2022-01-02T09:53:40+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"
},
{ {
"name": "symfony/stopwatch", "name": "symfony/stopwatch",
"version": "v5.4.5", "version": "v5.4.5",