From dbd32333137d8b202a5f84e90c49302890d4b24c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 2 Sep 2022 11:28:58 +0000 Subject: [PATCH 1/5] composer(deps): bump friendsofphp/php-cs-fixer from 3.10.0 to 3.11.0 Bumps [friendsofphp/php-cs-fixer](https://github.com/FriendsOfPHP/PHP-CS-Fixer) from 3.10.0 to 3.11.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.10.0...v3.11.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 | 26 +++++++++++++------------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/composer.json b/composer.json index cf9cbaf8..d4651e51 100644 --- a/composer.json +++ b/composer.json @@ -17,7 +17,7 @@ "require": { "php": "^7.4 || ^8.0", "ext-filter": "*", - "friendsofphp/php-cs-fixer": "~3.10.0" + "friendsofphp/php-cs-fixer": "~3.11.0" }, "require-dev": { "ergebnis/composer-normalize": "^2.28.3", diff --git a/composer.lock b/composer.lock index a8195345..09984e13 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": "1c33d060b2bc4b1c86330932e5a54964", + "content-hash": "4bec91fb6d0b94bd1413899a36b8bcdb", "packages": [ { "name": "composer/pcre", @@ -375,16 +375,16 @@ }, { "name": "friendsofphp/php-cs-fixer", - "version": "v3.10.0", + "version": "v3.11.0", "source": { "type": "git", "url": "https://github.com/FriendsOfPHP/PHP-CS-Fixer.git", - "reference": "76d7da666e66d83a1dc27a9d1c625c80cc4ac1fe" + "reference": "7dcdea3f2f5f473464e835be9be55283ff8cfdc3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/76d7da666e66d83a1dc27a9d1c625c80cc4ac1fe", - "reference": "76d7da666e66d83a1dc27a9d1c625c80cc4ac1fe", + "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/7dcdea3f2f5f473464e835be9be55283ff8cfdc3", + "reference": "7dcdea3f2f5f473464e835be9be55283ff8cfdc3", "shasum": "" }, "require": { @@ -452,7 +452,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.10.0" + "source": "https://github.com/FriendsOfPHP/PHP-CS-Fixer/tree/v3.11.0" }, "funding": [ { @@ -460,7 +460,7 @@ "type": "github" } ], - "time": "2022-08-17T22:13:10+00:00" + "time": "2022-09-01T18:24:51+00:00" }, { "name": "psr/cache", @@ -1057,16 +1057,16 @@ }, { "name": "symfony/filesystem", - "version": "v5.4.11", + "version": "v5.4.12", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "6699fb0228d1bc35b12aed6dd5e7455457609ddd" + "reference": "2d67c1f9a1937406a9be3171b4b22250c0a11447" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/6699fb0228d1bc35b12aed6dd5e7455457609ddd", - "reference": "6699fb0228d1bc35b12aed6dd5e7455457609ddd", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/2d67c1f9a1937406a9be3171b4b22250c0a11447", + "reference": "2d67c1f9a1937406a9be3171b4b22250c0a11447", "shasum": "" }, "require": { @@ -1101,7 +1101,7 @@ "description": "Provides basic utilities for the filesystem", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/filesystem/tree/v5.4.11" + "source": "https://github.com/symfony/filesystem/tree/v5.4.12" }, "funding": [ { @@ -1117,7 +1117,7 @@ "type": "tidelift" } ], - "time": "2022-07-20T13:00:38+00:00" + "time": "2022-08-02T13:48:16+00:00" }, { "name": "symfony/finder", From efa0035b24f7d1686d7709cb6e13aeafd9d355e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=B6ller?= Date: Fri, 2 Sep 2022 13:30:34 +0200 Subject: [PATCH 2/5] Fix: Update CHANGELOG.md --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9cda751e..6c62cb52 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.7.0...main`][4.7.0...main]. +### Changed + +- Updated `friendsofphp/php-cs-fixer` ([#651]), by [@dependabot] + ## [`4.7.0`][4.7.0] For a full diff see [`4.6.0...4.7.0`][4.6.0...4.7.0]. @@ -732,6 +736,7 @@ For a full diff see [`d899e77...1.0.0`][d899e77...1.0.0]. [#644]: https://github.com/ergebnis/php-cs-fixer-config/pull/644 [#645]: https://github.com/ergebnis/php-cs-fixer-config/pull/645 [#646]: https://github.com/ergebnis/php-cs-fixer-config/pull/646 +[#651]: https://github.com/ergebnis/php-cs-fixer-config/pull/651 [@dependabot]: https://github.com/apps/dependabot [@linuxjuggler]: https://github.com/linuxjuggler From 4bde5b474258f989ad25597c244a28f8f14b03a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=B6ller?= Date: Fri, 2 Sep 2022 13:37:25 +0200 Subject: [PATCH 3/5] Fix: Configure no_trailing_comma_in_singleline instead of deprecated no_trailing_comma_in_list_call, no_trailing_comma_in_singleline_array, and no_trailing_comma_in_singleline_function_call fixers --- src/RuleSet/Php74.php | 10 +++++++--- src/RuleSet/Php80.php | 10 +++++++--- src/RuleSet/Php81.php | 10 +++++++--- test/Unit/RuleSet/Php74Test.php | 10 +++++++--- test/Unit/RuleSet/Php80Test.php | 10 +++++++--- test/Unit/RuleSet/Php81Test.php | 10 +++++++--- 6 files changed, 42 insertions(+), 18 deletions(-) diff --git a/src/RuleSet/Php74.php b/src/RuleSet/Php74.php index c4963731..77353e9d 100644 --- a/src/RuleSet/Php74.php +++ b/src/RuleSet/Php74.php @@ -344,9 +344,13 @@ final class Php74 extends AbstractRuleSet implements ExplicitRuleSet 'allow_unused_params' => false, 'remove_inheritdoc' => false, ], - 'no_trailing_comma_in_list_call' => true, - 'no_trailing_comma_in_singleline_array' => true, - 'no_trailing_comma_in_singleline_function_call' => true, + 'no_trailing_comma_in_singleline' => [ + 'elements' => [ + 'arguments', + 'array', + 'array_destructuring', + ], + ], 'no_trailing_whitespace' => true, 'no_trailing_whitespace_in_comment' => true, 'no_trailing_whitespace_in_string' => true, diff --git a/src/RuleSet/Php80.php b/src/RuleSet/Php80.php index ccfafdb8..b2ecf3b3 100644 --- a/src/RuleSet/Php80.php +++ b/src/RuleSet/Php80.php @@ -345,9 +345,13 @@ final class Php80 extends AbstractRuleSet implements ExplicitRuleSet 'allow_unused_params' => false, 'remove_inheritdoc' => false, ], - 'no_trailing_comma_in_list_call' => true, - 'no_trailing_comma_in_singleline_array' => true, - 'no_trailing_comma_in_singleline_function_call' => true, + 'no_trailing_comma_in_singleline' => [ + 'elements' => [ + 'arguments', + 'array', + 'array_destructuring', + ], + ], 'no_trailing_whitespace' => true, 'no_trailing_whitespace_in_comment' => true, 'no_trailing_whitespace_in_string' => true, diff --git a/src/RuleSet/Php81.php b/src/RuleSet/Php81.php index b6a28827..295c06f1 100644 --- a/src/RuleSet/Php81.php +++ b/src/RuleSet/Php81.php @@ -345,9 +345,13 @@ final class Php81 extends AbstractRuleSet implements ExplicitRuleSet 'allow_unused_params' => false, 'remove_inheritdoc' => false, ], - 'no_trailing_comma_in_list_call' => true, - 'no_trailing_comma_in_singleline_array' => true, - 'no_trailing_comma_in_singleline_function_call' => true, + 'no_trailing_comma_in_singleline' => [ + 'elements' => [ + 'arguments', + 'array', + 'array_destructuring', + ], + ], 'no_trailing_whitespace' => true, 'no_trailing_whitespace_in_comment' => true, 'no_trailing_whitespace_in_string' => true, diff --git a/test/Unit/RuleSet/Php74Test.php b/test/Unit/RuleSet/Php74Test.php index ec5e0556..4010a5e5 100644 --- a/test/Unit/RuleSet/Php74Test.php +++ b/test/Unit/RuleSet/Php74Test.php @@ -350,9 +350,13 @@ final class Php74Test extends ExplicitRuleSetTestCase 'allow_unused_params' => false, 'remove_inheritdoc' => false, ], - 'no_trailing_comma_in_list_call' => true, - 'no_trailing_comma_in_singleline_array' => true, - 'no_trailing_comma_in_singleline_function_call' => true, + 'no_trailing_comma_in_singleline' => [ + 'elements' => [ + 'arguments', + 'array', + 'array_destructuring', + ], + ], 'no_trailing_whitespace' => true, 'no_trailing_whitespace_in_comment' => true, 'no_trailing_whitespace_in_string' => true, diff --git a/test/Unit/RuleSet/Php80Test.php b/test/Unit/RuleSet/Php80Test.php index 07a46bf2..5115ba97 100644 --- a/test/Unit/RuleSet/Php80Test.php +++ b/test/Unit/RuleSet/Php80Test.php @@ -351,9 +351,13 @@ final class Php80Test extends ExplicitRuleSetTestCase 'allow_unused_params' => false, 'remove_inheritdoc' => false, ], - 'no_trailing_comma_in_list_call' => true, - 'no_trailing_comma_in_singleline_array' => true, - 'no_trailing_comma_in_singleline_function_call' => true, + 'no_trailing_comma_in_singleline' => [ + 'elements' => [ + 'arguments', + 'array', + 'array_destructuring', + ], + ], 'no_trailing_whitespace' => true, 'no_trailing_whitespace_in_comment' => true, 'no_trailing_whitespace_in_string' => true, diff --git a/test/Unit/RuleSet/Php81Test.php b/test/Unit/RuleSet/Php81Test.php index f92835dd..dbab1eac 100644 --- a/test/Unit/RuleSet/Php81Test.php +++ b/test/Unit/RuleSet/Php81Test.php @@ -351,9 +351,13 @@ final class Php81Test extends ExplicitRuleSetTestCase 'allow_unused_params' => false, 'remove_inheritdoc' => false, ], - 'no_trailing_comma_in_list_call' => true, - 'no_trailing_comma_in_singleline_array' => true, - 'no_trailing_comma_in_singleline_function_call' => true, + 'no_trailing_comma_in_singleline' => [ + 'elements' => [ + 'arguments', + 'array', + 'array_destructuring', + ], + ], 'no_trailing_whitespace' => true, 'no_trailing_whitespace_in_comment' => true, 'no_trailing_whitespace_in_string' => true, From 049331ca319538047909329c10c80e4f213f7275 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=B6ller?= Date: Fri, 2 Sep 2022 13:41:57 +0200 Subject: [PATCH 4/5] Fix: Configure phpdoc_separation fixer --- src/RuleSet/Php74.php | 26 +++++++++++++++++++++++++- src/RuleSet/Php80.php | 26 +++++++++++++++++++++++++- src/RuleSet/Php81.php | 26 +++++++++++++++++++++++++- test/Unit/RuleSet/Php74Test.php | 26 +++++++++++++++++++++++++- test/Unit/RuleSet/Php80Test.php | 26 +++++++++++++++++++++++++- test/Unit/RuleSet/Php81Test.php | 26 +++++++++++++++++++++++++- 6 files changed, 150 insertions(+), 6 deletions(-) diff --git a/src/RuleSet/Php74.php b/src/RuleSet/Php74.php index 77353e9d..ed3a216c 100644 --- a/src/RuleSet/Php74.php +++ b/src/RuleSet/Php74.php @@ -579,7 +579,31 @@ final class Php74 extends AbstractRuleSet implements ExplicitRuleSet 'str', ], ], - 'phpdoc_separation' => true, + 'phpdoc_separation' => [ + 'groups' => [ + [ + 'deprecated', + 'link', + 'see', + 'since', + ], + [ + 'author', + 'copyright', + 'license', + ], + [ + 'category', + 'package', + 'subpackage', + ], + [ + 'property', + 'property-read', + 'property-write', + ], + ], + ], 'phpdoc_single_line_var_spacing' => true, 'phpdoc_summary' => true, 'phpdoc_tag_casing' => [ diff --git a/src/RuleSet/Php80.php b/src/RuleSet/Php80.php index b2ecf3b3..0f817205 100644 --- a/src/RuleSet/Php80.php +++ b/src/RuleSet/Php80.php @@ -580,7 +580,31 @@ final class Php80 extends AbstractRuleSet implements ExplicitRuleSet 'str', ], ], - 'phpdoc_separation' => true, + 'phpdoc_separation' => [ + 'groups' => [ + [ + 'deprecated', + 'link', + 'see', + 'since', + ], + [ + 'author', + 'copyright', + 'license', + ], + [ + 'category', + 'package', + 'subpackage', + ], + [ + 'property', + 'property-read', + 'property-write', + ], + ], + ], 'phpdoc_single_line_var_spacing' => true, 'phpdoc_summary' => true, 'phpdoc_tag_casing' => [ diff --git a/src/RuleSet/Php81.php b/src/RuleSet/Php81.php index 295c06f1..b569d79f 100644 --- a/src/RuleSet/Php81.php +++ b/src/RuleSet/Php81.php @@ -581,7 +581,31 @@ final class Php81 extends AbstractRuleSet implements ExplicitRuleSet 'str', ], ], - 'phpdoc_separation' => true, + 'phpdoc_separation' => [ + 'groups' => [ + [ + 'deprecated', + 'link', + 'see', + 'since', + ], + [ + 'author', + 'copyright', + 'license', + ], + [ + 'category', + 'package', + 'subpackage', + ], + [ + 'property', + 'property-read', + 'property-write', + ], + ], + ], 'phpdoc_single_line_var_spacing' => true, 'phpdoc_summary' => true, 'phpdoc_tag_casing' => [ diff --git a/test/Unit/RuleSet/Php74Test.php b/test/Unit/RuleSet/Php74Test.php index 4010a5e5..94580949 100644 --- a/test/Unit/RuleSet/Php74Test.php +++ b/test/Unit/RuleSet/Php74Test.php @@ -585,7 +585,31 @@ final class Php74Test extends ExplicitRuleSetTestCase 'str', ], ], - 'phpdoc_separation' => true, + 'phpdoc_separation' => [ + 'groups' => [ + [ + 'deprecated', + 'link', + 'see', + 'since', + ], + [ + 'author', + 'copyright', + 'license', + ], + [ + 'category', + 'package', + 'subpackage', + ], + [ + 'property', + 'property-read', + 'property-write', + ], + ], + ], 'phpdoc_single_line_var_spacing' => true, 'phpdoc_summary' => true, 'phpdoc_tag_casing' => [ diff --git a/test/Unit/RuleSet/Php80Test.php b/test/Unit/RuleSet/Php80Test.php index 5115ba97..1dcc946c 100644 --- a/test/Unit/RuleSet/Php80Test.php +++ b/test/Unit/RuleSet/Php80Test.php @@ -586,7 +586,31 @@ final class Php80Test extends ExplicitRuleSetTestCase 'str', ], ], - 'phpdoc_separation' => true, + 'phpdoc_separation' => [ + 'groups' => [ + [ + 'deprecated', + 'link', + 'see', + 'since', + ], + [ + 'author', + 'copyright', + 'license', + ], + [ + 'category', + 'package', + 'subpackage', + ], + [ + 'property', + 'property-read', + 'property-write', + ], + ], + ], 'phpdoc_single_line_var_spacing' => true, 'phpdoc_summary' => true, 'phpdoc_tag_casing' => [ diff --git a/test/Unit/RuleSet/Php81Test.php b/test/Unit/RuleSet/Php81Test.php index dbab1eac..c90ae7a6 100644 --- a/test/Unit/RuleSet/Php81Test.php +++ b/test/Unit/RuleSet/Php81Test.php @@ -587,7 +587,31 @@ final class Php81Test extends ExplicitRuleSetTestCase 'str', ], ], - 'phpdoc_separation' => true, + 'phpdoc_separation' => [ + 'groups' => [ + [ + 'deprecated', + 'link', + 'see', + 'since', + ], + [ + 'author', + 'copyright', + 'license', + ], + [ + 'category', + 'package', + 'subpackage', + ], + [ + 'property', + 'property-read', + 'property-write', + ], + ], + ], 'phpdoc_single_line_var_spacing' => true, 'phpdoc_summary' => true, 'phpdoc_tag_casing' => [ From f10f0cb896b763825dc083c9bd289d85830062b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=B6ller?= Date: Fri, 2 Sep 2022 13:45:31 +0200 Subject: [PATCH 5/5] Fix: Update CHANGELOG.md --- CHANGELOG.md | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6c62cb52..55ae493c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), ## Unreleased -For a full diff see [`4.7.0...main`][4.7.0...main]. +For a full diff see [`4.8.0...main`][4.8.0...main]. + +## [`4.8.0`][4.8.0] + +For a full diff see [`4.7.0...4.8.0`][4.7.0...4.8.0]. ### Changed @@ -550,6 +554,7 @@ For a full diff see [`d899e77...1.0.0`][d899e77...1.0.0]. [4.5.3]: https://github.com/ergebnis/php-cs-fixer-config/releases/tag/4.5.3 [4.6.0]: https://github.com/ergebnis/php-cs-fixer-config/releases/tag/4.6.0 [4.7.0]: https://github.com/ergebnis/php-cs-fixer-config/releases/tag/4.7.0 +[4.8.0]: https://github.com/ergebnis/php-cs-fixer-config/releases/tag/4.8.0 [d899e77...1.0.0]: https://github.com/ergebnis/php-cs-fixer-config/compare/d899e77...1.0.0 [1.0.0...1.1.0]: https://github.com/ergebnis/php-cs-fixer-config/compare/1.0.0...1.1.0 @@ -597,7 +602,8 @@ For a full diff see [`d899e77...1.0.0`][d899e77...1.0.0]. [4.5.2...4.5.3]: https://github.com/ergebnis/php-cs-fixer-config/compare/4.5.2...4.5.3 [4.5.3...4.6.0]: https://github.com/ergebnis/php-cs-fixer-config/compare/4.5.3...4.6.0 [4.6.0...4.7.0]: https://github.com/ergebnis/php-cs-fixer-config/compare/4.6.0...4.7.0 -[4.7.0...main]: https://github.com/ergebnis/php-cs-fixer-config/compare/4.7.0...main +[4.7.0...4.8.0]: https://github.com/ergebnis/php-cs-fixer-config/compare/4.7.0...4.8.0 +[4.8.0...main]: https://github.com/ergebnis/php-cs-fixer-config/compare/4.8.0...main [#3]: https://github.com/ergebnis/php-cs-fixer-config/pull/3 [#14]: https://github.com/ergebnis/php-cs-fixer-config/pull/14