From cef0ca5c52e26fdcdd47395704e19112156a960e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 7 Mar 2022 18:42:23 +0000 Subject: [PATCH 1/4] composer(deps): bump friendsofphp/php-cs-fixer from 3.6.0 to 3.7.0 Bumps [friendsofphp/php-cs-fixer](https://github.com/FriendsOfPHP/PHP-CS-Fixer) from 3.6.0 to 3.7.0. - [Release notes](https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases) - [Changelog](https://github.com/FriendsOfPHP/PHP-CS-Fixer/blob/master/CHANGELOG.md) - [Commits](https://github.com/FriendsOfPHP/PHP-CS-Fixer/compare/v3.6.0...v3.7.0) --- updated-dependencies: - dependency-name: friendsofphp/php-cs-fixer dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- composer.json | 2 +- composer.lock | 102 +++++++++++++++++++++++++------------------------- 2 files changed, 52 insertions(+), 52 deletions(-) diff --git a/composer.json b/composer.json index 08e92285..beae85d2 100644 --- a/composer.json +++ b/composer.json @@ -17,7 +17,7 @@ "require": { "php": "^7.4 || ^8.0", "ext-filter": "*", - "friendsofphp/php-cs-fixer": "~3.6.0" + "friendsofphp/php-cs-fixer": "~3.7.0" }, "require-dev": { "ergebnis/composer-normalize": "^2.23.1", diff --git a/composer.lock b/composer.lock index d181765c..b153310c 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": "8530ebf5a37201140f45bf3fab6c43b7", + "content-hash": "47cd413b18d8e3c6b18b2642b6723dcb", "packages": [ { "name": "composer/pcre", @@ -298,16 +298,16 @@ }, { "name": "doctrine/lexer", - "version": "1.2.2", + "version": "1.2.3", "source": { "type": "git", "url": "https://github.com/doctrine/lexer.git", - "reference": "9c50f840f257bbb941e6f4a0e94ccf5db5c3f76c" + "reference": "c268e882d4dbdd85e36e4ad69e02dc284f89d229" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/lexer/zipball/9c50f840f257bbb941e6f4a0e94ccf5db5c3f76c", - "reference": "9c50f840f257bbb941e6f4a0e94ccf5db5c3f76c", + "url": "https://api.github.com/repos/doctrine/lexer/zipball/c268e882d4dbdd85e36e4ad69e02dc284f89d229", + "reference": "c268e882d4dbdd85e36e4ad69e02dc284f89d229", "shasum": "" }, "require": { @@ -315,7 +315,7 @@ }, "require-dev": { "doctrine/coding-standard": "^9.0", - "phpstan/phpstan": "1.3", + "phpstan/phpstan": "^1.3", "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5", "vimeo/psalm": "^4.11" }, @@ -354,7 +354,7 @@ ], "support": { "issues": "https://github.com/doctrine/lexer/issues", - "source": "https://github.com/doctrine/lexer/tree/1.2.2" + "source": "https://github.com/doctrine/lexer/tree/1.2.3" }, "funding": [ { @@ -370,25 +370,25 @@ "type": "tidelift" } ], - "time": "2022-01-12T08:27:12+00:00" + "time": "2022-02-28T11:07:21+00:00" }, { "name": "friendsofphp/php-cs-fixer", - "version": "v3.6.0", + "version": "v3.7.0", "source": { "type": "git", "url": "https://github.com/FriendsOfPHP/PHP-CS-Fixer.git", - "reference": "1975e4453eb2726d1f50da0ce7fa91295029a4fa" + "reference": "7705d5a985132a40282d18a176eb9a4a0497747c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/1975e4453eb2726d1f50da0ce7fa91295029a4fa", - "reference": "1975e4453eb2726d1f50da0ce7fa91295029a4fa", + "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/7705d5a985132a40282d18a176eb9a4a0497747c", + "reference": "7705d5a985132a40282d18a176eb9a4a0497747c", "shasum": "" }, "require": { "composer/semver": "^3.2", - "composer/xdebug-handler": "^3.0", + "composer/xdebug-handler": "^3.0.3", "doctrine/annotations": "^1.13", "ext-json": "*", "ext-tokenizer": "*", @@ -400,8 +400,8 @@ "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/polyfill-php80": "^1.25", + "symfony/polyfill-php81": "^1.25", "symfony/process": "^5.4 || ^6.0", "symfony/stopwatch": "^5.4 || ^6.0" }, @@ -451,7 +451,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/v3.6.0" + "source": "https://github.com/FriendsOfPHP/PHP-CS-Fixer/tree/v3.7.0" }, "funding": [ { @@ -459,7 +459,7 @@ "type": "github" } ], - "time": "2022-02-07T18:02:40+00:00" + "time": "2022-03-07T16:59:59+00:00" }, { "name": "php-cs-fixer/diff", @@ -1042,16 +1042,16 @@ }, { "name": "symfony/filesystem", - "version": "v5.4.3", + "version": "v5.4.6", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "0f0c4bf1840420f4aef3f32044a9dbb24682731b" + "reference": "d53a45039974952af7f7ebc461ccdd4295e29440" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/0f0c4bf1840420f4aef3f32044a9dbb24682731b", - "reference": "0f0c4bf1840420f4aef3f32044a9dbb24682731b", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/d53a45039974952af7f7ebc461ccdd4295e29440", + "reference": "d53a45039974952af7f7ebc461ccdd4295e29440", "shasum": "" }, "require": { @@ -1086,7 +1086,7 @@ "description": "Provides basic utilities for the filesystem", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/filesystem/tree/v5.4.3" + "source": "https://github.com/symfony/filesystem/tree/v5.4.6" }, "funding": [ { @@ -1102,7 +1102,7 @@ "type": "tidelift" } ], - "time": "2022-01-02T09:53:40+00:00" + "time": "2022-03-02T12:42:23+00:00" }, { "name": "symfony/finder", @@ -1320,7 +1320,7 @@ }, { "name": "symfony/polyfill-intl-grapheme", - "version": "v1.24.0", + "version": "v1.25.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-grapheme.git", @@ -1381,7 +1381,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.24.0" + "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.25.0" }, "funding": [ { @@ -1401,7 +1401,7 @@ }, { "name": "symfony/polyfill-intl-normalizer", - "version": "v1.24.0", + "version": "v1.25.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-normalizer.git", @@ -1465,7 +1465,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.24.0" + "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.25.0" }, "funding": [ { @@ -1485,7 +1485,7 @@ }, { "name": "symfony/polyfill-mbstring", - "version": "v1.24.0", + "version": "v1.25.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", @@ -1548,7 +1548,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.24.0" + "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.25.0" }, "funding": [ { @@ -1568,7 +1568,7 @@ }, { "name": "symfony/polyfill-php73", - "version": "v1.24.0", + "version": "v1.25.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php73.git", @@ -1627,7 +1627,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php73/tree/v1.24.0" + "source": "https://github.com/symfony/polyfill-php73/tree/v1.25.0" }, "funding": [ { @@ -1647,16 +1647,16 @@ }, { "name": "symfony/polyfill-php80", - "version": "v1.24.0", + "version": "v1.25.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php80.git", - "reference": "57b712b08eddb97c762a8caa32c84e037892d2e9" + "reference": "4407588e0d3f1f52efb65fbe92babe41f37fe50c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/57b712b08eddb97c762a8caa32c84e037892d2e9", - "reference": "57b712b08eddb97c762a8caa32c84e037892d2e9", + "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/4407588e0d3f1f52efb65fbe92babe41f37fe50c", + "reference": "4407588e0d3f1f52efb65fbe92babe41f37fe50c", "shasum": "" }, "require": { @@ -1710,7 +1710,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php80/tree/v1.24.0" + "source": "https://github.com/symfony/polyfill-php80/tree/v1.25.0" }, "funding": [ { @@ -1726,11 +1726,11 @@ "type": "tidelift" } ], - "time": "2021-09-13T13:58:33+00:00" + "time": "2022-03-04T08:16:47+00:00" }, { "name": "symfony/polyfill-php81", - "version": "v1.24.0", + "version": "v1.25.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php81.git", @@ -1789,7 +1789,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php81/tree/v1.24.0" + "source": "https://github.com/symfony/polyfill-php81/tree/v1.25.0" }, "funding": [ { @@ -1809,16 +1809,16 @@ }, { "name": "symfony/process", - "version": "v5.4.3", + "version": "v5.4.5", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "553f50487389a977eb31cf6b37faae56da00f753" + "reference": "95440409896f90a5f85db07a32b517ecec17fa4c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/553f50487389a977eb31cf6b37faae56da00f753", - "reference": "553f50487389a977eb31cf6b37faae56da00f753", + "url": "https://api.github.com/repos/symfony/process/zipball/95440409896f90a5f85db07a32b517ecec17fa4c", + "reference": "95440409896f90a5f85db07a32b517ecec17fa4c", "shasum": "" }, "require": { @@ -1851,7 +1851,7 @@ "description": "Executes commands in sub-processes", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/process/tree/v5.4.3" + "source": "https://github.com/symfony/process/tree/v5.4.5" }, "funding": [ { @@ -1867,7 +1867,7 @@ "type": "tidelift" } ], - "time": "2022-01-26T16:28:35+00:00" + "time": "2022-01-30T18:16:22+00:00" }, { "name": "symfony/service-contracts", @@ -1954,16 +1954,16 @@ }, { "name": "symfony/stopwatch", - "version": "v5.4.3", + "version": "v5.4.5", "source": { "type": "git", "url": "https://github.com/symfony/stopwatch.git", - "reference": "395220730edceb6bd745236ccb5c9125c748f779" + "reference": "4d04b5c24f3c9a1a168a131f6cbe297155bc0d30" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/stopwatch/zipball/395220730edceb6bd745236ccb5c9125c748f779", - "reference": "395220730edceb6bd745236ccb5c9125c748f779", + "url": "https://api.github.com/repos/symfony/stopwatch/zipball/4d04b5c24f3c9a1a168a131f6cbe297155bc0d30", + "reference": "4d04b5c24f3c9a1a168a131f6cbe297155bc0d30", "shasum": "" }, "require": { @@ -1996,7 +1996,7 @@ "description": "Provides a way to profile code", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/stopwatch/tree/v5.4.3" + "source": "https://github.com/symfony/stopwatch/tree/v5.4.5" }, "funding": [ { @@ -2012,7 +2012,7 @@ "type": "tidelift" } ], - "time": "2022-01-02T09:53:40+00:00" + "time": "2022-02-18T16:06:09+00:00" }, { "name": "symfony/string", From 06d1a8920b7361e407c0e09f53bd71c9078d2585 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=B6ller?= Date: Mon, 7 Mar 2022 19:46:43 +0100 Subject: [PATCH 2/4] Fix: Disable newly added fixers --- src/RuleSet/Php74.php | 2 ++ src/RuleSet/Php80.php | 2 ++ src/RuleSet/Php81.php | 2 ++ test/Unit/RuleSet/Php74Test.php | 2 ++ test/Unit/RuleSet/Php80Test.php | 2 ++ test/Unit/RuleSet/Php81Test.php | 2 ++ 6 files changed, 12 insertions(+) diff --git a/src/RuleSet/Php74.php b/src/RuleSet/Php74.php index 5bfeaa95..4c46f814 100644 --- a/src/RuleSet/Php74.php +++ b/src/RuleSet/Php74.php @@ -323,6 +323,7 @@ final class Php74 extends AbstractRuleSet implements ExplicitRuleSet ], 'no_trailing_comma_in_list_call' => true, 'no_trailing_comma_in_singleline_array' => true, + 'no_trailing_comma_in_singleline_function_call' => false, 'no_trailing_whitespace' => true, 'no_trailing_whitespace_in_comment' => true, 'no_trailing_whitespace_in_string' => true, @@ -606,6 +607,7 @@ final class Php74 extends AbstractRuleSet implements ExplicitRuleSet ], 'single_import_per_statement' => true, 'single_line_after_imports' => true, + 'single_line_comment_spacing' => false, 'single_line_comment_style' => [ 'comment_types' => [ 'hash', diff --git a/src/RuleSet/Php80.php b/src/RuleSet/Php80.php index 709caea6..45dd30d3 100644 --- a/src/RuleSet/Php80.php +++ b/src/RuleSet/Php80.php @@ -323,6 +323,7 @@ final class Php80 extends AbstractRuleSet implements ExplicitRuleSet ], 'no_trailing_comma_in_list_call' => true, 'no_trailing_comma_in_singleline_array' => true, + 'no_trailing_comma_in_singleline_function_call' => false, 'no_trailing_whitespace' => true, 'no_trailing_whitespace_in_comment' => true, 'no_trailing_whitespace_in_string' => true, @@ -606,6 +607,7 @@ final class Php80 extends AbstractRuleSet implements ExplicitRuleSet ], 'single_import_per_statement' => true, 'single_line_after_imports' => true, + 'single_line_comment_spacing' => false, 'single_line_comment_style' => [ 'comment_types' => [ 'hash', diff --git a/src/RuleSet/Php81.php b/src/RuleSet/Php81.php index 9dbdb642..395ec789 100644 --- a/src/RuleSet/Php81.php +++ b/src/RuleSet/Php81.php @@ -323,6 +323,7 @@ final class Php81 extends AbstractRuleSet implements ExplicitRuleSet ], 'no_trailing_comma_in_list_call' => true, 'no_trailing_comma_in_singleline_array' => true, + 'no_trailing_comma_in_singleline_function_call' => false, 'no_trailing_whitespace' => true, 'no_trailing_whitespace_in_comment' => true, 'no_trailing_whitespace_in_string' => true, @@ -606,6 +607,7 @@ final class Php81 extends AbstractRuleSet implements ExplicitRuleSet ], 'single_import_per_statement' => true, 'single_line_after_imports' => true, + 'single_line_comment_spacing' => false, 'single_line_comment_style' => [ 'comment_types' => [ 'hash', diff --git a/test/Unit/RuleSet/Php74Test.php b/test/Unit/RuleSet/Php74Test.php index 0810307c..d8909ce3 100644 --- a/test/Unit/RuleSet/Php74Test.php +++ b/test/Unit/RuleSet/Php74Test.php @@ -329,6 +329,7 @@ final class Php74Test extends ExplicitRuleSetTestCase ], 'no_trailing_comma_in_list_call' => true, 'no_trailing_comma_in_singleline_array' => true, + 'no_trailing_comma_in_singleline_function_call' => false, 'no_trailing_whitespace' => true, 'no_trailing_whitespace_in_comment' => true, 'no_trailing_whitespace_in_string' => true, @@ -612,6 +613,7 @@ final class Php74Test extends ExplicitRuleSetTestCase ], 'single_import_per_statement' => true, 'single_line_after_imports' => true, + 'single_line_comment_spacing' => false, 'single_line_comment_style' => [ 'comment_types' => [ 'hash', diff --git a/test/Unit/RuleSet/Php80Test.php b/test/Unit/RuleSet/Php80Test.php index 76cde348..77e524d7 100644 --- a/test/Unit/RuleSet/Php80Test.php +++ b/test/Unit/RuleSet/Php80Test.php @@ -329,6 +329,7 @@ final class Php80Test extends ExplicitRuleSetTestCase ], 'no_trailing_comma_in_list_call' => true, 'no_trailing_comma_in_singleline_array' => true, + 'no_trailing_comma_in_singleline_function_call' => false, 'no_trailing_whitespace' => true, 'no_trailing_whitespace_in_comment' => true, 'no_trailing_whitespace_in_string' => true, @@ -612,6 +613,7 @@ final class Php80Test extends ExplicitRuleSetTestCase ], 'single_import_per_statement' => true, 'single_line_after_imports' => true, + 'single_line_comment_spacing' => false, 'single_line_comment_style' => [ 'comment_types' => [ 'hash', diff --git a/test/Unit/RuleSet/Php81Test.php b/test/Unit/RuleSet/Php81Test.php index 9792be84..0b14d971 100644 --- a/test/Unit/RuleSet/Php81Test.php +++ b/test/Unit/RuleSet/Php81Test.php @@ -329,6 +329,7 @@ final class Php81Test extends ExplicitRuleSetTestCase ], 'no_trailing_comma_in_list_call' => true, 'no_trailing_comma_in_singleline_array' => true, + 'no_trailing_comma_in_singleline_function_call' => false, 'no_trailing_whitespace' => true, 'no_trailing_whitespace_in_comment' => true, 'no_trailing_whitespace_in_string' => true, @@ -612,6 +613,7 @@ final class Php81Test extends ExplicitRuleSetTestCase ], 'single_import_per_statement' => true, 'single_line_after_imports' => true, + 'single_line_comment_spacing' => false, 'single_line_comment_style' => [ 'comment_types' => [ 'hash', From c0351e9712d85e399d5e322bd52cfb9f2d847515 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=B6ller?= Date: Mon, 7 Mar 2022 19:49:18 +0100 Subject: [PATCH 3/4] Fix: Disable newly added options --- src/RuleSet/Php74.php | 2 ++ src/RuleSet/Php80.php | 2 ++ src/RuleSet/Php81.php | 2 ++ test/Unit/RuleSet/Php74Test.php | 2 ++ test/Unit/RuleSet/Php80Test.php | 2 ++ test/Unit/RuleSet/Php81Test.php | 2 ++ 6 files changed, 12 insertions(+) diff --git a/src/RuleSet/Php74.php b/src/RuleSet/Php74.php index 4c46f814..cb4624cc 100644 --- a/src/RuleSet/Php74.php +++ b/src/RuleSet/Php74.php @@ -76,6 +76,7 @@ final class Php74 extends AbstractRuleSet implements ExplicitRuleSet ], ], 'class_definition' => [ + 'inline_constructor_arguments' => true, 'multi_line_extends_each_single_line' => false, 'single_item_single_line' => false, 'single_line' => false, @@ -178,6 +179,7 @@ final class Php74 extends AbstractRuleSet implements ExplicitRuleSet 'fully_qualified_strict_types' => true, 'function_declaration' => [ 'closure_function_spacing' => 'one', + 'trailing_comma_single_line' => false, ], 'function_to_constant' => [ 'functions' => [ diff --git a/src/RuleSet/Php80.php b/src/RuleSet/Php80.php index 45dd30d3..c8a394cb 100644 --- a/src/RuleSet/Php80.php +++ b/src/RuleSet/Php80.php @@ -76,6 +76,7 @@ final class Php80 extends AbstractRuleSet implements ExplicitRuleSet ], ], 'class_definition' => [ + 'inline_constructor_arguments' => true, 'multi_line_extends_each_single_line' => false, 'single_item_single_line' => false, 'single_line' => false, @@ -178,6 +179,7 @@ final class Php80 extends AbstractRuleSet implements ExplicitRuleSet 'fully_qualified_strict_types' => true, 'function_declaration' => [ 'closure_function_spacing' => 'one', + 'trailing_comma_single_line' => false, ], 'function_to_constant' => [ 'functions' => [ diff --git a/src/RuleSet/Php81.php b/src/RuleSet/Php81.php index 395ec789..2cb7807b 100644 --- a/src/RuleSet/Php81.php +++ b/src/RuleSet/Php81.php @@ -76,6 +76,7 @@ final class Php81 extends AbstractRuleSet implements ExplicitRuleSet ], ], 'class_definition' => [ + 'inline_constructor_arguments' => true, 'multi_line_extends_each_single_line' => false, 'single_item_single_line' => false, 'single_line' => false, @@ -178,6 +179,7 @@ final class Php81 extends AbstractRuleSet implements ExplicitRuleSet 'fully_qualified_strict_types' => true, 'function_declaration' => [ 'closure_function_spacing' => 'one', + 'trailing_comma_single_line' => false, ], 'function_to_constant' => [ 'functions' => [ diff --git a/test/Unit/RuleSet/Php74Test.php b/test/Unit/RuleSet/Php74Test.php index d8909ce3..4c9a38f6 100644 --- a/test/Unit/RuleSet/Php74Test.php +++ b/test/Unit/RuleSet/Php74Test.php @@ -82,6 +82,7 @@ final class Php74Test extends ExplicitRuleSetTestCase ], ], 'class_definition' => [ + 'inline_constructor_arguments' => true, 'multi_line_extends_each_single_line' => false, 'single_item_single_line' => false, 'single_line' => false, @@ -184,6 +185,7 @@ final class Php74Test extends ExplicitRuleSetTestCase 'fully_qualified_strict_types' => true, 'function_declaration' => [ 'closure_function_spacing' => 'one', + 'trailing_comma_single_line' => false, ], 'function_to_constant' => [ 'functions' => [ diff --git a/test/Unit/RuleSet/Php80Test.php b/test/Unit/RuleSet/Php80Test.php index 77e524d7..ce550b7b 100644 --- a/test/Unit/RuleSet/Php80Test.php +++ b/test/Unit/RuleSet/Php80Test.php @@ -82,6 +82,7 @@ final class Php80Test extends ExplicitRuleSetTestCase ], ], 'class_definition' => [ + 'inline_constructor_arguments' => true, 'multi_line_extends_each_single_line' => false, 'single_item_single_line' => false, 'single_line' => false, @@ -184,6 +185,7 @@ final class Php80Test extends ExplicitRuleSetTestCase 'fully_qualified_strict_types' => true, 'function_declaration' => [ 'closure_function_spacing' => 'one', + 'trailing_comma_single_line' => false, ], 'function_to_constant' => [ 'functions' => [ diff --git a/test/Unit/RuleSet/Php81Test.php b/test/Unit/RuleSet/Php81Test.php index 0b14d971..4bb9f992 100644 --- a/test/Unit/RuleSet/Php81Test.php +++ b/test/Unit/RuleSet/Php81Test.php @@ -82,6 +82,7 @@ final class Php81Test extends ExplicitRuleSetTestCase ], ], 'class_definition' => [ + 'inline_constructor_arguments' => true, 'multi_line_extends_each_single_line' => false, 'single_item_single_line' => false, 'single_line' => false, @@ -184,6 +185,7 @@ final class Php81Test extends ExplicitRuleSetTestCase 'fully_qualified_strict_types' => true, 'function_declaration' => [ 'closure_function_spacing' => 'one', + 'trailing_comma_single_line' => false, ], 'function_to_constant' => [ 'functions' => [ From 90549834dcef651134f5c4b30bf88a092b01f771 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=B6ller?= Date: Mon, 7 Mar 2022 19:43:55 +0100 Subject: [PATCH 4/4] Fix: Update CHANGELOG.md --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1fcf1468..39c60206 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), For a full diff see [`4.1.0...main`][4.1.0...main]. +### Changed + +- Updated `friendsofphp/php-cs-fixer` ([#578]), by [@dependabot] + ## [`4.1.0`][4.1.0] For a full diff see [`4.0.0...4.1.0`][4.0.0...4.1.0]. @@ -583,6 +587,7 @@ For a full diff see [`d899e77...1.0.0`][d899e77...1.0.0]. [#565]: https://github.com/ergebnis/php-cs-fixer-config/pull/565 [#566]: https://github.com/ergebnis/php-cs-fixer-config/pull/566 [#567]: https://github.com/ergebnis/php-cs-fixer-config/pull/567 +[#578]: https://github.com/ergebnis/php-cs-fixer-config/pull/578 [@dependabot]: https://github.com/apps/dependabot [@linuxjuggler]: https://github.com/linuxjuggler