diff --git a/CHANGELOG.md b/CHANGELOG.md index ba73bc59..e6d96890 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.38.0...main`][6.38.0...main]. +### Changed + +- Updated `friendsofphp/php-cs-fixer` ([#1141]), by [@localheinz] + ## [`6.38.0`][6.38.0] For a full diff see [`6.37.0...6.38.0`][6.37.0...6.38.0]. @@ -1774,6 +1778,7 @@ For a full diff see [`d899e77...1.0.0`][d899e77...1.0.0]. [#1109]: https://github.com/ergebnis/php-cs-fixer-config/pull/1109 [#1139]: https://github.com/ergebnis/php-cs-fixer-config/pull/1139 [#1140]: https://github.com/ergebnis/php-cs-fixer-config/pull/1140 +[#1141]: https://github.com/ergebnis/php-cs-fixer-config/pull/1141 [@dependabot]: https://github.com/apps/dependabot [@linuxjuggler]: https://github.com/linuxjuggler diff --git a/composer.json b/composer.json index f3b88eb7..016cdbfa 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.64.0", + "friendsofphp/php-cs-fixer": "~3.65.0", "kubawerlos/php-cs-fixer-custom-fixers": "~3.22.0" }, "require-dev": { diff --git a/composer.lock b/composer.lock index 36868cd6..e8b95ca2 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": "45062b96fb93dd300344674899208975", + "content-hash": "3daea38239eb22377e67fae89219adef", "packages": [ { "name": "clue/ndjson-react", @@ -473,16 +473,16 @@ }, { "name": "friendsofphp/php-cs-fixer", - "version": "v3.64.0", + "version": "v3.65.0", "source": { "type": "git", "url": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git", - "reference": "58dd9c931c785a79739310aef5178928305ffa67" + "reference": "79d4f3e77b250a7d8043d76c6af8f0695e8a469f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/58dd9c931c785a79739310aef5178928305ffa67", - "reference": "58dd9c931c785a79739310aef5178928305ffa67", + "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/79d4f3e77b250a7d8043d76c6af8f0695e8a469f", + "reference": "79d4f3e77b250a7d8043d76c6af8f0695e8a469f", "shasum": "" }, "require": { @@ -492,7 +492,7 @@ "ext-filter": "*", "ext-json": "*", "ext-tokenizer": "*", - "fidry/cpu-core-counter": "^1.0", + "fidry/cpu-core-counter": "^1.2", "php": "^7.4 || ^8.0", "react/child-process": "^0.6.5", "react/event-loop": "^1.0", @@ -512,18 +512,18 @@ "symfony/stopwatch": "^5.4 || ^6.0 || ^7.0" }, "require-dev": { - "facile-it/paraunit": "^1.3 || ^2.3", - "infection/infection": "^0.29.5", - "justinrainbow/json-schema": "^5.2", + "facile-it/paraunit": "^1.3.1 || ^2.4", + "infection/infection": "^0.29.8", + "justinrainbow/json-schema": "^5.3 || ^6.0", "keradus/cli-executor": "^2.1", - "mikey179/vfsstream": "^1.6.11", + "mikey179/vfsstream": "^1.6.12", "php-coveralls/php-coveralls": "^2.7", "php-cs-fixer/accessible-object": "^1.1", "php-cs-fixer/phpunit-constraint-isidenticalstring": "^1.5", "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.5", - "phpunit/phpunit": "^9.6.19 || ^10.5.21 || ^11.2", - "symfony/var-dumper": "^5.4 || ^6.0 || ^7.0", - "symfony/yaml": "^5.4 || ^6.0 || ^7.0" + "phpunit/phpunit": "^9.6.21 || ^10.5.38 || ^11.4.3", + "symfony/var-dumper": "^5.4.47 || ^6.4.15 || ^7.1.8", + "symfony/yaml": "^5.4.45 || ^6.4.13 || ^7.1.6" }, "suggest": { "ext-dom": "For handling output formats in XML", @@ -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.64.0" + "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.65.0" }, "funding": [ { @@ -572,7 +572,7 @@ "type": "github" } ], - "time": "2024-08-30T23:09:38+00:00" + "time": "2024-11-25T00:39:24+00:00" }, { "name": "kubawerlos/php-cs-fixer-custom-fixers", diff --git a/src/RuleSet/Php74.php b/src/RuleSet/Php74.php index 5fdd9ac1..b7b6a5d2 100644 --- a/src/RuleSet/Php74.php +++ b/src/RuleSet/Php74.php @@ -683,6 +683,7 @@ public static function create(): RuleSet 'phpdoc_to_param_type' => false, 'phpdoc_to_property_type' => [ 'scalar_types' => true, + 'types_map' => [], 'union_types' => false, ], 'phpdoc_to_return_type' => false, diff --git a/src/RuleSet/Php80.php b/src/RuleSet/Php80.php index fe1439b5..833cb870 100644 --- a/src/RuleSet/Php80.php +++ b/src/RuleSet/Php80.php @@ -696,6 +696,7 @@ public static function create(): RuleSet 'phpdoc_to_param_type' => false, 'phpdoc_to_property_type' => [ 'scalar_types' => true, + 'types_map' => [], 'union_types' => true, ], 'phpdoc_to_return_type' => false, diff --git a/src/RuleSet/Php81.php b/src/RuleSet/Php81.php index 8902d96a..e091a0cf 100644 --- a/src/RuleSet/Php81.php +++ b/src/RuleSet/Php81.php @@ -698,6 +698,7 @@ public static function create(): RuleSet 'phpdoc_to_param_type' => false, 'phpdoc_to_property_type' => [ 'scalar_types' => true, + 'types_map' => [], 'union_types' => true, ], 'phpdoc_to_return_type' => false, diff --git a/src/RuleSet/Php82.php b/src/RuleSet/Php82.php index 25aa5925..1ea49720 100644 --- a/src/RuleSet/Php82.php +++ b/src/RuleSet/Php82.php @@ -698,6 +698,7 @@ public static function create(): RuleSet 'phpdoc_to_param_type' => false, 'phpdoc_to_property_type' => [ 'scalar_types' => true, + 'types_map' => [], 'union_types' => true, ], 'phpdoc_to_return_type' => false, diff --git a/src/RuleSet/Php83.php b/src/RuleSet/Php83.php index e9c8971e..4aea2d4a 100644 --- a/src/RuleSet/Php83.php +++ b/src/RuleSet/Php83.php @@ -698,6 +698,7 @@ public static function create(): RuleSet 'phpdoc_to_param_type' => false, 'phpdoc_to_property_type' => [ 'scalar_types' => true, + 'types_map' => [], 'union_types' => true, ], 'phpdoc_to_return_type' => false, diff --git a/src/RuleSet/Php84.php b/src/RuleSet/Php84.php index 8821d57d..a8b3a50d 100644 --- a/src/RuleSet/Php84.php +++ b/src/RuleSet/Php84.php @@ -698,6 +698,7 @@ public static function create(): RuleSet 'phpdoc_to_param_type' => false, 'phpdoc_to_property_type' => [ 'scalar_types' => true, + 'types_map' => [], 'union_types' => true, ], 'phpdoc_to_return_type' => false, diff --git a/test/Unit/RuleSet/Php74Test.php b/test/Unit/RuleSet/Php74Test.php index a5dfeb10..bb8b0ded 100644 --- a/test/Unit/RuleSet/Php74Test.php +++ b/test/Unit/RuleSet/Php74Test.php @@ -706,6 +706,7 @@ protected function expectedRules(): Rules 'phpdoc_to_param_type' => false, 'phpdoc_to_property_type' => [ 'scalar_types' => true, + 'types_map' => [], 'union_types' => false, ], 'phpdoc_to_return_type' => false, diff --git a/test/Unit/RuleSet/Php80Test.php b/test/Unit/RuleSet/Php80Test.php index d4d235bf..823a88c8 100644 --- a/test/Unit/RuleSet/Php80Test.php +++ b/test/Unit/RuleSet/Php80Test.php @@ -719,6 +719,7 @@ protected function expectedRules(): Rules 'phpdoc_to_param_type' => false, 'phpdoc_to_property_type' => [ 'scalar_types' => true, + 'types_map' => [], 'union_types' => true, ], 'phpdoc_to_return_type' => false, diff --git a/test/Unit/RuleSet/Php81Test.php b/test/Unit/RuleSet/Php81Test.php index 341e822a..59f3fd09 100644 --- a/test/Unit/RuleSet/Php81Test.php +++ b/test/Unit/RuleSet/Php81Test.php @@ -721,6 +721,7 @@ protected function expectedRules(): Rules 'phpdoc_to_param_type' => false, 'phpdoc_to_property_type' => [ 'scalar_types' => true, + 'types_map' => [], 'union_types' => true, ], 'phpdoc_to_return_type' => false, diff --git a/test/Unit/RuleSet/Php82Test.php b/test/Unit/RuleSet/Php82Test.php index 218b055a..877b4401 100644 --- a/test/Unit/RuleSet/Php82Test.php +++ b/test/Unit/RuleSet/Php82Test.php @@ -721,6 +721,7 @@ protected function expectedRules(): Rules 'phpdoc_to_param_type' => false, 'phpdoc_to_property_type' => [ 'scalar_types' => true, + 'types_map' => [], 'union_types' => true, ], 'phpdoc_to_return_type' => false, diff --git a/test/Unit/RuleSet/Php83Test.php b/test/Unit/RuleSet/Php83Test.php index ce369027..c3b1af28 100644 --- a/test/Unit/RuleSet/Php83Test.php +++ b/test/Unit/RuleSet/Php83Test.php @@ -721,6 +721,7 @@ protected function expectedRules(): Rules 'phpdoc_to_param_type' => false, 'phpdoc_to_property_type' => [ 'scalar_types' => true, + 'types_map' => [], 'union_types' => true, ], 'phpdoc_to_return_type' => false, diff --git a/test/Unit/RuleSet/Php84Test.php b/test/Unit/RuleSet/Php84Test.php index 1f8ed80c..be621231 100644 --- a/test/Unit/RuleSet/Php84Test.php +++ b/test/Unit/RuleSet/Php84Test.php @@ -721,6 +721,7 @@ protected function expectedRules(): Rules 'phpdoc_to_param_type' => false, 'phpdoc_to_property_type' => [ 'scalar_types' => true, + 'types_map' => [], 'union_types' => true, ], 'phpdoc_to_return_type' => false,