From 61ff6ec5b311a912ab447726657ec0394c9f342c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=B6ller?= Date: Wed, 3 Jan 2024 22:54:58 +0100 Subject: [PATCH 1/3] Enhancement: Enable phpdoc_type_list fixer --- CHANGELOG.md | 1 + src/RuleSet/Php53.php | 2 ++ src/RuleSet/Php54.php | 2 ++ src/RuleSet/Php55.php | 2 ++ src/RuleSet/Php56.php | 2 ++ src/RuleSet/Php70.php | 2 ++ src/RuleSet/Php71.php | 2 ++ src/RuleSet/Php72.php | 2 ++ src/RuleSet/Php73.php | 2 ++ src/RuleSet/Php74.php | 2 ++ src/RuleSet/Php80.php | 2 ++ src/RuleSet/Php81.php | 2 ++ src/RuleSet/Php82.php | 2 ++ src/RuleSet/Php83.php | 2 ++ test/Unit/RuleSet/Php53Test.php | 2 ++ test/Unit/RuleSet/Php54Test.php | 2 ++ test/Unit/RuleSet/Php55Test.php | 2 ++ test/Unit/RuleSet/Php56Test.php | 2 ++ test/Unit/RuleSet/Php70Test.php | 2 ++ test/Unit/RuleSet/Php71Test.php | 2 ++ test/Unit/RuleSet/Php72Test.php | 2 ++ test/Unit/RuleSet/Php73Test.php | 2 ++ test/Unit/RuleSet/Php74Test.php | 2 ++ test/Unit/RuleSet/Php80Test.php | 2 ++ test/Unit/RuleSet/Php81Test.php | 2 ++ test/Unit/RuleSet/Php82Test.php | 2 ++ test/Unit/RuleSet/Php83Test.php | 2 ++ 27 files changed, 53 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a3d609b7..bf57a010 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ For a full diff see [`6.17.0...main`][6.17.0...main]. - Updated `kubawerlos/php-cs-fixer-custom-fixers` ([#970]), by [@dependabot] - Updated `friendsofphp/php-cs-fixer` ([#971]), by [@dependabot] +- Enabled the [`PhpCsFixerCustomFixers/phpdoc_type_list_fixer`](https://github.com/kubawerlos/php-cs-fixer-custom-fixers/tree/v3.18.0#phpdoctypelistfixer) fixer ([#972]), by [@localheinz] ## [`6.17.0`][6.17.0] diff --git a/src/RuleSet/Php53.php b/src/RuleSet/Php53.php index 2ff54ebb..a410c2cb 100644 --- a/src/RuleSet/Php53.php +++ b/src/RuleSet/Php53.php @@ -34,6 +34,7 @@ public static function create(): RuleSet return RuleSet::create( Fixers::fromFixers( new Fixer\PhpdocArrayStyleFixer(), + new Fixer\PhpdocTypeListFixer(), new PhpCsFixer\Whitespace\LineBreakAfterStatementsFixer(), ), Name::fromString(\sprintf( @@ -45,6 +46,7 @@ public static function create(): RuleSet Rules::fromArray([ 'ErickSkrauch/line_break_after_statements' => true, 'PhpCsFixerCustomFixers/phpdoc_array_style' => true, + 'PhpCsFixerCustomFixers/phpdoc_type_list' => true, 'align_multiline_comment' => [ 'comment_type' => 'all_multiline', ], diff --git a/src/RuleSet/Php54.php b/src/RuleSet/Php54.php index 9752d80c..0f3f1566 100644 --- a/src/RuleSet/Php54.php +++ b/src/RuleSet/Php54.php @@ -34,6 +34,7 @@ public static function create(): RuleSet return RuleSet::create( Fixers::fromFixers( new Fixer\PhpdocArrayStyleFixer(), + new Fixer\PhpdocTypeListFixer(), new PhpCsFixer\Whitespace\LineBreakAfterStatementsFixer(), ), Name::fromString(\sprintf( @@ -45,6 +46,7 @@ public static function create(): RuleSet Rules::fromArray([ 'ErickSkrauch/line_break_after_statements' => true, 'PhpCsFixerCustomFixers/phpdoc_array_style' => true, + 'PhpCsFixerCustomFixers/phpdoc_type_list' => true, 'align_multiline_comment' => [ 'comment_type' => 'all_multiline', ], diff --git a/src/RuleSet/Php55.php b/src/RuleSet/Php55.php index 0ac35f2b..c0e6c3e3 100644 --- a/src/RuleSet/Php55.php +++ b/src/RuleSet/Php55.php @@ -34,6 +34,7 @@ public static function create(): RuleSet return RuleSet::create( Fixers::fromFixers( new Fixer\PhpdocArrayStyleFixer(), + new Fixer\PhpdocTypeListFixer(), new PhpCsFixer\Whitespace\LineBreakAfterStatementsFixer(), ), Name::fromString(\sprintf( @@ -45,6 +46,7 @@ public static function create(): RuleSet Rules::fromArray([ 'ErickSkrauch/line_break_after_statements' => true, 'PhpCsFixerCustomFixers/phpdoc_array_style' => true, + 'PhpCsFixerCustomFixers/phpdoc_type_list' => true, 'align_multiline_comment' => [ 'comment_type' => 'all_multiline', ], diff --git a/src/RuleSet/Php56.php b/src/RuleSet/Php56.php index 8fa1014c..63481a78 100644 --- a/src/RuleSet/Php56.php +++ b/src/RuleSet/Php56.php @@ -34,6 +34,7 @@ public static function create(): RuleSet return RuleSet::create( Fixers::fromFixers( new Fixer\PhpdocArrayStyleFixer(), + new Fixer\PhpdocTypeListFixer(), new PhpCsFixer\Whitespace\LineBreakAfterStatementsFixer(), ), Name::fromString(\sprintf( @@ -45,6 +46,7 @@ public static function create(): RuleSet Rules::fromArray([ 'ErickSkrauch/line_break_after_statements' => true, 'PhpCsFixerCustomFixers/phpdoc_array_style' => true, + 'PhpCsFixerCustomFixers/phpdoc_type_list' => true, 'align_multiline_comment' => [ 'comment_type' => 'all_multiline', ], diff --git a/src/RuleSet/Php70.php b/src/RuleSet/Php70.php index b79ff9a2..21fe8b36 100644 --- a/src/RuleSet/Php70.php +++ b/src/RuleSet/Php70.php @@ -34,6 +34,7 @@ public static function create(): RuleSet return RuleSet::create( Fixers::fromFixers( new Fixer\PhpdocArrayStyleFixer(), + new Fixer\PhpdocTypeListFixer(), new PhpCsFixer\Whitespace\LineBreakAfterStatementsFixer(), ), Name::fromString(\sprintf( @@ -45,6 +46,7 @@ public static function create(): RuleSet Rules::fromArray([ 'ErickSkrauch/line_break_after_statements' => true, 'PhpCsFixerCustomFixers/phpdoc_array_style' => true, + 'PhpCsFixerCustomFixers/phpdoc_type_list' => true, 'align_multiline_comment' => [ 'comment_type' => 'all_multiline', ], diff --git a/src/RuleSet/Php71.php b/src/RuleSet/Php71.php index 0b49416d..ce9b9e97 100644 --- a/src/RuleSet/Php71.php +++ b/src/RuleSet/Php71.php @@ -34,6 +34,7 @@ public static function create(): RuleSet return RuleSet::create( Fixers::fromFixers( new Fixer\PhpdocArrayStyleFixer(), + new Fixer\PhpdocTypeListFixer(), new PhpCsFixer\Whitespace\LineBreakAfterStatementsFixer(), ), Name::fromString(\sprintf( @@ -45,6 +46,7 @@ public static function create(): RuleSet Rules::fromArray([ 'ErickSkrauch/line_break_after_statements' => true, 'PhpCsFixerCustomFixers/phpdoc_array_style' => true, + 'PhpCsFixerCustomFixers/phpdoc_type_list' => true, 'align_multiline_comment' => [ 'comment_type' => 'all_multiline', ], diff --git a/src/RuleSet/Php72.php b/src/RuleSet/Php72.php index 6e0ca441..7378f128 100644 --- a/src/RuleSet/Php72.php +++ b/src/RuleSet/Php72.php @@ -34,6 +34,7 @@ public static function create(): RuleSet return RuleSet::create( Fixers::fromFixers( new Fixer\PhpdocArrayStyleFixer(), + new Fixer\PhpdocTypeListFixer(), new PhpCsFixer\Whitespace\LineBreakAfterStatementsFixer(), ), Name::fromString(\sprintf( @@ -45,6 +46,7 @@ public static function create(): RuleSet Rules::fromArray([ 'ErickSkrauch/line_break_after_statements' => true, 'PhpCsFixerCustomFixers/phpdoc_array_style' => true, + 'PhpCsFixerCustomFixers/phpdoc_type_list' => true, 'align_multiline_comment' => [ 'comment_type' => 'all_multiline', ], diff --git a/src/RuleSet/Php73.php b/src/RuleSet/Php73.php index cdaf9fc8..24ce8e1e 100644 --- a/src/RuleSet/Php73.php +++ b/src/RuleSet/Php73.php @@ -34,6 +34,7 @@ public static function create(): RuleSet return RuleSet::create( Fixers::fromFixers( new Fixer\PhpdocArrayStyleFixer(), + new Fixer\PhpdocTypeListFixer(), new PhpCsFixer\Whitespace\LineBreakAfterStatementsFixer(), ), Name::fromString(\sprintf( @@ -45,6 +46,7 @@ public static function create(): RuleSet Rules::fromArray([ 'ErickSkrauch/line_break_after_statements' => true, 'PhpCsFixerCustomFixers/phpdoc_array_style' => true, + 'PhpCsFixerCustomFixers/phpdoc_type_list' => true, 'align_multiline_comment' => [ 'comment_type' => 'all_multiline', ], diff --git a/src/RuleSet/Php74.php b/src/RuleSet/Php74.php index 0bad9099..451b4690 100644 --- a/src/RuleSet/Php74.php +++ b/src/RuleSet/Php74.php @@ -34,6 +34,7 @@ public static function create(): RuleSet return RuleSet::create( Fixers::fromFixers( new Fixer\PhpdocArrayStyleFixer(), + new Fixer\PhpdocTypeListFixer(), new PhpCsFixer\Whitespace\LineBreakAfterStatementsFixer(), ), Name::fromString(\sprintf( @@ -45,6 +46,7 @@ public static function create(): RuleSet Rules::fromArray([ 'ErickSkrauch/line_break_after_statements' => true, 'PhpCsFixerCustomFixers/phpdoc_array_style' => true, + 'PhpCsFixerCustomFixers/phpdoc_type_list' => true, 'align_multiline_comment' => [ 'comment_type' => 'all_multiline', ], diff --git a/src/RuleSet/Php80.php b/src/RuleSet/Php80.php index 99600e70..359b4d92 100644 --- a/src/RuleSet/Php80.php +++ b/src/RuleSet/Php80.php @@ -34,6 +34,7 @@ public static function create(): RuleSet return RuleSet::create( Fixers::fromFixers( new Fixer\PhpdocArrayStyleFixer(), + new Fixer\PhpdocTypeListFixer(), new PhpCsFixer\Whitespace\LineBreakAfterStatementsFixer(), ), Name::fromString(\sprintf( @@ -45,6 +46,7 @@ public static function create(): RuleSet Rules::fromArray([ 'ErickSkrauch/line_break_after_statements' => true, 'PhpCsFixerCustomFixers/phpdoc_array_style' => true, + 'PhpCsFixerCustomFixers/phpdoc_type_list' => true, 'align_multiline_comment' => [ 'comment_type' => 'all_multiline', ], diff --git a/src/RuleSet/Php81.php b/src/RuleSet/Php81.php index 1d878ca3..b986a969 100644 --- a/src/RuleSet/Php81.php +++ b/src/RuleSet/Php81.php @@ -34,6 +34,7 @@ public static function create(): RuleSet return RuleSet::create( Fixers::fromFixers( new Fixer\PhpdocArrayStyleFixer(), + new Fixer\PhpdocTypeListFixer(), new PhpCsFixer\Whitespace\LineBreakAfterStatementsFixer(), ), Name::fromString(\sprintf( @@ -45,6 +46,7 @@ public static function create(): RuleSet Rules::fromArray([ 'ErickSkrauch/line_break_after_statements' => true, 'PhpCsFixerCustomFixers/phpdoc_array_style' => true, + 'PhpCsFixerCustomFixers/phpdoc_type_list' => true, 'align_multiline_comment' => [ 'comment_type' => 'all_multiline', ], diff --git a/src/RuleSet/Php82.php b/src/RuleSet/Php82.php index c8eac2f4..9f80d34d 100644 --- a/src/RuleSet/Php82.php +++ b/src/RuleSet/Php82.php @@ -34,6 +34,7 @@ public static function create(): RuleSet return RuleSet::create( Fixers::fromFixers( new Fixer\PhpdocArrayStyleFixer(), + new Fixer\PhpdocTypeListFixer(), new PhpCsFixer\Whitespace\LineBreakAfterStatementsFixer(), ), Name::fromString(\sprintf( @@ -45,6 +46,7 @@ public static function create(): RuleSet Rules::fromArray([ 'ErickSkrauch/line_break_after_statements' => true, 'PhpCsFixerCustomFixers/phpdoc_array_style' => true, + 'PhpCsFixerCustomFixers/phpdoc_type_list' => true, 'align_multiline_comment' => [ 'comment_type' => 'all_multiline', ], diff --git a/src/RuleSet/Php83.php b/src/RuleSet/Php83.php index f2fe3a71..bc61fe27 100644 --- a/src/RuleSet/Php83.php +++ b/src/RuleSet/Php83.php @@ -34,6 +34,7 @@ public static function create(): RuleSet return RuleSet::create( Fixers::fromFixers( new Fixer\PhpdocArrayStyleFixer(), + new Fixer\PhpdocTypeListFixer(), new PhpCsFixer\Whitespace\LineBreakAfterStatementsFixer(), ), Name::fromString(\sprintf( @@ -45,6 +46,7 @@ public static function create(): RuleSet Rules::fromArray([ 'ErickSkrauch/line_break_after_statements' => true, 'PhpCsFixerCustomFixers/phpdoc_array_style' => true, + 'PhpCsFixerCustomFixers/phpdoc_type_list' => true, 'align_multiline_comment' => [ 'comment_type' => 'all_multiline', ], diff --git a/test/Unit/RuleSet/Php53Test.php b/test/Unit/RuleSet/Php53Test.php index 4d4bd83f..58ff6e07 100644 --- a/test/Unit/RuleSet/Php53Test.php +++ b/test/Unit/RuleSet/Php53Test.php @@ -45,6 +45,7 @@ protected function expectedCustomFixers(): Fixers { return Fixers::fromFixers( new Fixer\PhpdocArrayStyleFixer(), + new Fixer\PhpdocTypeListFixer(), new PhpCsFixer\Whitespace\LineBreakAfterStatementsFixer(), ); } @@ -68,6 +69,7 @@ protected function expectedRules(): Rules return Rules::fromArray([ 'ErickSkrauch/line_break_after_statements' => true, 'PhpCsFixerCustomFixers/phpdoc_array_style' => true, + 'PhpCsFixerCustomFixers/phpdoc_type_list' => true, 'align_multiline_comment' => [ 'comment_type' => 'all_multiline', ], diff --git a/test/Unit/RuleSet/Php54Test.php b/test/Unit/RuleSet/Php54Test.php index be71d156..e446ae78 100644 --- a/test/Unit/RuleSet/Php54Test.php +++ b/test/Unit/RuleSet/Php54Test.php @@ -45,6 +45,7 @@ protected function expectedCustomFixers(): Fixers { return Fixers::fromFixers( new Fixer\PhpdocArrayStyleFixer(), + new Fixer\PhpdocTypeListFixer(), new PhpCsFixer\Whitespace\LineBreakAfterStatementsFixer(), ); } @@ -68,6 +69,7 @@ protected function expectedRules(): Rules return Rules::fromArray([ 'ErickSkrauch/line_break_after_statements' => true, 'PhpCsFixerCustomFixers/phpdoc_array_style' => true, + 'PhpCsFixerCustomFixers/phpdoc_type_list' => true, 'align_multiline_comment' => [ 'comment_type' => 'all_multiline', ], diff --git a/test/Unit/RuleSet/Php55Test.php b/test/Unit/RuleSet/Php55Test.php index 8b6b7d81..c4808a7a 100644 --- a/test/Unit/RuleSet/Php55Test.php +++ b/test/Unit/RuleSet/Php55Test.php @@ -40,6 +40,7 @@ protected function expectedCustomFixers(): Fixers { return Fixers::fromFixers( new Fixer\PhpdocArrayStyleFixer(), + new Fixer\PhpdocTypeListFixer(), new PhpCsFixer\Whitespace\LineBreakAfterStatementsFixer(), ); } @@ -68,6 +69,7 @@ protected function expectedRules(): Rules return Rules::fromArray([ 'ErickSkrauch/line_break_after_statements' => true, 'PhpCsFixerCustomFixers/phpdoc_array_style' => true, + 'PhpCsFixerCustomFixers/phpdoc_type_list' => true, 'align_multiline_comment' => [ 'comment_type' => 'all_multiline', ], diff --git a/test/Unit/RuleSet/Php56Test.php b/test/Unit/RuleSet/Php56Test.php index 1efe176a..365078b7 100644 --- a/test/Unit/RuleSet/Php56Test.php +++ b/test/Unit/RuleSet/Php56Test.php @@ -45,6 +45,7 @@ protected function expectedCustomFixers(): Fixers { return Fixers::fromFixers( new Fixer\PhpdocArrayStyleFixer(), + new Fixer\PhpdocTypeListFixer(), new PhpCsFixer\Whitespace\LineBreakAfterStatementsFixer(), ); } @@ -68,6 +69,7 @@ protected function expectedRules(): Rules return Rules::fromArray([ 'ErickSkrauch/line_break_after_statements' => true, 'PhpCsFixerCustomFixers/phpdoc_array_style' => true, + 'PhpCsFixerCustomFixers/phpdoc_type_list' => true, 'align_multiline_comment' => [ 'comment_type' => 'all_multiline', ], diff --git a/test/Unit/RuleSet/Php70Test.php b/test/Unit/RuleSet/Php70Test.php index 1fedc7a7..41b4e090 100644 --- a/test/Unit/RuleSet/Php70Test.php +++ b/test/Unit/RuleSet/Php70Test.php @@ -45,6 +45,7 @@ protected function expectedCustomFixers(): Fixers { return Fixers::fromFixers( new Fixer\PhpdocArrayStyleFixer(), + new Fixer\PhpdocTypeListFixer(), new PhpCsFixer\Whitespace\LineBreakAfterStatementsFixer(), ); } @@ -68,6 +69,7 @@ protected function expectedRules(): Rules return Rules::fromArray([ 'ErickSkrauch/line_break_after_statements' => true, 'PhpCsFixerCustomFixers/phpdoc_array_style' => true, + 'PhpCsFixerCustomFixers/phpdoc_type_list' => true, 'align_multiline_comment' => [ 'comment_type' => 'all_multiline', ], diff --git a/test/Unit/RuleSet/Php71Test.php b/test/Unit/RuleSet/Php71Test.php index a1eb17af..8c2c7283 100644 --- a/test/Unit/RuleSet/Php71Test.php +++ b/test/Unit/RuleSet/Php71Test.php @@ -45,6 +45,7 @@ protected function expectedCustomFixers(): Fixers { return Fixers::fromFixers( new Fixer\PhpdocArrayStyleFixer(), + new Fixer\PhpdocTypeListFixer(), new PhpCsFixer\Whitespace\LineBreakAfterStatementsFixer(), ); } @@ -68,6 +69,7 @@ protected function expectedRules(): Rules return Rules::fromArray([ 'ErickSkrauch/line_break_after_statements' => true, 'PhpCsFixerCustomFixers/phpdoc_array_style' => true, + 'PhpCsFixerCustomFixers/phpdoc_type_list' => true, 'align_multiline_comment' => [ 'comment_type' => 'all_multiline', ], diff --git a/test/Unit/RuleSet/Php72Test.php b/test/Unit/RuleSet/Php72Test.php index 2c8b3128..02ddacb1 100644 --- a/test/Unit/RuleSet/Php72Test.php +++ b/test/Unit/RuleSet/Php72Test.php @@ -45,6 +45,7 @@ protected function expectedCustomFixers(): Fixers { return Fixers::fromFixers( new Fixer\PhpdocArrayStyleFixer(), + new Fixer\PhpdocTypeListFixer(), new PhpCsFixer\Whitespace\LineBreakAfterStatementsFixer(), ); } @@ -68,6 +69,7 @@ protected function expectedRules(): Rules return Rules::fromArray([ 'ErickSkrauch/line_break_after_statements' => true, 'PhpCsFixerCustomFixers/phpdoc_array_style' => true, + 'PhpCsFixerCustomFixers/phpdoc_type_list' => true, 'align_multiline_comment' => [ 'comment_type' => 'all_multiline', ], diff --git a/test/Unit/RuleSet/Php73Test.php b/test/Unit/RuleSet/Php73Test.php index 45a5c5c2..155c7878 100644 --- a/test/Unit/RuleSet/Php73Test.php +++ b/test/Unit/RuleSet/Php73Test.php @@ -45,6 +45,7 @@ protected function expectedCustomFixers(): Fixers { return Fixers::fromFixers( new Fixer\PhpdocArrayStyleFixer(), + new Fixer\PhpdocTypeListFixer(), new PhpCsFixer\Whitespace\LineBreakAfterStatementsFixer(), ); } @@ -68,6 +69,7 @@ protected function expectedRules(): Rules return Rules::fromArray([ 'ErickSkrauch/line_break_after_statements' => true, 'PhpCsFixerCustomFixers/phpdoc_array_style' => true, + 'PhpCsFixerCustomFixers/phpdoc_type_list' => true, 'align_multiline_comment' => [ 'comment_type' => 'all_multiline', ], diff --git a/test/Unit/RuleSet/Php74Test.php b/test/Unit/RuleSet/Php74Test.php index 855975b6..282dacd3 100644 --- a/test/Unit/RuleSet/Php74Test.php +++ b/test/Unit/RuleSet/Php74Test.php @@ -45,6 +45,7 @@ protected function expectedCustomFixers(): Fixers { return Fixers::fromFixers( new Fixer\PhpdocArrayStyleFixer(), + new Fixer\PhpdocTypeListFixer(), new PhpCsFixer\Whitespace\LineBreakAfterStatementsFixer(), ); } @@ -68,6 +69,7 @@ protected function expectedRules(): Rules return Rules::fromArray([ 'ErickSkrauch/line_break_after_statements' => true, 'PhpCsFixerCustomFixers/phpdoc_array_style' => true, + 'PhpCsFixerCustomFixers/phpdoc_type_list' => true, 'align_multiline_comment' => [ 'comment_type' => 'all_multiline', ], diff --git a/test/Unit/RuleSet/Php80Test.php b/test/Unit/RuleSet/Php80Test.php index e3338fef..e8d6ab5c 100644 --- a/test/Unit/RuleSet/Php80Test.php +++ b/test/Unit/RuleSet/Php80Test.php @@ -45,6 +45,7 @@ protected function expectedCustomFixers(): Fixers { return Fixers::fromFixers( new Fixer\PhpdocArrayStyleFixer(), + new Fixer\PhpdocTypeListFixer(), new PhpCsFixer\Whitespace\LineBreakAfterStatementsFixer(), ); } @@ -68,6 +69,7 @@ protected function expectedRules(): Rules return Rules::fromArray([ 'ErickSkrauch/line_break_after_statements' => true, 'PhpCsFixerCustomFixers/phpdoc_array_style' => true, + 'PhpCsFixerCustomFixers/phpdoc_type_list' => true, 'align_multiline_comment' => [ 'comment_type' => 'all_multiline', ], diff --git a/test/Unit/RuleSet/Php81Test.php b/test/Unit/RuleSet/Php81Test.php index a8b03223..d8f66486 100644 --- a/test/Unit/RuleSet/Php81Test.php +++ b/test/Unit/RuleSet/Php81Test.php @@ -45,6 +45,7 @@ protected function expectedCustomFixers(): Fixers { return Fixers::fromFixers( new Fixer\PhpdocArrayStyleFixer(), + new Fixer\PhpdocTypeListFixer(), new PhpCsFixer\Whitespace\LineBreakAfterStatementsFixer(), ); } @@ -68,6 +69,7 @@ protected function expectedRules(): Rules return Rules::fromArray([ 'ErickSkrauch/line_break_after_statements' => true, 'PhpCsFixerCustomFixers/phpdoc_array_style' => true, + 'PhpCsFixerCustomFixers/phpdoc_type_list' => true, 'align_multiline_comment' => [ 'comment_type' => 'all_multiline', ], diff --git a/test/Unit/RuleSet/Php82Test.php b/test/Unit/RuleSet/Php82Test.php index 1e54a8f0..8ef7386d 100644 --- a/test/Unit/RuleSet/Php82Test.php +++ b/test/Unit/RuleSet/Php82Test.php @@ -45,6 +45,7 @@ protected function expectedCustomFixers(): Fixers { return Fixers::fromFixers( new Fixer\PhpdocArrayStyleFixer(), + new Fixer\PhpdocTypeListFixer(), new PhpCsFixer\Whitespace\LineBreakAfterStatementsFixer(), ); } @@ -68,6 +69,7 @@ protected function expectedRules(): Rules return Rules::fromArray([ 'ErickSkrauch/line_break_after_statements' => true, 'PhpCsFixerCustomFixers/phpdoc_array_style' => true, + 'PhpCsFixerCustomFixers/phpdoc_type_list' => true, 'align_multiline_comment' => [ 'comment_type' => 'all_multiline', ], diff --git a/test/Unit/RuleSet/Php83Test.php b/test/Unit/RuleSet/Php83Test.php index ce7dd73e..252b82aa 100644 --- a/test/Unit/RuleSet/Php83Test.php +++ b/test/Unit/RuleSet/Php83Test.php @@ -45,6 +45,7 @@ protected function expectedCustomFixers(): Fixers { return Fixers::fromFixers( new Fixer\PhpdocArrayStyleFixer(), + new Fixer\PhpdocTypeListFixer(), new PhpCsFixer\Whitespace\LineBreakAfterStatementsFixer(), ); } @@ -68,6 +69,7 @@ protected function expectedRules(): Rules return Rules::fromArray([ 'ErickSkrauch/line_break_after_statements' => true, 'PhpCsFixerCustomFixers/phpdoc_array_style' => true, + 'PhpCsFixerCustomFixers/phpdoc_type_list' => true, 'align_multiline_comment' => [ 'comment_type' => 'all_multiline', ], From e7b97813ad87a0f8e4d465eeb82239153a1c246c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=B6ller?= Date: Wed, 3 Jan 2024 23:01:04 +0100 Subject: [PATCH 2/3] Fix: Run 'make coding-standards' --- test/Unit/RuleSet/AbstractRuleSetTestCase.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/Unit/RuleSet/AbstractRuleSetTestCase.php b/test/Unit/RuleSet/AbstractRuleSetTestCase.php index 581b5812..4636bf28 100644 --- a/test/Unit/RuleSet/AbstractRuleSetTestCase.php +++ b/test/Unit/RuleSet/AbstractRuleSetTestCase.php @@ -205,7 +205,7 @@ final protected static function fixersThatAreRegistered(): array $fixersThatAreBuiltIn = $fixerFactory->getFixers(); $fixersThatShouldBeRegistered = static::createRuleSet()->customFixers()->toArray(); - /** @var array $fixers */ + /** @var list $fixers */ $fixers = \array_merge( $fixersThatAreBuiltIn, $fixersThatShouldBeRegistered, From 616eb376e8928734385e804ac99bcc4f4bfcf3e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=B6ller?= Date: Wed, 3 Jan 2024 23:01:32 +0100 Subject: [PATCH 3/3] Fix: Remove useless DocBlock --- test/Unit/RuleSet/AbstractRuleSetTestCase.php | 1 - 1 file changed, 1 deletion(-) diff --git a/test/Unit/RuleSet/AbstractRuleSetTestCase.php b/test/Unit/RuleSet/AbstractRuleSetTestCase.php index 4636bf28..389b29ce 100644 --- a/test/Unit/RuleSet/AbstractRuleSetTestCase.php +++ b/test/Unit/RuleSet/AbstractRuleSetTestCase.php @@ -205,7 +205,6 @@ final protected static function fixersThatAreRegistered(): array $fixersThatAreBuiltIn = $fixerFactory->getFixers(); $fixersThatShouldBeRegistered = static::createRuleSet()->customFixers()->toArray(); - /** @var list $fixers */ $fixers = \array_merge( $fixersThatAreBuiltIn, $fixersThatShouldBeRegistered,