From afa6b8862c2afa3abb0cc1ed4e45f51c10f553b9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 23 Feb 2025 18:47:15 +0000 Subject: [PATCH 1/3] composer(deps): Bump friendsofphp/php-cs-fixer from 3.69.1 to 3.70.0 Bumps [friendsofphp/php-cs-fixer](https://github.com/PHP-CS-Fixer/PHP-CS-Fixer) from 3.69.1 to 3.70.0. - [Release notes](https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/releases) - [Changelog](https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/blob/master/CHANGELOG.md) - [Commits](https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/compare/v3.69.1...v3.70.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 | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/composer.json b/composer.json index 86727714..f63e5924 100644 --- a/composer.json +++ b/composer.json @@ -20,7 +20,7 @@ "php": "~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0", "ext-filter": "*", "erickskrauch/php-cs-fixer-custom-fixers": "~1.3.0", - "friendsofphp/php-cs-fixer": "~3.69.1", + "friendsofphp/php-cs-fixer": "~3.70.0", "kubawerlos/php-cs-fixer-custom-fixers": "~3.23.0" }, "require-dev": { diff --git a/composer.lock b/composer.lock index 957be523..91c9e2ed 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": "70633237c69c51060aee9ac52e8da6b8", + "content-hash": "95b04816dddc8080aaf1d3f263aab74b", "packages": [ { "name": "clue/ndjson-react", @@ -473,16 +473,16 @@ }, { "name": "friendsofphp/php-cs-fixer", - "version": "v3.69.1", + "version": "v3.70.0", "source": { "type": "git", "url": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git", - "reference": "13b0c0eede38c11cd674b080f2b485d0f14ffa9f" + "reference": "2ecd5aae0edc937f0d5aa4a22d1d705c6b2e084e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/13b0c0eede38c11cd674b080f2b485d0f14ffa9f", - "reference": "13b0c0eede38c11cd674b080f2b485d0f14ffa9f", + "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/2ecd5aae0edc937f0d5aa4a22d1d705c6b2e084e", + "reference": "2ecd5aae0edc937f0d5aa4a22d1d705c6b2e084e", "shasum": "" }, "require": { @@ -564,7 +564,7 @@ ], "support": { "issues": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues", - "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.69.1" + "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.70.0" }, "funding": [ { @@ -572,7 +572,7 @@ "type": "github" } ], - "time": "2025-02-18T23:57:43+00:00" + "time": "2025-02-22T23:30:51+00:00" }, { "name": "kubawerlos/php-cs-fixer-custom-fixers", From 9815861a923033d5c5213c171c99c10c6c87e21d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=B6ller?= Date: Sun, 23 Feb 2025 19:55:11 +0100 Subject: [PATCH 2/3] Fix: Disable newly added fixer --- src/RuleSet/Php53.php | 1 + src/RuleSet/Php54.php | 1 + src/RuleSet/Php55.php | 1 + src/RuleSet/Php56.php | 1 + src/RuleSet/Php70.php | 1 + src/RuleSet/Php71.php | 1 + src/RuleSet/Php72.php | 1 + src/RuleSet/Php73.php | 1 + src/RuleSet/Php74.php | 1 + src/RuleSet/Php80.php | 1 + src/RuleSet/Php81.php | 1 + src/RuleSet/Php82.php | 1 + src/RuleSet/Php83.php | 1 + src/RuleSet/Php84.php | 1 + test/Unit/RuleSet/Php53Test.php | 1 + test/Unit/RuleSet/Php54Test.php | 1 + test/Unit/RuleSet/Php55Test.php | 1 + test/Unit/RuleSet/Php56Test.php | 1 + test/Unit/RuleSet/Php70Test.php | 1 + test/Unit/RuleSet/Php71Test.php | 1 + test/Unit/RuleSet/Php72Test.php | 1 + test/Unit/RuleSet/Php73Test.php | 1 + test/Unit/RuleSet/Php74Test.php | 1 + test/Unit/RuleSet/Php80Test.php | 1 + test/Unit/RuleSet/Php81Test.php | 1 + test/Unit/RuleSet/Php82Test.php | 1 + test/Unit/RuleSet/Php83Test.php | 1 + test/Unit/RuleSet/Php84Test.php | 1 + 28 files changed, 28 insertions(+) diff --git a/src/RuleSet/Php53.php b/src/RuleSet/Php53.php index 5a5cd549..11620fd9 100644 --- a/src/RuleSet/Php53.php +++ b/src/RuleSet/Php53.php @@ -487,6 +487,7 @@ public static function create(): RuleSet 'assertSame', ], ], + 'php_unit_data_provider_method_order' => false, 'php_unit_data_provider_name' => false, 'php_unit_data_provider_return_type' => false, 'php_unit_data_provider_static' => [ diff --git a/src/RuleSet/Php54.php b/src/RuleSet/Php54.php index a163bfb2..fca54dd1 100644 --- a/src/RuleSet/Php54.php +++ b/src/RuleSet/Php54.php @@ -488,6 +488,7 @@ public static function create(): RuleSet 'assertSame', ], ], + 'php_unit_data_provider_method_order' => false, 'php_unit_data_provider_name' => false, 'php_unit_data_provider_return_type' => false, 'php_unit_data_provider_static' => [ diff --git a/src/RuleSet/Php55.php b/src/RuleSet/Php55.php index 4674e727..4de0986d 100644 --- a/src/RuleSet/Php55.php +++ b/src/RuleSet/Php55.php @@ -494,6 +494,7 @@ public static function create(): RuleSet 'assertSame', ], ], + 'php_unit_data_provider_method_order' => false, 'php_unit_data_provider_name' => false, 'php_unit_data_provider_return_type' => false, 'php_unit_data_provider_static' => [ diff --git a/src/RuleSet/Php56.php b/src/RuleSet/Php56.php index 8bc47a6b..66c1ea92 100644 --- a/src/RuleSet/Php56.php +++ b/src/RuleSet/Php56.php @@ -494,6 +494,7 @@ public static function create(): RuleSet 'assertSame', ], ], + 'php_unit_data_provider_method_order' => false, 'php_unit_data_provider_name' => false, 'php_unit_data_provider_return_type' => false, 'php_unit_data_provider_static' => [ diff --git a/src/RuleSet/Php70.php b/src/RuleSet/Php70.php index faf7c2f0..c9ec60b2 100644 --- a/src/RuleSet/Php70.php +++ b/src/RuleSet/Php70.php @@ -494,6 +494,7 @@ public static function create(): RuleSet 'assertSame', ], ], + 'php_unit_data_provider_method_order' => false, 'php_unit_data_provider_name' => false, 'php_unit_data_provider_return_type' => false, 'php_unit_data_provider_static' => [ diff --git a/src/RuleSet/Php71.php b/src/RuleSet/Php71.php index 78ee23ca..5f4bfbbb 100644 --- a/src/RuleSet/Php71.php +++ b/src/RuleSet/Php71.php @@ -494,6 +494,7 @@ public static function create(): RuleSet 'assertSame', ], ], + 'php_unit_data_provider_method_order' => false, 'php_unit_data_provider_name' => false, 'php_unit_data_provider_return_type' => true, 'php_unit_data_provider_static' => [ diff --git a/src/RuleSet/Php72.php b/src/RuleSet/Php72.php index 1d45849e..c85f722f 100644 --- a/src/RuleSet/Php72.php +++ b/src/RuleSet/Php72.php @@ -494,6 +494,7 @@ public static function create(): RuleSet 'assertSame', ], ], + 'php_unit_data_provider_method_order' => false, 'php_unit_data_provider_name' => false, 'php_unit_data_provider_return_type' => true, 'php_unit_data_provider_static' => [ diff --git a/src/RuleSet/Php73.php b/src/RuleSet/Php73.php index 868378d7..756f1ac2 100644 --- a/src/RuleSet/Php73.php +++ b/src/RuleSet/Php73.php @@ -494,6 +494,7 @@ public static function create(): RuleSet 'assertSame', ], ], + 'php_unit_data_provider_method_order' => false, 'php_unit_data_provider_name' => false, 'php_unit_data_provider_return_type' => true, 'php_unit_data_provider_static' => [ diff --git a/src/RuleSet/Php74.php b/src/RuleSet/Php74.php index c722233c..94513845 100644 --- a/src/RuleSet/Php74.php +++ b/src/RuleSet/Php74.php @@ -494,6 +494,7 @@ public static function create(): RuleSet 'assertSame', ], ], + 'php_unit_data_provider_method_order' => false, 'php_unit_data_provider_name' => false, 'php_unit_data_provider_return_type' => true, 'php_unit_data_provider_static' => [ diff --git a/src/RuleSet/Php80.php b/src/RuleSet/Php80.php index bc54167e..527dcf32 100644 --- a/src/RuleSet/Php80.php +++ b/src/RuleSet/Php80.php @@ -509,6 +509,7 @@ public static function create(): RuleSet 'assertSame', ], ], + 'php_unit_data_provider_method_order' => false, 'php_unit_data_provider_name' => false, 'php_unit_data_provider_return_type' => true, 'php_unit_data_provider_static' => [ diff --git a/src/RuleSet/Php81.php b/src/RuleSet/Php81.php index 3ea8fe9a..528c6c4b 100644 --- a/src/RuleSet/Php81.php +++ b/src/RuleSet/Php81.php @@ -511,6 +511,7 @@ public static function create(): RuleSet 'assertSame', ], ], + 'php_unit_data_provider_method_order' => false, 'php_unit_data_provider_name' => false, 'php_unit_data_provider_return_type' => true, 'php_unit_data_provider_static' => [ diff --git a/src/RuleSet/Php82.php b/src/RuleSet/Php82.php index ab455dec..649c55d5 100644 --- a/src/RuleSet/Php82.php +++ b/src/RuleSet/Php82.php @@ -511,6 +511,7 @@ public static function create(): RuleSet 'assertSame', ], ], + 'php_unit_data_provider_method_order' => false, 'php_unit_data_provider_name' => false, 'php_unit_data_provider_return_type' => true, 'php_unit_data_provider_static' => [ diff --git a/src/RuleSet/Php83.php b/src/RuleSet/Php83.php index 3234b72d..c654151b 100644 --- a/src/RuleSet/Php83.php +++ b/src/RuleSet/Php83.php @@ -511,6 +511,7 @@ public static function create(): RuleSet 'assertSame', ], ], + 'php_unit_data_provider_method_order' => false, 'php_unit_data_provider_name' => false, 'php_unit_data_provider_return_type' => true, 'php_unit_data_provider_static' => [ diff --git a/src/RuleSet/Php84.php b/src/RuleSet/Php84.php index ee970877..8239d7c9 100644 --- a/src/RuleSet/Php84.php +++ b/src/RuleSet/Php84.php @@ -511,6 +511,7 @@ public static function create(): RuleSet 'assertSame', ], ], + 'php_unit_data_provider_method_order' => false, 'php_unit_data_provider_name' => false, 'php_unit_data_provider_return_type' => true, 'php_unit_data_provider_static' => [ diff --git a/test/Unit/RuleSet/Php53Test.php b/test/Unit/RuleSet/Php53Test.php index f6c4d26a..1163909a 100644 --- a/test/Unit/RuleSet/Php53Test.php +++ b/test/Unit/RuleSet/Php53Test.php @@ -510,6 +510,7 @@ protected function expectedRules(): Rules 'assertSame', ], ], + 'php_unit_data_provider_method_order' => false, 'php_unit_data_provider_name' => false, 'php_unit_data_provider_return_type' => false, 'php_unit_data_provider_static' => [ diff --git a/test/Unit/RuleSet/Php54Test.php b/test/Unit/RuleSet/Php54Test.php index 5a433caa..6414baec 100644 --- a/test/Unit/RuleSet/Php54Test.php +++ b/test/Unit/RuleSet/Php54Test.php @@ -511,6 +511,7 @@ protected function expectedRules(): Rules 'assertSame', ], ], + 'php_unit_data_provider_method_order' => false, 'php_unit_data_provider_name' => false, 'php_unit_data_provider_return_type' => false, 'php_unit_data_provider_static' => [ diff --git a/test/Unit/RuleSet/Php55Test.php b/test/Unit/RuleSet/Php55Test.php index e90ba22f..0d96c8a5 100644 --- a/test/Unit/RuleSet/Php55Test.php +++ b/test/Unit/RuleSet/Php55Test.php @@ -517,6 +517,7 @@ protected function expectedRules(): Rules 'assertSame', ], ], + 'php_unit_data_provider_method_order' => false, 'php_unit_data_provider_name' => false, 'php_unit_data_provider_return_type' => false, 'php_unit_data_provider_static' => [ diff --git a/test/Unit/RuleSet/Php56Test.php b/test/Unit/RuleSet/Php56Test.php index c3dea705..0afb90cd 100644 --- a/test/Unit/RuleSet/Php56Test.php +++ b/test/Unit/RuleSet/Php56Test.php @@ -517,6 +517,7 @@ protected function expectedRules(): Rules 'assertSame', ], ], + 'php_unit_data_provider_method_order' => false, 'php_unit_data_provider_name' => false, 'php_unit_data_provider_return_type' => false, 'php_unit_data_provider_static' => [ diff --git a/test/Unit/RuleSet/Php70Test.php b/test/Unit/RuleSet/Php70Test.php index 767c6955..5fd02255 100644 --- a/test/Unit/RuleSet/Php70Test.php +++ b/test/Unit/RuleSet/Php70Test.php @@ -517,6 +517,7 @@ protected function expectedRules(): Rules 'assertSame', ], ], + 'php_unit_data_provider_method_order' => false, 'php_unit_data_provider_name' => false, 'php_unit_data_provider_return_type' => false, 'php_unit_data_provider_static' => [ diff --git a/test/Unit/RuleSet/Php71Test.php b/test/Unit/RuleSet/Php71Test.php index 9b33d8d2..484f3396 100644 --- a/test/Unit/RuleSet/Php71Test.php +++ b/test/Unit/RuleSet/Php71Test.php @@ -517,6 +517,7 @@ protected function expectedRules(): Rules 'assertSame', ], ], + 'php_unit_data_provider_method_order' => false, 'php_unit_data_provider_name' => false, 'php_unit_data_provider_return_type' => true, 'php_unit_data_provider_static' => [ diff --git a/test/Unit/RuleSet/Php72Test.php b/test/Unit/RuleSet/Php72Test.php index 942ccdf2..fb31dc2c 100644 --- a/test/Unit/RuleSet/Php72Test.php +++ b/test/Unit/RuleSet/Php72Test.php @@ -517,6 +517,7 @@ protected function expectedRules(): Rules 'assertSame', ], ], + 'php_unit_data_provider_method_order' => false, 'php_unit_data_provider_name' => false, 'php_unit_data_provider_return_type' => true, 'php_unit_data_provider_static' => [ diff --git a/test/Unit/RuleSet/Php73Test.php b/test/Unit/RuleSet/Php73Test.php index 0f40a43b..e839a3af 100644 --- a/test/Unit/RuleSet/Php73Test.php +++ b/test/Unit/RuleSet/Php73Test.php @@ -517,6 +517,7 @@ protected function expectedRules(): Rules 'assertSame', ], ], + 'php_unit_data_provider_method_order' => false, 'php_unit_data_provider_name' => false, 'php_unit_data_provider_return_type' => true, 'php_unit_data_provider_static' => [ diff --git a/test/Unit/RuleSet/Php74Test.php b/test/Unit/RuleSet/Php74Test.php index 3fc5452d..e4049714 100644 --- a/test/Unit/RuleSet/Php74Test.php +++ b/test/Unit/RuleSet/Php74Test.php @@ -517,6 +517,7 @@ protected function expectedRules(): Rules 'assertSame', ], ], + 'php_unit_data_provider_method_order' => false, 'php_unit_data_provider_name' => false, 'php_unit_data_provider_return_type' => true, 'php_unit_data_provider_static' => [ diff --git a/test/Unit/RuleSet/Php80Test.php b/test/Unit/RuleSet/Php80Test.php index dbadf6b0..deddf364 100644 --- a/test/Unit/RuleSet/Php80Test.php +++ b/test/Unit/RuleSet/Php80Test.php @@ -532,6 +532,7 @@ protected function expectedRules(): Rules 'assertSame', ], ], + 'php_unit_data_provider_method_order' => false, 'php_unit_data_provider_name' => false, 'php_unit_data_provider_return_type' => true, 'php_unit_data_provider_static' => [ diff --git a/test/Unit/RuleSet/Php81Test.php b/test/Unit/RuleSet/Php81Test.php index bef7f8f0..06d80749 100644 --- a/test/Unit/RuleSet/Php81Test.php +++ b/test/Unit/RuleSet/Php81Test.php @@ -534,6 +534,7 @@ protected function expectedRules(): Rules 'assertSame', ], ], + 'php_unit_data_provider_method_order' => false, 'php_unit_data_provider_name' => false, 'php_unit_data_provider_return_type' => true, 'php_unit_data_provider_static' => [ diff --git a/test/Unit/RuleSet/Php82Test.php b/test/Unit/RuleSet/Php82Test.php index b526ce02..a6bca9c4 100644 --- a/test/Unit/RuleSet/Php82Test.php +++ b/test/Unit/RuleSet/Php82Test.php @@ -534,6 +534,7 @@ protected function expectedRules(): Rules 'assertSame', ], ], + 'php_unit_data_provider_method_order' => false, 'php_unit_data_provider_name' => false, 'php_unit_data_provider_return_type' => true, 'php_unit_data_provider_static' => [ diff --git a/test/Unit/RuleSet/Php83Test.php b/test/Unit/RuleSet/Php83Test.php index b894ee4c..51a0b47a 100644 --- a/test/Unit/RuleSet/Php83Test.php +++ b/test/Unit/RuleSet/Php83Test.php @@ -534,6 +534,7 @@ protected function expectedRules(): Rules 'assertSame', ], ], + 'php_unit_data_provider_method_order' => false, 'php_unit_data_provider_name' => false, 'php_unit_data_provider_return_type' => true, 'php_unit_data_provider_static' => [ diff --git a/test/Unit/RuleSet/Php84Test.php b/test/Unit/RuleSet/Php84Test.php index 4b84ac7b..bc3ca3cf 100644 --- a/test/Unit/RuleSet/Php84Test.php +++ b/test/Unit/RuleSet/Php84Test.php @@ -534,6 +534,7 @@ protected function expectedRules(): Rules 'assertSame', ], ], + 'php_unit_data_provider_method_order' => false, 'php_unit_data_provider_name' => false, 'php_unit_data_provider_return_type' => true, 'php_unit_data_provider_static' => [ From 742779249362bdf011d401d2ffae1f044bf2dbd8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=B6ller?= Date: Sun, 23 Feb 2025 19:55:55 +0100 Subject: [PATCH 3/3] Fix: Update CHANGELOG.md --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 87d5218e..b8b6fcff 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 [`6.43.1...main`][6.43.1...main]. +### Changed + +- Updated `friendsofphp/php-cs-fixer` ([#1177]), by [@dependabot] + ## [`6.43.1`][6.43.1] For a full diff see [`6.43.0...6.43.1`][6.43.0...6.43.1]. @@ -1877,6 +1881,7 @@ For a full diff see [`d899e77...1.0.0`][d899e77...1.0.0]. [#1169]: https://github.com/ergebnis/php-cs-fixer-config/pull/1169 [#1170]: https://github.com/ergebnis/php-cs-fixer-config/pull/1170 [#1173]: https://github.com/ergebnis/php-cs-fixer-config/pull/1173 +[#1177]: https://github.com/ergebnis/php-cs-fixer-config/pull/1177 [@dependabot]: https://github.com/apps/dependabot [@linuxjuggler]: https://github.com/linuxjuggler