diff --git a/CHANGELOG.md b/CHANGELOG.md index 42153fdd..bf7410bc 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.33.0...main`][6.33.0...main]. +### Changed + +- Updated `friendsofphp/php-cs-fixer` ([#1091]), by [@dependabot] + ## [`6.33.0`][6.33.0] For a full diff see [`6.31.0...6.33.0`][6.31.0...6.33.0]. @@ -1713,6 +1717,7 @@ For a full diff see [`d899e77...1.0.0`][d899e77...1.0.0]. [#1079]: https://github.com/ergebnis/php-cs-fixer-config/pull/1079 [#1084]: https://github.com/ergebnis/php-cs-fixer-config/pull/1084 [#1089]: https://github.com/ergebnis/php-cs-fixer-config/pull/1089 +[#1091]: https://github.com/ergebnis/php-cs-fixer-config/pull/1091 [@dependabot]: https://github.com/apps/dependabot [@linuxjuggler]: https://github.com/linuxjuggler diff --git a/composer.json b/composer.json index 6f3898e4..7cca1931 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", "ext-filter": "*", "erickskrauch/php-cs-fixer-custom-fixers": "~1.3.0", - "friendsofphp/php-cs-fixer": "~3.60.0", + "friendsofphp/php-cs-fixer": "~3.61.0", "kubawerlos/php-cs-fixer-custom-fixers": "~3.21.0" }, "require-dev": { diff --git a/composer.lock b/composer.lock index baad50ec..86583642 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": "9b0206dc5f79745953f437844da18dcc", + "content-hash": "f4a5791ee8a5108a6382c960de4ea1e6", "packages": [ { "name": "clue/ndjson-react", @@ -473,16 +473,16 @@ }, { "name": "friendsofphp/php-cs-fixer", - "version": "v3.60.0", + "version": "v3.61.0", "source": { "type": "git", "url": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git", - "reference": "e595e4e070d17c5d42ed8c4206f630fcc5f401a4" + "reference": "737a24b6d531db9c034ac97524ac3a3bde0c20c0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/e595e4e070d17c5d42ed8c4206f630fcc5f401a4", - "reference": "e595e4e070d17c5d42ed8c4206f630fcc5f401a4", + "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/737a24b6d531db9c034ac97524ac3a3bde0c20c0", + "reference": "737a24b6d531db9c034ac97524ac3a3bde0c20c0", "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.60.0" + "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.61.0" }, "funding": [ { @@ -572,7 +572,7 @@ "type": "github" } ], - "time": "2024-07-25T09:26:51+00:00" + "time": "2024-07-31T08:18:16+00:00" }, { "name": "kubawerlos/php-cs-fixer-custom-fixers", @@ -1142,31 +1142,31 @@ }, { "name": "react/socket", - "version": "v1.15.0", + "version": "v1.16.0", "source": { "type": "git", "url": "https://github.com/reactphp/socket.git", - "reference": "216d3aec0b87f04a40ca04f481e6af01bdd1d038" + "reference": "23e4ff33ea3e160d2d1f59a0e6050e4b0fb0eac1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/reactphp/socket/zipball/216d3aec0b87f04a40ca04f481e6af01bdd1d038", - "reference": "216d3aec0b87f04a40ca04f481e6af01bdd1d038", + "url": "https://api.github.com/repos/reactphp/socket/zipball/23e4ff33ea3e160d2d1f59a0e6050e4b0fb0eac1", + "reference": "23e4ff33ea3e160d2d1f59a0e6050e4b0fb0eac1", "shasum": "" }, "require": { "evenement/evenement": "^3.0 || ^2.0 || ^1.0", "php": ">=5.3.0", - "react/dns": "^1.11", + "react/dns": "^1.13", "react/event-loop": "^1.2", - "react/promise": "^3 || ^2.6 || ^1.2.1", - "react/stream": "^1.2" + "react/promise": "^3.2 || ^2.6 || ^1.2.1", + "react/stream": "^1.4" }, "require-dev": { "phpunit/phpunit": "^9.6 || ^5.7 || ^4.8.36", - "react/async": "^4 || ^3 || ^2", + "react/async": "^4.3 || ^3.3 || ^2", "react/promise-stream": "^1.4", - "react/promise-timer": "^1.10" + "react/promise-timer": "^1.11" }, "type": "library", "autoload": { @@ -1210,7 +1210,7 @@ ], "support": { "issues": "https://github.com/reactphp/socket/issues", - "source": "https://github.com/reactphp/socket/tree/v1.15.0" + "source": "https://github.com/reactphp/socket/tree/v1.16.0" }, "funding": [ { @@ -1218,7 +1218,7 @@ "type": "open_collective" } ], - "time": "2023-12-15T11:02:10+00:00" + "time": "2024-07-26T10:38:09+00:00" }, { "name": "react/stream", @@ -1366,16 +1366,16 @@ }, { "name": "symfony/console", - "version": "v5.4.41", + "version": "v5.4.42", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "6473d441a913cb997123b59ff2dbe3d1cf9e11ba" + "reference": "cef62396a0477e94fc52e87a17c6e5c32e226b7f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/6473d441a913cb997123b59ff2dbe3d1cf9e11ba", - "reference": "6473d441a913cb997123b59ff2dbe3d1cf9e11ba", + "url": "https://api.github.com/repos/symfony/console/zipball/cef62396a0477e94fc52e87a17c6e5c32e226b7f", + "reference": "cef62396a0477e94fc52e87a17c6e5c32e226b7f", "shasum": "" }, "require": { @@ -1445,7 +1445,7 @@ "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v5.4.41" + "source": "https://github.com/symfony/console/tree/v5.4.42" }, "funding": [ { @@ -1461,7 +1461,7 @@ "type": "tidelift" } ], - "time": "2024-06-28T07:48:55+00:00" + "time": "2024-07-26T12:21:55+00:00" }, { "name": "symfony/deprecation-contracts", @@ -1763,16 +1763,16 @@ }, { "name": "symfony/finder", - "version": "v5.4.40", + "version": "v5.4.42", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "f51cff4687547641c7d8180d74932ab40b2205ce" + "reference": "0724c51fa067b198e36506d2864e09a52180998a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/f51cff4687547641c7d8180d74932ab40b2205ce", - "reference": "f51cff4687547641c7d8180d74932ab40b2205ce", + "url": "https://api.github.com/repos/symfony/finder/zipball/0724c51fa067b198e36506d2864e09a52180998a", + "reference": "0724c51fa067b198e36506d2864e09a52180998a", "shasum": "" }, "require": { @@ -1806,7 +1806,7 @@ "description": "Finds files and directories via an intuitive fluent interface", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/finder/tree/v5.4.40" + "source": "https://github.com/symfony/finder/tree/v5.4.42" }, "funding": [ { @@ -1822,7 +1822,7 @@ "type": "tidelift" } ], - "time": "2024-05-31T14:33:22+00:00" + "time": "2024-07-22T08:53:29+00:00" }, { "name": "symfony/options-resolver", @@ -2652,16 +2652,16 @@ }, { "name": "symfony/string", - "version": "v5.4.41", + "version": "v5.4.42", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "065a9611e0b1fd2197a867e1fb7f2238191b7096" + "reference": "909cec913edea162a3b2836788228ad45fcab337" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/065a9611e0b1fd2197a867e1fb7f2238191b7096", - "reference": "065a9611e0b1fd2197a867e1fb7f2238191b7096", + "url": "https://api.github.com/repos/symfony/string/zipball/909cec913edea162a3b2836788228ad45fcab337", + "reference": "909cec913edea162a3b2836788228ad45fcab337", "shasum": "" }, "require": { @@ -2718,7 +2718,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v5.4.41" + "source": "https://github.com/symfony/string/tree/v5.4.42" }, "funding": [ { @@ -2734,7 +2734,7 @@ "type": "tidelift" } ], - "time": "2024-06-28T09:20:55+00:00" + "time": "2024-07-20T18:38:32+00:00" } ], "packages-dev": [ diff --git a/src/RuleSet/Php53.php b/src/RuleSet/Php53.php index 4cc614f4..dfe46de6 100644 --- a/src/RuleSet/Php53.php +++ b/src/RuleSet/Php53.php @@ -476,6 +476,7 @@ public static function create(): RuleSet 'null_adjustment' => 'always_first', 'sort_algorithm' => 'alpha', ], + 'php_unit_assert_new_names' => false, 'php_unit_attributes' => false, 'php_unit_construct' => [ 'assertions' => [ diff --git a/src/RuleSet/Php54.php b/src/RuleSet/Php54.php index 9fbe88b9..b6e7c861 100644 --- a/src/RuleSet/Php54.php +++ b/src/RuleSet/Php54.php @@ -477,6 +477,7 @@ public static function create(): RuleSet 'null_adjustment' => 'always_first', 'sort_algorithm' => 'alpha', ], + 'php_unit_assert_new_names' => false, 'php_unit_attributes' => false, 'php_unit_construct' => [ 'assertions' => [ diff --git a/src/RuleSet/Php55.php b/src/RuleSet/Php55.php index 310d8eb9..9f909c4e 100644 --- a/src/RuleSet/Php55.php +++ b/src/RuleSet/Php55.php @@ -483,6 +483,7 @@ public static function create(): RuleSet 'null_adjustment' => 'always_first', 'sort_algorithm' => 'alpha', ], + 'php_unit_assert_new_names' => false, 'php_unit_attributes' => false, 'php_unit_construct' => [ 'assertions' => [ diff --git a/src/RuleSet/Php56.php b/src/RuleSet/Php56.php index 17ea9248..62d10465 100644 --- a/src/RuleSet/Php56.php +++ b/src/RuleSet/Php56.php @@ -483,6 +483,7 @@ public static function create(): RuleSet 'null_adjustment' => 'always_first', 'sort_algorithm' => 'alpha', ], + 'php_unit_assert_new_names' => false, 'php_unit_attributes' => false, 'php_unit_construct' => [ 'assertions' => [ diff --git a/src/RuleSet/Php70.php b/src/RuleSet/Php70.php index 4a750a66..9847074f 100644 --- a/src/RuleSet/Php70.php +++ b/src/RuleSet/Php70.php @@ -483,6 +483,7 @@ public static function create(): RuleSet 'null_adjustment' => 'always_first', 'sort_algorithm' => 'alpha', ], + 'php_unit_assert_new_names' => false, 'php_unit_attributes' => false, 'php_unit_construct' => [ 'assertions' => [ diff --git a/src/RuleSet/Php71.php b/src/RuleSet/Php71.php index f4f6e497..4f96d150 100644 --- a/src/RuleSet/Php71.php +++ b/src/RuleSet/Php71.php @@ -483,6 +483,7 @@ public static function create(): RuleSet 'null_adjustment' => 'always_first', 'sort_algorithm' => 'alpha', ], + 'php_unit_assert_new_names' => false, 'php_unit_attributes' => false, 'php_unit_construct' => [ 'assertions' => [ diff --git a/src/RuleSet/Php72.php b/src/RuleSet/Php72.php index 7eded4e6..f7cfb6c2 100644 --- a/src/RuleSet/Php72.php +++ b/src/RuleSet/Php72.php @@ -483,6 +483,7 @@ public static function create(): RuleSet 'null_adjustment' => 'always_first', 'sort_algorithm' => 'alpha', ], + 'php_unit_assert_new_names' => false, 'php_unit_attributes' => false, 'php_unit_construct' => [ 'assertions' => [ diff --git a/src/RuleSet/Php73.php b/src/RuleSet/Php73.php index c41cac9a..9d477c4c 100644 --- a/src/RuleSet/Php73.php +++ b/src/RuleSet/Php73.php @@ -483,6 +483,7 @@ public static function create(): RuleSet 'null_adjustment' => 'always_first', 'sort_algorithm' => 'alpha', ], + 'php_unit_assert_new_names' => false, 'php_unit_attributes' => false, 'php_unit_construct' => [ 'assertions' => [ diff --git a/src/RuleSet/Php74.php b/src/RuleSet/Php74.php index 9dea76a9..53b2b3da 100644 --- a/src/RuleSet/Php74.php +++ b/src/RuleSet/Php74.php @@ -483,6 +483,7 @@ public static function create(): RuleSet 'null_adjustment' => 'always_first', 'sort_algorithm' => 'alpha', ], + 'php_unit_assert_new_names' => false, 'php_unit_attributes' => false, 'php_unit_construct' => [ 'assertions' => [ diff --git a/src/RuleSet/Php80.php b/src/RuleSet/Php80.php index de0a36e1..1280ac48 100644 --- a/src/RuleSet/Php80.php +++ b/src/RuleSet/Php80.php @@ -496,6 +496,7 @@ public static function create(): RuleSet 'null_adjustment' => 'always_first', 'sort_algorithm' => 'alpha', ], + 'php_unit_assert_new_names' => false, 'php_unit_attributes' => false, 'php_unit_construct' => [ 'assertions' => [ diff --git a/src/RuleSet/Php81.php b/src/RuleSet/Php81.php index b00e8632..5d0c8a6d 100644 --- a/src/RuleSet/Php81.php +++ b/src/RuleSet/Php81.php @@ -498,6 +498,7 @@ public static function create(): RuleSet 'null_adjustment' => 'always_first', 'sort_algorithm' => 'alpha', ], + 'php_unit_assert_new_names' => false, 'php_unit_attributes' => false, 'php_unit_construct' => [ 'assertions' => [ diff --git a/src/RuleSet/Php82.php b/src/RuleSet/Php82.php index ddbfad38..a4531da2 100644 --- a/src/RuleSet/Php82.php +++ b/src/RuleSet/Php82.php @@ -498,6 +498,7 @@ public static function create(): RuleSet 'null_adjustment' => 'always_first', 'sort_algorithm' => 'alpha', ], + 'php_unit_assert_new_names' => false, 'php_unit_attributes' => false, 'php_unit_construct' => [ 'assertions' => [ diff --git a/src/RuleSet/Php83.php b/src/RuleSet/Php83.php index 01f1ead2..23c6c463 100644 --- a/src/RuleSet/Php83.php +++ b/src/RuleSet/Php83.php @@ -498,6 +498,7 @@ public static function create(): RuleSet 'null_adjustment' => 'always_first', 'sort_algorithm' => 'alpha', ], + 'php_unit_assert_new_names' => false, 'php_unit_attributes' => false, 'php_unit_construct' => [ 'assertions' => [ diff --git a/test/Unit/RuleSet/Php53Test.php b/test/Unit/RuleSet/Php53Test.php index b24dec06..ae29d264 100644 --- a/test/Unit/RuleSet/Php53Test.php +++ b/test/Unit/RuleSet/Php53Test.php @@ -499,6 +499,7 @@ protected function expectedRules(): Rules 'null_adjustment' => 'always_first', 'sort_algorithm' => 'alpha', ], + 'php_unit_assert_new_names' => false, 'php_unit_attributes' => false, 'php_unit_construct' => [ 'assertions' => [ diff --git a/test/Unit/RuleSet/Php54Test.php b/test/Unit/RuleSet/Php54Test.php index 7dae74b6..9bbca5d7 100644 --- a/test/Unit/RuleSet/Php54Test.php +++ b/test/Unit/RuleSet/Php54Test.php @@ -500,6 +500,7 @@ protected function expectedRules(): Rules 'null_adjustment' => 'always_first', 'sort_algorithm' => 'alpha', ], + 'php_unit_assert_new_names' => false, 'php_unit_attributes' => false, 'php_unit_construct' => [ 'assertions' => [ diff --git a/test/Unit/RuleSet/Php55Test.php b/test/Unit/RuleSet/Php55Test.php index 9ae63f85..0c55f30a 100644 --- a/test/Unit/RuleSet/Php55Test.php +++ b/test/Unit/RuleSet/Php55Test.php @@ -506,6 +506,7 @@ protected function expectedRules(): Rules 'null_adjustment' => 'always_first', 'sort_algorithm' => 'alpha', ], + 'php_unit_assert_new_names' => false, 'php_unit_attributes' => false, 'php_unit_construct' => [ 'assertions' => [ diff --git a/test/Unit/RuleSet/Php56Test.php b/test/Unit/RuleSet/Php56Test.php index e15354a5..2fba61e1 100644 --- a/test/Unit/RuleSet/Php56Test.php +++ b/test/Unit/RuleSet/Php56Test.php @@ -506,6 +506,7 @@ protected function expectedRules(): Rules 'null_adjustment' => 'always_first', 'sort_algorithm' => 'alpha', ], + 'php_unit_assert_new_names' => false, 'php_unit_attributes' => false, 'php_unit_construct' => [ 'assertions' => [ diff --git a/test/Unit/RuleSet/Php70Test.php b/test/Unit/RuleSet/Php70Test.php index 011ef82c..bac926f5 100644 --- a/test/Unit/RuleSet/Php70Test.php +++ b/test/Unit/RuleSet/Php70Test.php @@ -506,6 +506,7 @@ protected function expectedRules(): Rules 'null_adjustment' => 'always_first', 'sort_algorithm' => 'alpha', ], + 'php_unit_assert_new_names' => false, 'php_unit_attributes' => false, 'php_unit_construct' => [ 'assertions' => [ diff --git a/test/Unit/RuleSet/Php71Test.php b/test/Unit/RuleSet/Php71Test.php index f46d1956..cc95c977 100644 --- a/test/Unit/RuleSet/Php71Test.php +++ b/test/Unit/RuleSet/Php71Test.php @@ -506,6 +506,7 @@ protected function expectedRules(): Rules 'null_adjustment' => 'always_first', 'sort_algorithm' => 'alpha', ], + 'php_unit_assert_new_names' => false, 'php_unit_attributes' => false, 'php_unit_construct' => [ 'assertions' => [ diff --git a/test/Unit/RuleSet/Php72Test.php b/test/Unit/RuleSet/Php72Test.php index b6d0606a..20638cd3 100644 --- a/test/Unit/RuleSet/Php72Test.php +++ b/test/Unit/RuleSet/Php72Test.php @@ -506,6 +506,7 @@ protected function expectedRules(): Rules 'null_adjustment' => 'always_first', 'sort_algorithm' => 'alpha', ], + 'php_unit_assert_new_names' => false, 'php_unit_attributes' => false, 'php_unit_construct' => [ 'assertions' => [ diff --git a/test/Unit/RuleSet/Php73Test.php b/test/Unit/RuleSet/Php73Test.php index e48630eb..78f87bbf 100644 --- a/test/Unit/RuleSet/Php73Test.php +++ b/test/Unit/RuleSet/Php73Test.php @@ -506,6 +506,7 @@ protected function expectedRules(): Rules 'null_adjustment' => 'always_first', 'sort_algorithm' => 'alpha', ], + 'php_unit_assert_new_names' => false, 'php_unit_attributes' => false, 'php_unit_construct' => [ 'assertions' => [ diff --git a/test/Unit/RuleSet/Php74Test.php b/test/Unit/RuleSet/Php74Test.php index ca6f4fc3..44a3d5de 100644 --- a/test/Unit/RuleSet/Php74Test.php +++ b/test/Unit/RuleSet/Php74Test.php @@ -506,6 +506,7 @@ protected function expectedRules(): Rules 'null_adjustment' => 'always_first', 'sort_algorithm' => 'alpha', ], + 'php_unit_assert_new_names' => false, 'php_unit_attributes' => false, 'php_unit_construct' => [ 'assertions' => [ diff --git a/test/Unit/RuleSet/Php80Test.php b/test/Unit/RuleSet/Php80Test.php index 86d30d55..b9ec281a 100644 --- a/test/Unit/RuleSet/Php80Test.php +++ b/test/Unit/RuleSet/Php80Test.php @@ -519,6 +519,7 @@ protected function expectedRules(): Rules 'null_adjustment' => 'always_first', 'sort_algorithm' => 'alpha', ], + 'php_unit_assert_new_names' => false, 'php_unit_attributes' => false, 'php_unit_construct' => [ 'assertions' => [ diff --git a/test/Unit/RuleSet/Php81Test.php b/test/Unit/RuleSet/Php81Test.php index e179a722..1b418fbb 100644 --- a/test/Unit/RuleSet/Php81Test.php +++ b/test/Unit/RuleSet/Php81Test.php @@ -521,6 +521,7 @@ protected function expectedRules(): Rules 'null_adjustment' => 'always_first', 'sort_algorithm' => 'alpha', ], + 'php_unit_assert_new_names' => false, 'php_unit_attributes' => false, 'php_unit_construct' => [ 'assertions' => [ diff --git a/test/Unit/RuleSet/Php82Test.php b/test/Unit/RuleSet/Php82Test.php index 4124359a..d1705f5e 100644 --- a/test/Unit/RuleSet/Php82Test.php +++ b/test/Unit/RuleSet/Php82Test.php @@ -521,6 +521,7 @@ protected function expectedRules(): Rules 'null_adjustment' => 'always_first', 'sort_algorithm' => 'alpha', ], + 'php_unit_assert_new_names' => false, 'php_unit_attributes' => false, 'php_unit_construct' => [ 'assertions' => [ diff --git a/test/Unit/RuleSet/Php83Test.php b/test/Unit/RuleSet/Php83Test.php index d11dcea1..ab954b4f 100644 --- a/test/Unit/RuleSet/Php83Test.php +++ b/test/Unit/RuleSet/Php83Test.php @@ -521,6 +521,7 @@ protected function expectedRules(): Rules 'null_adjustment' => 'always_first', 'sort_algorithm' => 'alpha', ], + 'php_unit_assert_new_names' => false, 'php_unit_attributes' => false, 'php_unit_construct' => [ 'assertions' => [