diff --git a/CHANGELOG.md b/CHANGELOG.md index f03c4d39..5f73aa5b 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.24.0...main`][6.24.0...main]. +### Changed + +- Updated `friendsofphp/php-cs-fixer` ([#1037]), by [@dependabot] + ## [`6.24.0`][6.24.0] For a full diff see [`6.23.0...6.24.0`][6.23.0...6.24.0]. @@ -1577,6 +1581,7 @@ For a full diff see [`d899e77...1.0.0`][d899e77...1.0.0]. [#1025]: https://github.com/ergebnis/php-cs-fixer-config/pull/1025 [#1026]: https://github.com/ergebnis/php-cs-fixer-config/pull/1026 [#1036]: https://github.com/ergebnis/php-cs-fixer-config/pull/1036 +[#1037]: https://github.com/ergebnis/php-cs-fixer-config/pull/1037 [@dependabot]: https://github.com/apps/dependabot [@linuxjuggler]: https://github.com/linuxjuggler diff --git a/composer.json b/composer.json index f2d65008..a5ad4ce5 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.2.4", - "friendsofphp/php-cs-fixer": "~3.51.0", + "friendsofphp/php-cs-fixer": "~3.52.0", "kubawerlos/php-cs-fixer-custom-fixers": "~3.21.0" }, "require-dev": { diff --git a/composer.lock b/composer.lock index d271eaaf..a8b8879e 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": "ed5f2ba499f8928532011b4824685a0d", + "content-hash": "055ab724a18b5a8d235c94f045096e4c", "packages": [ { "name": "composer/pcre", @@ -292,16 +292,16 @@ }, { "name": "friendsofphp/php-cs-fixer", - "version": "v3.51.0", + "version": "v3.52.0", "source": { "type": "git", "url": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git", - "reference": "127fa74f010da99053e3f5b62672615b72dd6efd" + "reference": "a3564bd66f4bce9bc871ef18b690e2dc67a7f969" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/127fa74f010da99053e3f5b62672615b72dd6efd", - "reference": "127fa74f010da99053e3f5b62672615b72dd6efd", + "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/a3564bd66f4bce9bc871ef18b690e2dc67a7f969", + "reference": "a3564bd66f4bce9bc871ef18b690e2dc67a7f969", "shasum": "" }, "require": { @@ -372,7 +372,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.51.0" + "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.52.0" }, "funding": [ { @@ -380,7 +380,7 @@ "type": "github" } ], - "time": "2024-02-28T19:50:06+00:00" + "time": "2024-03-18T18:40:11+00:00" }, { "name": "kubawerlos/php-cs-fixer-custom-fixers", diff --git a/src/RuleSet/Php53.php b/src/RuleSet/Php53.php index 0fa90221..d4d6fdd8 100644 --- a/src/RuleSet/Php53.php +++ b/src/RuleSet/Php53.php @@ -427,9 +427,7 @@ public static function create(): RuleSet 'not_operator_with_space' => false, 'not_operator_with_successor_space' => false, 'nullable_type_declaration' => false, - 'nullable_type_declaration_for_default_null_value' => [ - 'use_nullable_type_declaration' => true, - ], + 'nullable_type_declaration_for_default_null_value' => true, 'numeric_literal_separator' => false, 'object_operator_without_whitespace' => true, 'octal_notation' => false, diff --git a/src/RuleSet/Php54.php b/src/RuleSet/Php54.php index 856767c0..eb332e82 100644 --- a/src/RuleSet/Php54.php +++ b/src/RuleSet/Php54.php @@ -428,9 +428,7 @@ public static function create(): RuleSet 'not_operator_with_space' => false, 'not_operator_with_successor_space' => false, 'nullable_type_declaration' => false, - 'nullable_type_declaration_for_default_null_value' => [ - 'use_nullable_type_declaration' => true, - ], + 'nullable_type_declaration_for_default_null_value' => true, 'numeric_literal_separator' => false, 'object_operator_without_whitespace' => true, 'octal_notation' => false, diff --git a/src/RuleSet/Php55.php b/src/RuleSet/Php55.php index 2d939129..1bba12e7 100644 --- a/src/RuleSet/Php55.php +++ b/src/RuleSet/Php55.php @@ -434,9 +434,7 @@ public static function create(): RuleSet 'not_operator_with_space' => false, 'not_operator_with_successor_space' => false, 'nullable_type_declaration' => false, - 'nullable_type_declaration_for_default_null_value' => [ - 'use_nullable_type_declaration' => true, - ], + 'nullable_type_declaration_for_default_null_value' => true, 'numeric_literal_separator' => false, 'object_operator_without_whitespace' => true, 'octal_notation' => false, diff --git a/src/RuleSet/Php56.php b/src/RuleSet/Php56.php index 1f3d58f4..9b03d267 100644 --- a/src/RuleSet/Php56.php +++ b/src/RuleSet/Php56.php @@ -434,9 +434,7 @@ public static function create(): RuleSet 'not_operator_with_space' => false, 'not_operator_with_successor_space' => false, 'nullable_type_declaration' => false, - 'nullable_type_declaration_for_default_null_value' => [ - 'use_nullable_type_declaration' => true, - ], + 'nullable_type_declaration_for_default_null_value' => true, 'numeric_literal_separator' => false, 'object_operator_without_whitespace' => true, 'octal_notation' => false, diff --git a/src/RuleSet/Php71.php b/src/RuleSet/Php71.php index 5916e238..5e122be1 100644 --- a/src/RuleSet/Php71.php +++ b/src/RuleSet/Php71.php @@ -434,9 +434,7 @@ public static function create(): RuleSet 'not_operator_with_space' => false, 'not_operator_with_successor_space' => false, 'nullable_type_declaration' => false, - 'nullable_type_declaration_for_default_null_value' => [ - 'use_nullable_type_declaration' => true, - ], + 'nullable_type_declaration_for_default_null_value' => true, 'numeric_literal_separator' => false, 'object_operator_without_whitespace' => true, 'octal_notation' => false, diff --git a/src/RuleSet/Php72.php b/src/RuleSet/Php72.php index dde9a475..929e9f3b 100644 --- a/src/RuleSet/Php72.php +++ b/src/RuleSet/Php72.php @@ -434,9 +434,7 @@ public static function create(): RuleSet 'not_operator_with_space' => false, 'not_operator_with_successor_space' => false, 'nullable_type_declaration' => false, - 'nullable_type_declaration_for_default_null_value' => [ - 'use_nullable_type_declaration' => true, - ], + 'nullable_type_declaration_for_default_null_value' => true, 'numeric_literal_separator' => false, 'object_operator_without_whitespace' => true, 'octal_notation' => false, diff --git a/src/RuleSet/Php73.php b/src/RuleSet/Php73.php index 47992eee..f34585e4 100644 --- a/src/RuleSet/Php73.php +++ b/src/RuleSet/Php73.php @@ -434,9 +434,7 @@ public static function create(): RuleSet 'not_operator_with_space' => false, 'not_operator_with_successor_space' => false, 'nullable_type_declaration' => false, - 'nullable_type_declaration_for_default_null_value' => [ - 'use_nullable_type_declaration' => true, - ], + 'nullable_type_declaration_for_default_null_value' => true, 'numeric_literal_separator' => false, 'object_operator_without_whitespace' => true, 'octal_notation' => false, diff --git a/src/RuleSet/Php74.php b/src/RuleSet/Php74.php index 0f9ac240..0d0d7ac1 100644 --- a/src/RuleSet/Php74.php +++ b/src/RuleSet/Php74.php @@ -434,9 +434,7 @@ public static function create(): RuleSet 'not_operator_with_space' => false, 'not_operator_with_successor_space' => false, 'nullable_type_declaration' => false, - 'nullable_type_declaration_for_default_null_value' => [ - 'use_nullable_type_declaration' => true, - ], + 'nullable_type_declaration_for_default_null_value' => true, 'numeric_literal_separator' => false, 'object_operator_without_whitespace' => true, 'octal_notation' => false, diff --git a/src/RuleSet/Php80.php b/src/RuleSet/Php80.php index eb87c336..3155ec2b 100644 --- a/src/RuleSet/Php80.php +++ b/src/RuleSet/Php80.php @@ -444,9 +444,7 @@ public static function create(): RuleSet 'nullable_type_declaration' => [ 'syntax' => 'question_mark', ], - 'nullable_type_declaration_for_default_null_value' => [ - 'use_nullable_type_declaration' => true, - ], + 'nullable_type_declaration_for_default_null_value' => true, 'numeric_literal_separator' => false, 'object_operator_without_whitespace' => true, 'octal_notation' => false, diff --git a/src/RuleSet/Php81.php b/src/RuleSet/Php81.php index c549c95c..7a7eb828 100644 --- a/src/RuleSet/Php81.php +++ b/src/RuleSet/Php81.php @@ -445,9 +445,7 @@ public static function create(): RuleSet 'nullable_type_declaration' => [ 'syntax' => 'question_mark', ], - 'nullable_type_declaration_for_default_null_value' => [ - 'use_nullable_type_declaration' => true, - ], + 'nullable_type_declaration_for_default_null_value' => true, 'numeric_literal_separator' => false, 'object_operator_without_whitespace' => true, 'octal_notation' => true, diff --git a/src/RuleSet/Php82.php b/src/RuleSet/Php82.php index 48d23f38..e45ede8b 100644 --- a/src/RuleSet/Php82.php +++ b/src/RuleSet/Php82.php @@ -445,9 +445,7 @@ public static function create(): RuleSet 'nullable_type_declaration' => [ 'syntax' => 'question_mark', ], - 'nullable_type_declaration_for_default_null_value' => [ - 'use_nullable_type_declaration' => true, - ], + 'nullable_type_declaration_for_default_null_value' => true, 'numeric_literal_separator' => false, 'object_operator_without_whitespace' => true, 'octal_notation' => true, diff --git a/src/RuleSet/Php83.php b/src/RuleSet/Php83.php index dd003197..09766f90 100644 --- a/src/RuleSet/Php83.php +++ b/src/RuleSet/Php83.php @@ -445,9 +445,7 @@ public static function create(): RuleSet 'nullable_type_declaration' => [ 'syntax' => 'question_mark', ], - 'nullable_type_declaration_for_default_null_value' => [ - 'use_nullable_type_declaration' => true, - ], + 'nullable_type_declaration_for_default_null_value' => true, 'numeric_literal_separator' => false, 'object_operator_without_whitespace' => true, 'octal_notation' => true, diff --git a/test/Unit/RuleSet/Php53Test.php b/test/Unit/RuleSet/Php53Test.php index 017bdfa5..d255bba8 100644 --- a/test/Unit/RuleSet/Php53Test.php +++ b/test/Unit/RuleSet/Php53Test.php @@ -450,9 +450,7 @@ protected function expectedRules(): Rules 'not_operator_with_space' => false, 'not_operator_with_successor_space' => false, 'nullable_type_declaration' => false, - 'nullable_type_declaration_for_default_null_value' => [ - 'use_nullable_type_declaration' => true, - ], + 'nullable_type_declaration_for_default_null_value' => true, 'numeric_literal_separator' => false, 'object_operator_without_whitespace' => true, 'octal_notation' => false, diff --git a/test/Unit/RuleSet/Php54Test.php b/test/Unit/RuleSet/Php54Test.php index 3e8a19da..ac8d101f 100644 --- a/test/Unit/RuleSet/Php54Test.php +++ b/test/Unit/RuleSet/Php54Test.php @@ -451,9 +451,7 @@ protected function expectedRules(): Rules 'not_operator_with_space' => false, 'not_operator_with_successor_space' => false, 'nullable_type_declaration' => false, - 'nullable_type_declaration_for_default_null_value' => [ - 'use_nullable_type_declaration' => true, - ], + 'nullable_type_declaration_for_default_null_value' => true, 'numeric_literal_separator' => false, 'object_operator_without_whitespace' => true, 'octal_notation' => false, diff --git a/test/Unit/RuleSet/Php55Test.php b/test/Unit/RuleSet/Php55Test.php index 793ca4cb..9c2d4d53 100644 --- a/test/Unit/RuleSet/Php55Test.php +++ b/test/Unit/RuleSet/Php55Test.php @@ -457,9 +457,7 @@ protected function expectedRules(): Rules 'not_operator_with_space' => false, 'not_operator_with_successor_space' => false, 'nullable_type_declaration' => false, - 'nullable_type_declaration_for_default_null_value' => [ - 'use_nullable_type_declaration' => true, - ], + 'nullable_type_declaration_for_default_null_value' => true, 'numeric_literal_separator' => false, 'object_operator_without_whitespace' => true, 'octal_notation' => false, diff --git a/test/Unit/RuleSet/Php56Test.php b/test/Unit/RuleSet/Php56Test.php index f44a3c7b..01c1e3f8 100644 --- a/test/Unit/RuleSet/Php56Test.php +++ b/test/Unit/RuleSet/Php56Test.php @@ -457,9 +457,7 @@ protected function expectedRules(): Rules 'not_operator_with_space' => false, 'not_operator_with_successor_space' => false, 'nullable_type_declaration' => false, - 'nullable_type_declaration_for_default_null_value' => [ - 'use_nullable_type_declaration' => true, - ], + 'nullable_type_declaration_for_default_null_value' => true, 'numeric_literal_separator' => false, 'object_operator_without_whitespace' => true, 'octal_notation' => false, diff --git a/test/Unit/RuleSet/Php71Test.php b/test/Unit/RuleSet/Php71Test.php index 2b6b572b..6e30d3d1 100644 --- a/test/Unit/RuleSet/Php71Test.php +++ b/test/Unit/RuleSet/Php71Test.php @@ -457,9 +457,7 @@ protected function expectedRules(): Rules 'not_operator_with_space' => false, 'not_operator_with_successor_space' => false, 'nullable_type_declaration' => false, - 'nullable_type_declaration_for_default_null_value' => [ - 'use_nullable_type_declaration' => true, - ], + 'nullable_type_declaration_for_default_null_value' => true, 'numeric_literal_separator' => false, 'object_operator_without_whitespace' => true, 'octal_notation' => false, diff --git a/test/Unit/RuleSet/Php72Test.php b/test/Unit/RuleSet/Php72Test.php index 87fa82ee..dae4e62b 100644 --- a/test/Unit/RuleSet/Php72Test.php +++ b/test/Unit/RuleSet/Php72Test.php @@ -457,9 +457,7 @@ protected function expectedRules(): Rules 'not_operator_with_space' => false, 'not_operator_with_successor_space' => false, 'nullable_type_declaration' => false, - 'nullable_type_declaration_for_default_null_value' => [ - 'use_nullable_type_declaration' => true, - ], + 'nullable_type_declaration_for_default_null_value' => true, 'numeric_literal_separator' => false, 'object_operator_without_whitespace' => true, 'octal_notation' => false, diff --git a/test/Unit/RuleSet/Php73Test.php b/test/Unit/RuleSet/Php73Test.php index 7db10c1a..53135296 100644 --- a/test/Unit/RuleSet/Php73Test.php +++ b/test/Unit/RuleSet/Php73Test.php @@ -457,9 +457,7 @@ protected function expectedRules(): Rules 'not_operator_with_space' => false, 'not_operator_with_successor_space' => false, 'nullable_type_declaration' => false, - 'nullable_type_declaration_for_default_null_value' => [ - 'use_nullable_type_declaration' => true, - ], + 'nullable_type_declaration_for_default_null_value' => true, 'numeric_literal_separator' => false, 'object_operator_without_whitespace' => true, 'octal_notation' => false, diff --git a/test/Unit/RuleSet/Php74Test.php b/test/Unit/RuleSet/Php74Test.php index 8b907f73..dc6c6d38 100644 --- a/test/Unit/RuleSet/Php74Test.php +++ b/test/Unit/RuleSet/Php74Test.php @@ -457,9 +457,7 @@ protected function expectedRules(): Rules 'not_operator_with_space' => false, 'not_operator_with_successor_space' => false, 'nullable_type_declaration' => false, - 'nullable_type_declaration_for_default_null_value' => [ - 'use_nullable_type_declaration' => true, - ], + 'nullable_type_declaration_for_default_null_value' => true, 'numeric_literal_separator' => false, 'object_operator_without_whitespace' => true, 'octal_notation' => false, diff --git a/test/Unit/RuleSet/Php80Test.php b/test/Unit/RuleSet/Php80Test.php index b635e65d..94e4fa50 100644 --- a/test/Unit/RuleSet/Php80Test.php +++ b/test/Unit/RuleSet/Php80Test.php @@ -467,9 +467,7 @@ protected function expectedRules(): Rules 'nullable_type_declaration' => [ 'syntax' => 'question_mark', ], - 'nullable_type_declaration_for_default_null_value' => [ - 'use_nullable_type_declaration' => true, - ], + 'nullable_type_declaration_for_default_null_value' => true, 'numeric_literal_separator' => false, 'object_operator_without_whitespace' => true, 'octal_notation' => false, diff --git a/test/Unit/RuleSet/Php81Test.php b/test/Unit/RuleSet/Php81Test.php index 5b2b4d0c..04b9e77e 100644 --- a/test/Unit/RuleSet/Php81Test.php +++ b/test/Unit/RuleSet/Php81Test.php @@ -468,9 +468,7 @@ protected function expectedRules(): Rules 'nullable_type_declaration' => [ 'syntax' => 'question_mark', ], - 'nullable_type_declaration_for_default_null_value' => [ - 'use_nullable_type_declaration' => true, - ], + 'nullable_type_declaration_for_default_null_value' => true, 'numeric_literal_separator' => false, 'object_operator_without_whitespace' => true, 'octal_notation' => true, diff --git a/test/Unit/RuleSet/Php82Test.php b/test/Unit/RuleSet/Php82Test.php index fb1a9255..9a6bf9bf 100644 --- a/test/Unit/RuleSet/Php82Test.php +++ b/test/Unit/RuleSet/Php82Test.php @@ -468,9 +468,7 @@ protected function expectedRules(): Rules 'nullable_type_declaration' => [ 'syntax' => 'question_mark', ], - 'nullable_type_declaration_for_default_null_value' => [ - 'use_nullable_type_declaration' => true, - ], + 'nullable_type_declaration_for_default_null_value' => true, 'numeric_literal_separator' => false, 'object_operator_without_whitespace' => true, 'octal_notation' => true, diff --git a/test/Unit/RuleSet/Php83Test.php b/test/Unit/RuleSet/Php83Test.php index cb2b155d..138a2b9b 100644 --- a/test/Unit/RuleSet/Php83Test.php +++ b/test/Unit/RuleSet/Php83Test.php @@ -468,9 +468,7 @@ protected function expectedRules(): Rules 'nullable_type_declaration' => [ 'syntax' => 'question_mark', ], - 'nullable_type_declaration_for_default_null_value' => [ - 'use_nullable_type_declaration' => true, - ], + 'nullable_type_declaration_for_default_null_value' => true, 'numeric_literal_separator' => false, 'object_operator_without_whitespace' => true, 'octal_notation' => true,