From 2fe25f44e5a0cd1dc2a00e22bcbf4810a7d3e1e1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 20 Jan 2024 12:08:42 +0000 Subject: [PATCH 1/5] composer(deps): Bump friendsofphp/php-cs-fixer from 3.46.0 to 3.48.0 Bumps [friendsofphp/php-cs-fixer](https://github.com/PHP-CS-Fixer/PHP-CS-Fixer) from 3.46.0 to 3.48.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.46.0...v3.48.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 80690ee7..e3f3eccd 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.46.0", + "friendsofphp/php-cs-fixer": "~3.48.0", "kubawerlos/php-cs-fixer-custom-fixers": "~3.18.0" }, "require-dev": { diff --git a/composer.lock b/composer.lock index b5e416a0..d93d41b0 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": "656e6902ad5896a1d8273779c1f4914d", + "content-hash": "ee6fef6a452508c6a2862069138574b2", "packages": [ { "name": "composer/pcre", @@ -292,16 +292,16 @@ }, { "name": "friendsofphp/php-cs-fixer", - "version": "v3.46.0", + "version": "v3.48.0", "source": { "type": "git", "url": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git", - "reference": "be6831c9af1740470d2a773119b9273f8ac1c3d2" + "reference": "a92472c6fb66349de25211f31c77eceae3df024e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/be6831c9af1740470d2a773119b9273f8ac1c3d2", - "reference": "be6831c9af1740470d2a773119b9273f8ac1c3d2", + "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/a92472c6fb66349de25211f31c77eceae3df024e", + "reference": "a92472c6fb66349de25211f31c77eceae3df024e", "shasum": "" }, "require": { @@ -371,7 +371,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.46.0" + "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.48.0" }, "funding": [ { @@ -379,7 +379,7 @@ "type": "github" } ], - "time": "2024-01-03T21:38:46+00:00" + "time": "2024-01-19T21:44:39+00:00" }, { "name": "kubawerlos/php-cs-fixer-custom-fixers", From 554ba9e1da1db8a3801118042df4fb658e9a4477 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=B6ller?= Date: Sat, 20 Jan 2024 13:15:30 +0100 Subject: [PATCH 2/5] Fix: Disable newly added fixers --- src/RuleSet/Php53.php | 3 +++ src/RuleSet/Php54.php | 3 +++ src/RuleSet/Php55.php | 3 +++ src/RuleSet/Php56.php | 3 +++ src/RuleSet/Php70.php | 3 +++ src/RuleSet/Php71.php | 3 +++ src/RuleSet/Php72.php | 3 +++ src/RuleSet/Php73.php | 3 +++ src/RuleSet/Php74.php | 3 +++ src/RuleSet/Php80.php | 3 +++ src/RuleSet/Php81.php | 3 +++ src/RuleSet/Php82.php | 3 +++ src/RuleSet/Php83.php | 3 +++ test/Unit/RuleSet/Php53Test.php | 3 +++ test/Unit/RuleSet/Php54Test.php | 3 +++ test/Unit/RuleSet/Php55Test.php | 3 +++ test/Unit/RuleSet/Php56Test.php | 3 +++ test/Unit/RuleSet/Php70Test.php | 3 +++ test/Unit/RuleSet/Php71Test.php | 3 +++ test/Unit/RuleSet/Php72Test.php | 3 +++ test/Unit/RuleSet/Php73Test.php | 3 +++ test/Unit/RuleSet/Php74Test.php | 3 +++ test/Unit/RuleSet/Php80Test.php | 3 +++ test/Unit/RuleSet/Php81Test.php | 3 +++ test/Unit/RuleSet/Php82Test.php | 3 +++ test/Unit/RuleSet/Php83Test.php | 3 +++ 26 files changed, 78 insertions(+) diff --git a/src/RuleSet/Php53.php b/src/RuleSet/Php53.php index df514f0e..975fdf23 100644 --- a/src/RuleSet/Php53.php +++ b/src/RuleSet/Php53.php @@ -281,6 +281,7 @@ public static function create(): RuleSet 'global_namespace_import' => false, 'group_import' => false, 'header_comment' => false, + 'heredoc_closing_marker' => false, 'heredoc_indentation' => false, 'heredoc_to_nowdoc' => true, 'implode_call' => true, @@ -315,6 +316,7 @@ public static function create(): RuleSet 'modernize_strpos' => false, 'modernize_types_casting' => true, 'multiline_comment_opening_closing' => true, + 'multiline_string_to_heredoc' => false, 'multiline_whitespace_before_semicolons' => [ 'strategy' => 'no_multi_line', ], @@ -459,6 +461,7 @@ public static function create(): RuleSet 'nullable_type_declaration_for_default_null_value' => [ 'use_nullable_type_declaration' => true, ], + 'numeric_literal_separator' => false, 'object_operator_without_whitespace' => true, 'octal_notation' => false, 'operator_linebreak' => [ diff --git a/src/RuleSet/Php54.php b/src/RuleSet/Php54.php index bb25e3fb..a266e336 100644 --- a/src/RuleSet/Php54.php +++ b/src/RuleSet/Php54.php @@ -282,6 +282,7 @@ public static function create(): RuleSet 'global_namespace_import' => false, 'group_import' => false, 'header_comment' => false, + 'heredoc_closing_marker' => false, 'heredoc_indentation' => false, 'heredoc_to_nowdoc' => true, 'implode_call' => true, @@ -316,6 +317,7 @@ public static function create(): RuleSet 'modernize_strpos' => false, 'modernize_types_casting' => true, 'multiline_comment_opening_closing' => true, + 'multiline_string_to_heredoc' => false, 'multiline_whitespace_before_semicolons' => [ 'strategy' => 'no_multi_line', ], @@ -460,6 +462,7 @@ public static function create(): RuleSet 'nullable_type_declaration_for_default_null_value' => [ 'use_nullable_type_declaration' => true, ], + 'numeric_literal_separator' => false, 'object_operator_without_whitespace' => true, 'octal_notation' => false, 'operator_linebreak' => [ diff --git a/src/RuleSet/Php55.php b/src/RuleSet/Php55.php index f85b155c..2379cb80 100644 --- a/src/RuleSet/Php55.php +++ b/src/RuleSet/Php55.php @@ -286,6 +286,7 @@ public static function create(): RuleSet 'global_namespace_import' => false, 'group_import' => false, 'header_comment' => false, + 'heredoc_closing_marker' => false, 'heredoc_indentation' => false, 'heredoc_to_nowdoc' => true, 'implode_call' => true, @@ -320,6 +321,7 @@ public static function create(): RuleSet 'modernize_strpos' => false, 'modernize_types_casting' => true, 'multiline_comment_opening_closing' => true, + 'multiline_string_to_heredoc' => false, 'multiline_whitespace_before_semicolons' => [ 'strategy' => 'no_multi_line', ], @@ -466,6 +468,7 @@ public static function create(): RuleSet 'nullable_type_declaration_for_default_null_value' => [ 'use_nullable_type_declaration' => true, ], + 'numeric_literal_separator' => false, 'object_operator_without_whitespace' => true, 'octal_notation' => false, 'operator_linebreak' => [ diff --git a/src/RuleSet/Php56.php b/src/RuleSet/Php56.php index 53749e5b..125bb8c0 100644 --- a/src/RuleSet/Php56.php +++ b/src/RuleSet/Php56.php @@ -286,6 +286,7 @@ public static function create(): RuleSet 'global_namespace_import' => false, 'group_import' => false, 'header_comment' => false, + 'heredoc_closing_marker' => false, 'heredoc_indentation' => false, 'heredoc_to_nowdoc' => true, 'implode_call' => true, @@ -320,6 +321,7 @@ public static function create(): RuleSet 'modernize_strpos' => false, 'modernize_types_casting' => true, 'multiline_comment_opening_closing' => true, + 'multiline_string_to_heredoc' => false, 'multiline_whitespace_before_semicolons' => [ 'strategy' => 'no_multi_line', ], @@ -466,6 +468,7 @@ public static function create(): RuleSet 'nullable_type_declaration_for_default_null_value' => [ 'use_nullable_type_declaration' => true, ], + 'numeric_literal_separator' => false, 'object_operator_without_whitespace' => true, 'octal_notation' => false, 'operator_linebreak' => [ diff --git a/src/RuleSet/Php70.php b/src/RuleSet/Php70.php index 2ffe8f4d..f2b3c53f 100644 --- a/src/RuleSet/Php70.php +++ b/src/RuleSet/Php70.php @@ -286,6 +286,7 @@ public static function create(): RuleSet 'global_namespace_import' => false, 'group_import' => false, 'header_comment' => false, + 'heredoc_closing_marker' => false, 'heredoc_indentation' => false, 'heredoc_to_nowdoc' => true, 'implode_call' => true, @@ -320,6 +321,7 @@ public static function create(): RuleSet 'modernize_strpos' => false, 'modernize_types_casting' => true, 'multiline_comment_opening_closing' => true, + 'multiline_string_to_heredoc' => false, 'multiline_whitespace_before_semicolons' => [ 'strategy' => 'no_multi_line', ], @@ -464,6 +466,7 @@ public static function create(): RuleSet 'not_operator_with_successor_space' => false, 'nullable_type_declaration' => false, 'nullable_type_declaration_for_default_null_value' => false, + 'numeric_literal_separator' => false, 'object_operator_without_whitespace' => true, 'octal_notation' => false, 'operator_linebreak' => [ diff --git a/src/RuleSet/Php71.php b/src/RuleSet/Php71.php index c861e52d..70e93754 100644 --- a/src/RuleSet/Php71.php +++ b/src/RuleSet/Php71.php @@ -286,6 +286,7 @@ public static function create(): RuleSet 'global_namespace_import' => false, 'group_import' => false, 'header_comment' => false, + 'heredoc_closing_marker' => false, 'heredoc_indentation' => false, 'heredoc_to_nowdoc' => true, 'implode_call' => true, @@ -320,6 +321,7 @@ public static function create(): RuleSet 'modernize_strpos' => false, 'modernize_types_casting' => true, 'multiline_comment_opening_closing' => true, + 'multiline_string_to_heredoc' => false, 'multiline_whitespace_before_semicolons' => [ 'strategy' => 'no_multi_line', ], @@ -466,6 +468,7 @@ public static function create(): RuleSet 'nullable_type_declaration_for_default_null_value' => [ 'use_nullable_type_declaration' => true, ], + 'numeric_literal_separator' => false, 'object_operator_without_whitespace' => true, 'octal_notation' => false, 'operator_linebreak' => [ diff --git a/src/RuleSet/Php72.php b/src/RuleSet/Php72.php index 06615945..dc407075 100644 --- a/src/RuleSet/Php72.php +++ b/src/RuleSet/Php72.php @@ -286,6 +286,7 @@ public static function create(): RuleSet 'global_namespace_import' => false, 'group_import' => false, 'header_comment' => false, + 'heredoc_closing_marker' => false, 'heredoc_indentation' => false, 'heredoc_to_nowdoc' => true, 'implode_call' => true, @@ -320,6 +321,7 @@ public static function create(): RuleSet 'modernize_strpos' => false, 'modernize_types_casting' => true, 'multiline_comment_opening_closing' => true, + 'multiline_string_to_heredoc' => false, 'multiline_whitespace_before_semicolons' => [ 'strategy' => 'no_multi_line', ], @@ -466,6 +468,7 @@ public static function create(): RuleSet 'nullable_type_declaration_for_default_null_value' => [ 'use_nullable_type_declaration' => true, ], + 'numeric_literal_separator' => false, 'object_operator_without_whitespace' => true, 'octal_notation' => false, 'operator_linebreak' => [ diff --git a/src/RuleSet/Php73.php b/src/RuleSet/Php73.php index 3d7a188f..a1a82bdf 100644 --- a/src/RuleSet/Php73.php +++ b/src/RuleSet/Php73.php @@ -286,6 +286,7 @@ public static function create(): RuleSet 'global_namespace_import' => false, 'group_import' => false, 'header_comment' => false, + 'heredoc_closing_marker' => false, 'heredoc_indentation' => false, 'heredoc_to_nowdoc' => true, 'implode_call' => true, @@ -320,6 +321,7 @@ public static function create(): RuleSet 'modernize_strpos' => false, 'modernize_types_casting' => true, 'multiline_comment_opening_closing' => true, + 'multiline_string_to_heredoc' => false, 'multiline_whitespace_before_semicolons' => [ 'strategy' => 'no_multi_line', ], @@ -466,6 +468,7 @@ public static function create(): RuleSet 'nullable_type_declaration_for_default_null_value' => [ 'use_nullable_type_declaration' => true, ], + 'numeric_literal_separator' => false, 'object_operator_without_whitespace' => true, 'octal_notation' => false, 'operator_linebreak' => [ diff --git a/src/RuleSet/Php74.php b/src/RuleSet/Php74.php index f2e6b6e3..e189d4fd 100644 --- a/src/RuleSet/Php74.php +++ b/src/RuleSet/Php74.php @@ -286,6 +286,7 @@ public static function create(): RuleSet 'global_namespace_import' => false, 'group_import' => false, 'header_comment' => false, + 'heredoc_closing_marker' => false, 'heredoc_indentation' => false, 'heredoc_to_nowdoc' => true, 'implode_call' => true, @@ -320,6 +321,7 @@ public static function create(): RuleSet 'modernize_strpos' => false, 'modernize_types_casting' => true, 'multiline_comment_opening_closing' => true, + 'multiline_string_to_heredoc' => false, 'multiline_whitespace_before_semicolons' => [ 'strategy' => 'no_multi_line', ], @@ -466,6 +468,7 @@ public static function create(): RuleSet 'nullable_type_declaration_for_default_null_value' => [ 'use_nullable_type_declaration' => true, ], + 'numeric_literal_separator' => false, 'object_operator_without_whitespace' => true, 'octal_notation' => false, 'operator_linebreak' => [ diff --git a/src/RuleSet/Php80.php b/src/RuleSet/Php80.php index 0bc28e61..46b8aed4 100644 --- a/src/RuleSet/Php80.php +++ b/src/RuleSet/Php80.php @@ -293,6 +293,7 @@ public static function create(): RuleSet 'global_namespace_import' => false, 'group_import' => false, 'header_comment' => false, + 'heredoc_closing_marker' => false, 'heredoc_indentation' => false, 'heredoc_to_nowdoc' => true, 'implode_call' => true, @@ -327,6 +328,7 @@ public static function create(): RuleSet 'modernize_strpos' => true, 'modernize_types_casting' => true, 'multiline_comment_opening_closing' => true, + 'multiline_string_to_heredoc' => false, 'multiline_whitespace_before_semicolons' => [ 'strategy' => 'no_multi_line', ], @@ -476,6 +478,7 @@ public static function create(): RuleSet 'nullable_type_declaration_for_default_null_value' => [ 'use_nullable_type_declaration' => true, ], + 'numeric_literal_separator' => false, 'object_operator_without_whitespace' => true, 'octal_notation' => false, 'operator_linebreak' => [ diff --git a/src/RuleSet/Php81.php b/src/RuleSet/Php81.php index 0c5f5650..0f361f35 100644 --- a/src/RuleSet/Php81.php +++ b/src/RuleSet/Php81.php @@ -294,6 +294,7 @@ public static function create(): RuleSet 'global_namespace_import' => false, 'group_import' => false, 'header_comment' => false, + 'heredoc_closing_marker' => false, 'heredoc_indentation' => false, 'heredoc_to_nowdoc' => true, 'implode_call' => true, @@ -328,6 +329,7 @@ public static function create(): RuleSet 'modernize_strpos' => true, 'modernize_types_casting' => true, 'multiline_comment_opening_closing' => true, + 'multiline_string_to_heredoc' => false, 'multiline_whitespace_before_semicolons' => [ 'strategy' => 'no_multi_line', ], @@ -477,6 +479,7 @@ public static function create(): RuleSet 'nullable_type_declaration_for_default_null_value' => [ 'use_nullable_type_declaration' => true, ], + 'numeric_literal_separator' => false, 'object_operator_without_whitespace' => true, 'octal_notation' => true, 'operator_linebreak' => [ diff --git a/src/RuleSet/Php82.php b/src/RuleSet/Php82.php index d6d0f7a9..90ca3932 100644 --- a/src/RuleSet/Php82.php +++ b/src/RuleSet/Php82.php @@ -294,6 +294,7 @@ public static function create(): RuleSet 'global_namespace_import' => false, 'group_import' => false, 'header_comment' => false, + 'heredoc_closing_marker' => false, 'heredoc_indentation' => false, 'heredoc_to_nowdoc' => true, 'implode_call' => true, @@ -328,6 +329,7 @@ public static function create(): RuleSet 'modernize_strpos' => true, 'modernize_types_casting' => true, 'multiline_comment_opening_closing' => true, + 'multiline_string_to_heredoc' => false, 'multiline_whitespace_before_semicolons' => [ 'strategy' => 'no_multi_line', ], @@ -477,6 +479,7 @@ public static function create(): RuleSet 'nullable_type_declaration_for_default_null_value' => [ 'use_nullable_type_declaration' => true, ], + 'numeric_literal_separator' => false, 'object_operator_without_whitespace' => true, 'octal_notation' => true, 'operator_linebreak' => [ diff --git a/src/RuleSet/Php83.php b/src/RuleSet/Php83.php index 05a674d9..5226c5fc 100644 --- a/src/RuleSet/Php83.php +++ b/src/RuleSet/Php83.php @@ -294,6 +294,7 @@ public static function create(): RuleSet 'global_namespace_import' => false, 'group_import' => false, 'header_comment' => false, + 'heredoc_closing_marker' => false, 'heredoc_indentation' => false, 'heredoc_to_nowdoc' => true, 'implode_call' => true, @@ -328,6 +329,7 @@ public static function create(): RuleSet 'modernize_strpos' => true, 'modernize_types_casting' => true, 'multiline_comment_opening_closing' => true, + 'multiline_string_to_heredoc' => false, 'multiline_whitespace_before_semicolons' => [ 'strategy' => 'no_multi_line', ], @@ -477,6 +479,7 @@ public static function create(): RuleSet 'nullable_type_declaration_for_default_null_value' => [ 'use_nullable_type_declaration' => true, ], + 'numeric_literal_separator' => false, 'object_operator_without_whitespace' => true, 'octal_notation' => true, 'operator_linebreak' => [ diff --git a/test/Unit/RuleSet/Php53Test.php b/test/Unit/RuleSet/Php53Test.php index ec93dc2b..046877b5 100644 --- a/test/Unit/RuleSet/Php53Test.php +++ b/test/Unit/RuleSet/Php53Test.php @@ -304,6 +304,7 @@ protected function expectedRules(): Rules 'global_namespace_import' => false, 'group_import' => false, 'header_comment' => false, + 'heredoc_closing_marker' => false, 'heredoc_indentation' => false, 'heredoc_to_nowdoc' => true, 'implode_call' => true, @@ -338,6 +339,7 @@ protected function expectedRules(): Rules 'modernize_strpos' => false, 'modernize_types_casting' => true, 'multiline_comment_opening_closing' => true, + 'multiline_string_to_heredoc' => false, 'multiline_whitespace_before_semicolons' => [ 'strategy' => 'no_multi_line', ], @@ -482,6 +484,7 @@ protected function expectedRules(): Rules 'nullable_type_declaration_for_default_null_value' => [ 'use_nullable_type_declaration' => true, ], + 'numeric_literal_separator' => false, 'object_operator_without_whitespace' => true, 'octal_notation' => false, 'operator_linebreak' => [ diff --git a/test/Unit/RuleSet/Php54Test.php b/test/Unit/RuleSet/Php54Test.php index 391f6854..17ba8763 100644 --- a/test/Unit/RuleSet/Php54Test.php +++ b/test/Unit/RuleSet/Php54Test.php @@ -305,6 +305,7 @@ protected function expectedRules(): Rules 'global_namespace_import' => false, 'group_import' => false, 'header_comment' => false, + 'heredoc_closing_marker' => false, 'heredoc_indentation' => false, 'heredoc_to_nowdoc' => true, 'implode_call' => true, @@ -339,6 +340,7 @@ protected function expectedRules(): Rules 'modernize_strpos' => false, 'modernize_types_casting' => true, 'multiline_comment_opening_closing' => true, + 'multiline_string_to_heredoc' => false, 'multiline_whitespace_before_semicolons' => [ 'strategy' => 'no_multi_line', ], @@ -483,6 +485,7 @@ protected function expectedRules(): Rules 'nullable_type_declaration_for_default_null_value' => [ 'use_nullable_type_declaration' => true, ], + 'numeric_literal_separator' => false, 'object_operator_without_whitespace' => true, 'octal_notation' => false, 'operator_linebreak' => [ diff --git a/test/Unit/RuleSet/Php55Test.php b/test/Unit/RuleSet/Php55Test.php index dccdd0b3..bc0c1e77 100644 --- a/test/Unit/RuleSet/Php55Test.php +++ b/test/Unit/RuleSet/Php55Test.php @@ -309,6 +309,7 @@ protected function expectedRules(): Rules 'global_namespace_import' => false, 'group_import' => false, 'header_comment' => false, + 'heredoc_closing_marker' => false, 'heredoc_indentation' => false, 'heredoc_to_nowdoc' => true, 'implode_call' => true, @@ -343,6 +344,7 @@ protected function expectedRules(): Rules 'modernize_strpos' => false, 'modernize_types_casting' => true, 'multiline_comment_opening_closing' => true, + 'multiline_string_to_heredoc' => false, 'multiline_whitespace_before_semicolons' => [ 'strategy' => 'no_multi_line', ], @@ -489,6 +491,7 @@ protected function expectedRules(): Rules 'nullable_type_declaration_for_default_null_value' => [ 'use_nullable_type_declaration' => true, ], + 'numeric_literal_separator' => false, 'object_operator_without_whitespace' => true, 'octal_notation' => false, 'operator_linebreak' => [ diff --git a/test/Unit/RuleSet/Php56Test.php b/test/Unit/RuleSet/Php56Test.php index 6c16ab0f..f3efb9a0 100644 --- a/test/Unit/RuleSet/Php56Test.php +++ b/test/Unit/RuleSet/Php56Test.php @@ -309,6 +309,7 @@ protected function expectedRules(): Rules 'global_namespace_import' => false, 'group_import' => false, 'header_comment' => false, + 'heredoc_closing_marker' => false, 'heredoc_indentation' => false, 'heredoc_to_nowdoc' => true, 'implode_call' => true, @@ -343,6 +344,7 @@ protected function expectedRules(): Rules 'modernize_strpos' => false, 'modernize_types_casting' => true, 'multiline_comment_opening_closing' => true, + 'multiline_string_to_heredoc' => false, 'multiline_whitespace_before_semicolons' => [ 'strategy' => 'no_multi_line', ], @@ -489,6 +491,7 @@ protected function expectedRules(): Rules 'nullable_type_declaration_for_default_null_value' => [ 'use_nullable_type_declaration' => true, ], + 'numeric_literal_separator' => false, 'object_operator_without_whitespace' => true, 'octal_notation' => false, 'operator_linebreak' => [ diff --git a/test/Unit/RuleSet/Php70Test.php b/test/Unit/RuleSet/Php70Test.php index 1bc51cef..a56629bc 100644 --- a/test/Unit/RuleSet/Php70Test.php +++ b/test/Unit/RuleSet/Php70Test.php @@ -309,6 +309,7 @@ protected function expectedRules(): Rules 'global_namespace_import' => false, 'group_import' => false, 'header_comment' => false, + 'heredoc_closing_marker' => false, 'heredoc_indentation' => false, 'heredoc_to_nowdoc' => true, 'implode_call' => true, @@ -343,6 +344,7 @@ protected function expectedRules(): Rules 'modernize_strpos' => false, 'modernize_types_casting' => true, 'multiline_comment_opening_closing' => true, + 'multiline_string_to_heredoc' => false, 'multiline_whitespace_before_semicolons' => [ 'strategy' => 'no_multi_line', ], @@ -487,6 +489,7 @@ protected function expectedRules(): Rules 'not_operator_with_successor_space' => false, 'nullable_type_declaration' => false, 'nullable_type_declaration_for_default_null_value' => false, + 'numeric_literal_separator' => false, 'object_operator_without_whitespace' => true, 'octal_notation' => false, 'operator_linebreak' => [ diff --git a/test/Unit/RuleSet/Php71Test.php b/test/Unit/RuleSet/Php71Test.php index 0add80b1..60d006c3 100644 --- a/test/Unit/RuleSet/Php71Test.php +++ b/test/Unit/RuleSet/Php71Test.php @@ -309,6 +309,7 @@ protected function expectedRules(): Rules 'global_namespace_import' => false, 'group_import' => false, 'header_comment' => false, + 'heredoc_closing_marker' => false, 'heredoc_indentation' => false, 'heredoc_to_nowdoc' => true, 'implode_call' => true, @@ -343,6 +344,7 @@ protected function expectedRules(): Rules 'modernize_strpos' => false, 'modernize_types_casting' => true, 'multiline_comment_opening_closing' => true, + 'multiline_string_to_heredoc' => false, 'multiline_whitespace_before_semicolons' => [ 'strategy' => 'no_multi_line', ], @@ -489,6 +491,7 @@ protected function expectedRules(): Rules 'nullable_type_declaration_for_default_null_value' => [ 'use_nullable_type_declaration' => true, ], + 'numeric_literal_separator' => false, 'object_operator_without_whitespace' => true, 'octal_notation' => false, 'operator_linebreak' => [ diff --git a/test/Unit/RuleSet/Php72Test.php b/test/Unit/RuleSet/Php72Test.php index 20c2f6b1..5a87f561 100644 --- a/test/Unit/RuleSet/Php72Test.php +++ b/test/Unit/RuleSet/Php72Test.php @@ -309,6 +309,7 @@ protected function expectedRules(): Rules 'global_namespace_import' => false, 'group_import' => false, 'header_comment' => false, + 'heredoc_closing_marker' => false, 'heredoc_indentation' => false, 'heredoc_to_nowdoc' => true, 'implode_call' => true, @@ -343,6 +344,7 @@ protected function expectedRules(): Rules 'modernize_strpos' => false, 'modernize_types_casting' => true, 'multiline_comment_opening_closing' => true, + 'multiline_string_to_heredoc' => false, 'multiline_whitespace_before_semicolons' => [ 'strategy' => 'no_multi_line', ], @@ -489,6 +491,7 @@ protected function expectedRules(): Rules 'nullable_type_declaration_for_default_null_value' => [ 'use_nullable_type_declaration' => true, ], + 'numeric_literal_separator' => false, 'object_operator_without_whitespace' => true, 'octal_notation' => false, 'operator_linebreak' => [ diff --git a/test/Unit/RuleSet/Php73Test.php b/test/Unit/RuleSet/Php73Test.php index a925dd67..4fd7a246 100644 --- a/test/Unit/RuleSet/Php73Test.php +++ b/test/Unit/RuleSet/Php73Test.php @@ -309,6 +309,7 @@ protected function expectedRules(): Rules 'global_namespace_import' => false, 'group_import' => false, 'header_comment' => false, + 'heredoc_closing_marker' => false, 'heredoc_indentation' => false, 'heredoc_to_nowdoc' => true, 'implode_call' => true, @@ -343,6 +344,7 @@ protected function expectedRules(): Rules 'modernize_strpos' => false, 'modernize_types_casting' => true, 'multiline_comment_opening_closing' => true, + 'multiline_string_to_heredoc' => false, 'multiline_whitespace_before_semicolons' => [ 'strategy' => 'no_multi_line', ], @@ -489,6 +491,7 @@ protected function expectedRules(): Rules 'nullable_type_declaration_for_default_null_value' => [ 'use_nullable_type_declaration' => true, ], + 'numeric_literal_separator' => false, 'object_operator_without_whitespace' => true, 'octal_notation' => false, 'operator_linebreak' => [ diff --git a/test/Unit/RuleSet/Php74Test.php b/test/Unit/RuleSet/Php74Test.php index a71ea0cf..5b67cbe2 100644 --- a/test/Unit/RuleSet/Php74Test.php +++ b/test/Unit/RuleSet/Php74Test.php @@ -309,6 +309,7 @@ protected function expectedRules(): Rules 'global_namespace_import' => false, 'group_import' => false, 'header_comment' => false, + 'heredoc_closing_marker' => false, 'heredoc_indentation' => false, 'heredoc_to_nowdoc' => true, 'implode_call' => true, @@ -343,6 +344,7 @@ protected function expectedRules(): Rules 'modernize_strpos' => false, 'modernize_types_casting' => true, 'multiline_comment_opening_closing' => true, + 'multiline_string_to_heredoc' => false, 'multiline_whitespace_before_semicolons' => [ 'strategy' => 'no_multi_line', ], @@ -489,6 +491,7 @@ protected function expectedRules(): Rules 'nullable_type_declaration_for_default_null_value' => [ 'use_nullable_type_declaration' => true, ], + 'numeric_literal_separator' => false, 'object_operator_without_whitespace' => true, 'octal_notation' => false, 'operator_linebreak' => [ diff --git a/test/Unit/RuleSet/Php80Test.php b/test/Unit/RuleSet/Php80Test.php index cf3380ce..50366223 100644 --- a/test/Unit/RuleSet/Php80Test.php +++ b/test/Unit/RuleSet/Php80Test.php @@ -316,6 +316,7 @@ protected function expectedRules(): Rules 'global_namespace_import' => false, 'group_import' => false, 'header_comment' => false, + 'heredoc_closing_marker' => false, 'heredoc_indentation' => false, 'heredoc_to_nowdoc' => true, 'implode_call' => true, @@ -350,6 +351,7 @@ protected function expectedRules(): Rules 'modernize_strpos' => true, 'modernize_types_casting' => true, 'multiline_comment_opening_closing' => true, + 'multiline_string_to_heredoc' => false, 'multiline_whitespace_before_semicolons' => [ 'strategy' => 'no_multi_line', ], @@ -499,6 +501,7 @@ protected function expectedRules(): Rules 'nullable_type_declaration_for_default_null_value' => [ 'use_nullable_type_declaration' => true, ], + 'numeric_literal_separator' => false, 'object_operator_without_whitespace' => true, 'octal_notation' => false, 'operator_linebreak' => [ diff --git a/test/Unit/RuleSet/Php81Test.php b/test/Unit/RuleSet/Php81Test.php index 0d7c6f0c..ef61a477 100644 --- a/test/Unit/RuleSet/Php81Test.php +++ b/test/Unit/RuleSet/Php81Test.php @@ -317,6 +317,7 @@ protected function expectedRules(): Rules 'global_namespace_import' => false, 'group_import' => false, 'header_comment' => false, + 'heredoc_closing_marker' => false, 'heredoc_indentation' => false, 'heredoc_to_nowdoc' => true, 'implode_call' => true, @@ -351,6 +352,7 @@ protected function expectedRules(): Rules 'modernize_strpos' => true, 'modernize_types_casting' => true, 'multiline_comment_opening_closing' => true, + 'multiline_string_to_heredoc' => false, 'multiline_whitespace_before_semicolons' => [ 'strategy' => 'no_multi_line', ], @@ -500,6 +502,7 @@ protected function expectedRules(): Rules 'nullable_type_declaration_for_default_null_value' => [ 'use_nullable_type_declaration' => true, ], + 'numeric_literal_separator' => false, 'object_operator_without_whitespace' => true, 'octal_notation' => true, 'operator_linebreak' => [ diff --git a/test/Unit/RuleSet/Php82Test.php b/test/Unit/RuleSet/Php82Test.php index eb4fe9da..57dae546 100644 --- a/test/Unit/RuleSet/Php82Test.php +++ b/test/Unit/RuleSet/Php82Test.php @@ -317,6 +317,7 @@ protected function expectedRules(): Rules 'global_namespace_import' => false, 'group_import' => false, 'header_comment' => false, + 'heredoc_closing_marker' => false, 'heredoc_indentation' => false, 'heredoc_to_nowdoc' => true, 'implode_call' => true, @@ -351,6 +352,7 @@ protected function expectedRules(): Rules 'modernize_strpos' => true, 'modernize_types_casting' => true, 'multiline_comment_opening_closing' => true, + 'multiline_string_to_heredoc' => false, 'multiline_whitespace_before_semicolons' => [ 'strategy' => 'no_multi_line', ], @@ -500,6 +502,7 @@ protected function expectedRules(): Rules 'nullable_type_declaration_for_default_null_value' => [ 'use_nullable_type_declaration' => true, ], + 'numeric_literal_separator' => false, 'object_operator_without_whitespace' => true, 'octal_notation' => true, 'operator_linebreak' => [ diff --git a/test/Unit/RuleSet/Php83Test.php b/test/Unit/RuleSet/Php83Test.php index d4b970b2..4454a568 100644 --- a/test/Unit/RuleSet/Php83Test.php +++ b/test/Unit/RuleSet/Php83Test.php @@ -317,6 +317,7 @@ protected function expectedRules(): Rules 'global_namespace_import' => false, 'group_import' => false, 'header_comment' => false, + 'heredoc_closing_marker' => false, 'heredoc_indentation' => false, 'heredoc_to_nowdoc' => true, 'implode_call' => true, @@ -351,6 +352,7 @@ protected function expectedRules(): Rules 'modernize_strpos' => true, 'modernize_types_casting' => true, 'multiline_comment_opening_closing' => true, + 'multiline_string_to_heredoc' => false, 'multiline_whitespace_before_semicolons' => [ 'strategy' => 'no_multi_line', ], @@ -500,6 +502,7 @@ protected function expectedRules(): Rules 'nullable_type_declaration_for_default_null_value' => [ 'use_nullable_type_declaration' => true, ], + 'numeric_literal_separator' => false, 'object_operator_without_whitespace' => true, 'octal_notation' => true, 'operator_linebreak' => [ From 058e7b9851edb18298935d5c53a111cfc956512b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=B6ller?= Date: Sat, 20 Jan 2024 13:18:56 +0100 Subject: [PATCH 3/5] Fix: Configure newly added spacing option of phpdoc_align 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 + 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 + 26 files changed, 26 insertions(+) diff --git a/src/RuleSet/Php53.php b/src/RuleSet/Php53.php index 975fdf23..4fcf766a 100644 --- a/src/RuleSet/Php53.php +++ b/src/RuleSet/Php53.php @@ -562,6 +562,7 @@ public static function create(): RuleSet ], 'phpdoc_align' => [ 'align' => 'vertical', + 'spacing' => 1, 'tags' => [ 'method', 'param', diff --git a/src/RuleSet/Php54.php b/src/RuleSet/Php54.php index a266e336..6397be64 100644 --- a/src/RuleSet/Php54.php +++ b/src/RuleSet/Php54.php @@ -563,6 +563,7 @@ public static function create(): RuleSet ], 'phpdoc_align' => [ 'align' => 'vertical', + 'spacing' => 1, 'tags' => [ 'method', 'param', diff --git a/src/RuleSet/Php55.php b/src/RuleSet/Php55.php index 2379cb80..4f9271e9 100644 --- a/src/RuleSet/Php55.php +++ b/src/RuleSet/Php55.php @@ -569,6 +569,7 @@ public static function create(): RuleSet ], 'phpdoc_align' => [ 'align' => 'vertical', + 'spacing' => 1, 'tags' => [ 'method', 'param', diff --git a/src/RuleSet/Php56.php b/src/RuleSet/Php56.php index 125bb8c0..4473d2c9 100644 --- a/src/RuleSet/Php56.php +++ b/src/RuleSet/Php56.php @@ -569,6 +569,7 @@ public static function create(): RuleSet ], 'phpdoc_align' => [ 'align' => 'vertical', + 'spacing' => 1, 'tags' => [ 'method', 'param', diff --git a/src/RuleSet/Php70.php b/src/RuleSet/Php70.php index f2b3c53f..db0d1470 100644 --- a/src/RuleSet/Php70.php +++ b/src/RuleSet/Php70.php @@ -567,6 +567,7 @@ public static function create(): RuleSet ], 'phpdoc_align' => [ 'align' => 'vertical', + 'spacing' => 1, 'tags' => [ 'method', 'param', diff --git a/src/RuleSet/Php71.php b/src/RuleSet/Php71.php index 70e93754..69adb2f8 100644 --- a/src/RuleSet/Php71.php +++ b/src/RuleSet/Php71.php @@ -569,6 +569,7 @@ public static function create(): RuleSet ], 'phpdoc_align' => [ 'align' => 'vertical', + 'spacing' => 1, 'tags' => [ 'method', 'param', diff --git a/src/RuleSet/Php72.php b/src/RuleSet/Php72.php index dc407075..ec0d27ad 100644 --- a/src/RuleSet/Php72.php +++ b/src/RuleSet/Php72.php @@ -569,6 +569,7 @@ public static function create(): RuleSet ], 'phpdoc_align' => [ 'align' => 'vertical', + 'spacing' => 1, 'tags' => [ 'method', 'param', diff --git a/src/RuleSet/Php73.php b/src/RuleSet/Php73.php index a1a82bdf..6eb1bc47 100644 --- a/src/RuleSet/Php73.php +++ b/src/RuleSet/Php73.php @@ -569,6 +569,7 @@ public static function create(): RuleSet ], 'phpdoc_align' => [ 'align' => 'vertical', + 'spacing' => 1, 'tags' => [ 'method', 'param', diff --git a/src/RuleSet/Php74.php b/src/RuleSet/Php74.php index e189d4fd..ae3893db 100644 --- a/src/RuleSet/Php74.php +++ b/src/RuleSet/Php74.php @@ -569,6 +569,7 @@ public static function create(): RuleSet ], 'phpdoc_align' => [ 'align' => 'vertical', + 'spacing' => 1, 'tags' => [ 'method', 'param', diff --git a/src/RuleSet/Php80.php b/src/RuleSet/Php80.php index 46b8aed4..83ff4f2a 100644 --- a/src/RuleSet/Php80.php +++ b/src/RuleSet/Php80.php @@ -579,6 +579,7 @@ public static function create(): RuleSet ], 'phpdoc_align' => [ 'align' => 'vertical', + 'spacing' => 1, 'tags' => [ 'method', 'param', diff --git a/src/RuleSet/Php81.php b/src/RuleSet/Php81.php index 0f361f35..946ddee5 100644 --- a/src/RuleSet/Php81.php +++ b/src/RuleSet/Php81.php @@ -581,6 +581,7 @@ public static function create(): RuleSet ], 'phpdoc_align' => [ 'align' => 'vertical', + 'spacing' => 1, 'tags' => [ 'method', 'param', diff --git a/src/RuleSet/Php82.php b/src/RuleSet/Php82.php index 90ca3932..2f99805a 100644 --- a/src/RuleSet/Php82.php +++ b/src/RuleSet/Php82.php @@ -581,6 +581,7 @@ public static function create(): RuleSet ], 'phpdoc_align' => [ 'align' => 'vertical', + 'spacing' => 1, 'tags' => [ 'method', 'param', diff --git a/src/RuleSet/Php83.php b/src/RuleSet/Php83.php index 5226c5fc..5108a2fb 100644 --- a/src/RuleSet/Php83.php +++ b/src/RuleSet/Php83.php @@ -581,6 +581,7 @@ public static function create(): RuleSet ], 'phpdoc_align' => [ 'align' => 'vertical', + 'spacing' => 1, 'tags' => [ 'method', 'param', diff --git a/test/Unit/RuleSet/Php53Test.php b/test/Unit/RuleSet/Php53Test.php index 046877b5..d8682605 100644 --- a/test/Unit/RuleSet/Php53Test.php +++ b/test/Unit/RuleSet/Php53Test.php @@ -585,6 +585,7 @@ protected function expectedRules(): Rules ], 'phpdoc_align' => [ 'align' => 'vertical', + 'spacing' => 1, 'tags' => [ 'method', 'param', diff --git a/test/Unit/RuleSet/Php54Test.php b/test/Unit/RuleSet/Php54Test.php index 17ba8763..70b2bfeb 100644 --- a/test/Unit/RuleSet/Php54Test.php +++ b/test/Unit/RuleSet/Php54Test.php @@ -586,6 +586,7 @@ protected function expectedRules(): Rules ], 'phpdoc_align' => [ 'align' => 'vertical', + 'spacing' => 1, 'tags' => [ 'method', 'param', diff --git a/test/Unit/RuleSet/Php55Test.php b/test/Unit/RuleSet/Php55Test.php index bc0c1e77..b18733cb 100644 --- a/test/Unit/RuleSet/Php55Test.php +++ b/test/Unit/RuleSet/Php55Test.php @@ -592,6 +592,7 @@ protected function expectedRules(): Rules ], 'phpdoc_align' => [ 'align' => 'vertical', + 'spacing' => 1, 'tags' => [ 'method', 'param', diff --git a/test/Unit/RuleSet/Php56Test.php b/test/Unit/RuleSet/Php56Test.php index f3efb9a0..20a2e61e 100644 --- a/test/Unit/RuleSet/Php56Test.php +++ b/test/Unit/RuleSet/Php56Test.php @@ -592,6 +592,7 @@ protected function expectedRules(): Rules ], 'phpdoc_align' => [ 'align' => 'vertical', + 'spacing' => 1, 'tags' => [ 'method', 'param', diff --git a/test/Unit/RuleSet/Php70Test.php b/test/Unit/RuleSet/Php70Test.php index a56629bc..354463de 100644 --- a/test/Unit/RuleSet/Php70Test.php +++ b/test/Unit/RuleSet/Php70Test.php @@ -590,6 +590,7 @@ protected function expectedRules(): Rules ], 'phpdoc_align' => [ 'align' => 'vertical', + 'spacing' => 1, 'tags' => [ 'method', 'param', diff --git a/test/Unit/RuleSet/Php71Test.php b/test/Unit/RuleSet/Php71Test.php index 60d006c3..816b0de4 100644 --- a/test/Unit/RuleSet/Php71Test.php +++ b/test/Unit/RuleSet/Php71Test.php @@ -592,6 +592,7 @@ protected function expectedRules(): Rules ], 'phpdoc_align' => [ 'align' => 'vertical', + 'spacing' => 1, 'tags' => [ 'method', 'param', diff --git a/test/Unit/RuleSet/Php72Test.php b/test/Unit/RuleSet/Php72Test.php index 5a87f561..82088fe5 100644 --- a/test/Unit/RuleSet/Php72Test.php +++ b/test/Unit/RuleSet/Php72Test.php @@ -592,6 +592,7 @@ protected function expectedRules(): Rules ], 'phpdoc_align' => [ 'align' => 'vertical', + 'spacing' => 1, 'tags' => [ 'method', 'param', diff --git a/test/Unit/RuleSet/Php73Test.php b/test/Unit/RuleSet/Php73Test.php index 4fd7a246..e9001fa3 100644 --- a/test/Unit/RuleSet/Php73Test.php +++ b/test/Unit/RuleSet/Php73Test.php @@ -592,6 +592,7 @@ protected function expectedRules(): Rules ], 'phpdoc_align' => [ 'align' => 'vertical', + 'spacing' => 1, 'tags' => [ 'method', 'param', diff --git a/test/Unit/RuleSet/Php74Test.php b/test/Unit/RuleSet/Php74Test.php index 5b67cbe2..0fa5e69f 100644 --- a/test/Unit/RuleSet/Php74Test.php +++ b/test/Unit/RuleSet/Php74Test.php @@ -592,6 +592,7 @@ protected function expectedRules(): Rules ], 'phpdoc_align' => [ 'align' => 'vertical', + 'spacing' => 1, 'tags' => [ 'method', 'param', diff --git a/test/Unit/RuleSet/Php80Test.php b/test/Unit/RuleSet/Php80Test.php index 50366223..1726e41d 100644 --- a/test/Unit/RuleSet/Php80Test.php +++ b/test/Unit/RuleSet/Php80Test.php @@ -602,6 +602,7 @@ protected function expectedRules(): Rules ], 'phpdoc_align' => [ 'align' => 'vertical', + 'spacing' => 1, 'tags' => [ 'method', 'param', diff --git a/test/Unit/RuleSet/Php81Test.php b/test/Unit/RuleSet/Php81Test.php index ef61a477..9577c2f1 100644 --- a/test/Unit/RuleSet/Php81Test.php +++ b/test/Unit/RuleSet/Php81Test.php @@ -604,6 +604,7 @@ protected function expectedRules(): Rules ], 'phpdoc_align' => [ 'align' => 'vertical', + 'spacing' => 1, 'tags' => [ 'method', 'param', diff --git a/test/Unit/RuleSet/Php82Test.php b/test/Unit/RuleSet/Php82Test.php index 57dae546..8b71551e 100644 --- a/test/Unit/RuleSet/Php82Test.php +++ b/test/Unit/RuleSet/Php82Test.php @@ -604,6 +604,7 @@ protected function expectedRules(): Rules ], 'phpdoc_align' => [ 'align' => 'vertical', + 'spacing' => 1, 'tags' => [ 'method', 'param', diff --git a/test/Unit/RuleSet/Php83Test.php b/test/Unit/RuleSet/Php83Test.php index 4454a568..45dc8bbf 100644 --- a/test/Unit/RuleSet/Php83Test.php +++ b/test/Unit/RuleSet/Php83Test.php @@ -604,6 +604,7 @@ protected function expectedRules(): Rules ], 'phpdoc_align' => [ 'align' => 'vertical', + 'spacing' => 1, 'tags' => [ 'method', 'param', From ac1714c8da10c7c7d73a68b07bdb1f4e5ad56e9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=B6ller?= Date: Sat, 20 Jan 2024 13:21:26 +0100 Subject: [PATCH 4/5] Fix: Configure newly added union_types option of phpdoc_to_property_type fixer --- 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 + 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 + 10 files changed, 10 insertions(+) diff --git a/src/RuleSet/Php74.php b/src/RuleSet/Php74.php index ae3893db..460097e3 100644 --- a/src/RuleSet/Php74.php +++ b/src/RuleSet/Php74.php @@ -711,6 +711,7 @@ public static function create(): RuleSet 'phpdoc_to_param_type' => false, 'phpdoc_to_property_type' => [ 'scalar_types' => true, + 'union_types' => false, ], 'phpdoc_to_return_type' => false, 'phpdoc_trim' => true, diff --git a/src/RuleSet/Php80.php b/src/RuleSet/Php80.php index 83ff4f2a..74a2fa9b 100644 --- a/src/RuleSet/Php80.php +++ b/src/RuleSet/Php80.php @@ -721,6 +721,7 @@ public static function create(): RuleSet 'phpdoc_to_param_type' => false, 'phpdoc_to_property_type' => [ 'scalar_types' => true, + 'union_types' => true, ], 'phpdoc_to_return_type' => false, 'phpdoc_trim' => true, diff --git a/src/RuleSet/Php81.php b/src/RuleSet/Php81.php index 946ddee5..ab9795b5 100644 --- a/src/RuleSet/Php81.php +++ b/src/RuleSet/Php81.php @@ -723,6 +723,7 @@ public static function create(): RuleSet 'phpdoc_to_param_type' => false, 'phpdoc_to_property_type' => [ 'scalar_types' => true, + 'union_types' => true, ], 'phpdoc_to_return_type' => false, 'phpdoc_trim' => true, diff --git a/src/RuleSet/Php82.php b/src/RuleSet/Php82.php index 2f99805a..6ecf52ec 100644 --- a/src/RuleSet/Php82.php +++ b/src/RuleSet/Php82.php @@ -723,6 +723,7 @@ public static function create(): RuleSet 'phpdoc_to_param_type' => false, 'phpdoc_to_property_type' => [ 'scalar_types' => true, + 'union_types' => true, ], 'phpdoc_to_return_type' => false, 'phpdoc_trim' => true, diff --git a/src/RuleSet/Php83.php b/src/RuleSet/Php83.php index 5108a2fb..0cd5a579 100644 --- a/src/RuleSet/Php83.php +++ b/src/RuleSet/Php83.php @@ -723,6 +723,7 @@ public static function create(): RuleSet 'phpdoc_to_param_type' => false, 'phpdoc_to_property_type' => [ 'scalar_types' => true, + 'union_types' => true, ], 'phpdoc_to_return_type' => false, 'phpdoc_trim' => true, diff --git a/test/Unit/RuleSet/Php74Test.php b/test/Unit/RuleSet/Php74Test.php index 0fa5e69f..b9777f34 100644 --- a/test/Unit/RuleSet/Php74Test.php +++ b/test/Unit/RuleSet/Php74Test.php @@ -734,6 +734,7 @@ protected function expectedRules(): Rules 'phpdoc_to_param_type' => false, 'phpdoc_to_property_type' => [ 'scalar_types' => true, + 'union_types' => false, ], 'phpdoc_to_return_type' => false, 'phpdoc_trim' => true, diff --git a/test/Unit/RuleSet/Php80Test.php b/test/Unit/RuleSet/Php80Test.php index 1726e41d..6239bdcc 100644 --- a/test/Unit/RuleSet/Php80Test.php +++ b/test/Unit/RuleSet/Php80Test.php @@ -744,6 +744,7 @@ protected function expectedRules(): Rules 'phpdoc_to_param_type' => false, 'phpdoc_to_property_type' => [ 'scalar_types' => true, + 'union_types' => true, ], 'phpdoc_to_return_type' => false, 'phpdoc_trim' => true, diff --git a/test/Unit/RuleSet/Php81Test.php b/test/Unit/RuleSet/Php81Test.php index 9577c2f1..ce63f0ab 100644 --- a/test/Unit/RuleSet/Php81Test.php +++ b/test/Unit/RuleSet/Php81Test.php @@ -746,6 +746,7 @@ protected function expectedRules(): Rules 'phpdoc_to_param_type' => false, 'phpdoc_to_property_type' => [ 'scalar_types' => true, + 'union_types' => true, ], 'phpdoc_to_return_type' => false, 'phpdoc_trim' => true, diff --git a/test/Unit/RuleSet/Php82Test.php b/test/Unit/RuleSet/Php82Test.php index 8b71551e..1943d80f 100644 --- a/test/Unit/RuleSet/Php82Test.php +++ b/test/Unit/RuleSet/Php82Test.php @@ -746,6 +746,7 @@ protected function expectedRules(): Rules 'phpdoc_to_param_type' => false, 'phpdoc_to_property_type' => [ 'scalar_types' => true, + 'union_types' => true, ], 'phpdoc_to_return_type' => false, 'phpdoc_trim' => true, diff --git a/test/Unit/RuleSet/Php83Test.php b/test/Unit/RuleSet/Php83Test.php index 45dc8bbf..171ba95b 100644 --- a/test/Unit/RuleSet/Php83Test.php +++ b/test/Unit/RuleSet/Php83Test.php @@ -746,6 +746,7 @@ protected function expectedRules(): Rules 'phpdoc_to_param_type' => false, 'phpdoc_to_property_type' => [ 'scalar_types' => true, + 'union_types' => true, ], 'phpdoc_to_return_type' => false, 'phpdoc_trim' => true, From 1e76e2f6636322ed95d97c0b2254caf1e20b3d41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=B6ller?= Date: Sat, 20 Jan 2024 13:22:11 +0100 Subject: [PATCH 5/5] Fix: Update CHANGELOG.md --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index eb809f69..41925aa0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ For a full diff see [`6.19.0...main`][6.19.0...main]. ### Changed - Updated `erickskrauch/php-cs-fixer-custom-fixers` ([#984]), by [@dependabot] +- Updated `friendsofphp/php-cs-fixer` ([#993]), by [@dependabot] ## [`6.19.0`][6.19.0] @@ -1505,6 +1506,7 @@ For a full diff see [`d899e77...1.0.0`][d899e77...1.0.0]. [#978]: https://github.com/ergebnis/php-cs-fixer-config/pull/978 [#979]: https://github.com/ergebnis/php-cs-fixer-config/pull/979 [#984]: https://github.com/ergebnis/php-cs-fixer-config/pull/984 +[#993]: https://github.com/ergebnis/php-cs-fixer-config/pull/993 [@dependabot]: https://github.com/apps/dependabot [@linuxjuggler]: https://github.com/linuxjuggler