diff --git a/CHANGELOG.md b/CHANGELOG.md index e43696dc..145c4d14 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ For a full diff see [`6.18.0...main`][6.18.0...main]. - Enabled the `PhpCsFixerCustomFixers/no_duplicated_array_key` fixer ([#976]), by [@localheinz] - Enabled the `PhpCsFixerCustomFixers/no_duplicated_imports` fixer ([#977]), by [@localheinz] - Enabled the `PhpCsFixerCustomFixers/no_import_from_global_namespace` fixer ([#978]), by [@localheinz] +- Enabled the `PhpCsFixerCustomFixers/phpdoc_types_comma_spaces` fixer ([#979]), by [@localheinz] ## [`6.18.0`][6.18.0] @@ -1492,6 +1493,7 @@ For a full diff see [`d899e77...1.0.0`][d899e77...1.0.0]. [#976]: https://github.com/ergebnis/php-cs-fixer-config/pull/976 [#977]: https://github.com/ergebnis/php-cs-fixer-config/pull/977 [#978]: https://github.com/ergebnis/php-cs-fixer-config/pull/978 +[#979]: https://github.com/ergebnis/php-cs-fixer-config/pull/979 [@dependabot]: https://github.com/apps/dependabot [@linuxjuggler]: https://github.com/linuxjuggler diff --git a/src/RuleSet/Php53.php b/src/RuleSet/Php53.php index e56067de..df514f0e 100644 --- a/src/RuleSet/Php53.php +++ b/src/RuleSet/Php53.php @@ -39,6 +39,7 @@ public static function create(): RuleSet new Fixer\NoImportFromGlobalNamespaceFixer(), new Fixer\PhpdocArrayStyleFixer(), new Fixer\PhpdocTypeListFixer(), + new Fixer\PhpdocTypesCommaSpacesFixer(), new PhpCsFixer\Whitespace\LineBreakAfterStatementsFixer(), ), Name::fromString(\sprintf( @@ -57,6 +58,7 @@ public static function create(): RuleSet 'PhpCsFixerCustomFixers/no_import_from_global_namespace' => true, 'PhpCsFixerCustomFixers/phpdoc_array_style' => true, 'PhpCsFixerCustomFixers/phpdoc_type_list' => true, + 'PhpCsFixerCustomFixers/phpdoc_types_comma_spaces' => true, 'align_multiline_comment' => [ 'comment_type' => 'all_multiline', ], diff --git a/src/RuleSet/Php54.php b/src/RuleSet/Php54.php index 42886803..bb25e3fb 100644 --- a/src/RuleSet/Php54.php +++ b/src/RuleSet/Php54.php @@ -39,6 +39,7 @@ public static function create(): RuleSet new Fixer\NoImportFromGlobalNamespaceFixer(), new Fixer\PhpdocArrayStyleFixer(), new Fixer\PhpdocTypeListFixer(), + new Fixer\PhpdocTypesCommaSpacesFixer(), new PhpCsFixer\Whitespace\LineBreakAfterStatementsFixer(), ), Name::fromString(\sprintf( @@ -57,6 +58,7 @@ public static function create(): RuleSet 'PhpCsFixerCustomFixers/no_import_from_global_namespace' => true, 'PhpCsFixerCustomFixers/phpdoc_array_style' => true, 'PhpCsFixerCustomFixers/phpdoc_type_list' => true, + 'PhpCsFixerCustomFixers/phpdoc_types_comma_spaces' => true, 'align_multiline_comment' => [ 'comment_type' => 'all_multiline', ], diff --git a/src/RuleSet/Php55.php b/src/RuleSet/Php55.php index 5f74ebf0..f85b155c 100644 --- a/src/RuleSet/Php55.php +++ b/src/RuleSet/Php55.php @@ -39,6 +39,7 @@ public static function create(): RuleSet new Fixer\NoImportFromGlobalNamespaceFixer(), new Fixer\PhpdocArrayStyleFixer(), new Fixer\PhpdocTypeListFixer(), + new Fixer\PhpdocTypesCommaSpacesFixer(), new PhpCsFixer\Whitespace\LineBreakAfterStatementsFixer(), ), Name::fromString(\sprintf( @@ -57,6 +58,7 @@ public static function create(): RuleSet 'PhpCsFixerCustomFixers/no_import_from_global_namespace' => true, 'PhpCsFixerCustomFixers/phpdoc_array_style' => true, 'PhpCsFixerCustomFixers/phpdoc_type_list' => true, + 'PhpCsFixerCustomFixers/phpdoc_types_comma_spaces' => true, 'align_multiline_comment' => [ 'comment_type' => 'all_multiline', ], diff --git a/src/RuleSet/Php56.php b/src/RuleSet/Php56.php index afb70061..53749e5b 100644 --- a/src/RuleSet/Php56.php +++ b/src/RuleSet/Php56.php @@ -39,6 +39,7 @@ public static function create(): RuleSet new Fixer\NoImportFromGlobalNamespaceFixer(), new Fixer\PhpdocArrayStyleFixer(), new Fixer\PhpdocTypeListFixer(), + new Fixer\PhpdocTypesCommaSpacesFixer(), new PhpCsFixer\Whitespace\LineBreakAfterStatementsFixer(), ), Name::fromString(\sprintf( @@ -57,6 +58,7 @@ public static function create(): RuleSet 'PhpCsFixerCustomFixers/no_import_from_global_namespace' => true, 'PhpCsFixerCustomFixers/phpdoc_array_style' => true, 'PhpCsFixerCustomFixers/phpdoc_type_list' => true, + 'PhpCsFixerCustomFixers/phpdoc_types_comma_spaces' => true, 'align_multiline_comment' => [ 'comment_type' => 'all_multiline', ], diff --git a/src/RuleSet/Php70.php b/src/RuleSet/Php70.php index 0e90e764..2ffe8f4d 100644 --- a/src/RuleSet/Php70.php +++ b/src/RuleSet/Php70.php @@ -39,6 +39,7 @@ public static function create(): RuleSet new Fixer\NoImportFromGlobalNamespaceFixer(), new Fixer\PhpdocArrayStyleFixer(), new Fixer\PhpdocTypeListFixer(), + new Fixer\PhpdocTypesCommaSpacesFixer(), new PhpCsFixer\Whitespace\LineBreakAfterStatementsFixer(), ), Name::fromString(\sprintf( @@ -57,6 +58,7 @@ public static function create(): RuleSet 'PhpCsFixerCustomFixers/no_import_from_global_namespace' => true, 'PhpCsFixerCustomFixers/phpdoc_array_style' => true, 'PhpCsFixerCustomFixers/phpdoc_type_list' => true, + 'PhpCsFixerCustomFixers/phpdoc_types_comma_spaces' => true, 'align_multiline_comment' => [ 'comment_type' => 'all_multiline', ], diff --git a/src/RuleSet/Php71.php b/src/RuleSet/Php71.php index bd71f636..c861e52d 100644 --- a/src/RuleSet/Php71.php +++ b/src/RuleSet/Php71.php @@ -39,6 +39,7 @@ public static function create(): RuleSet new Fixer\NoImportFromGlobalNamespaceFixer(), new Fixer\PhpdocArrayStyleFixer(), new Fixer\PhpdocTypeListFixer(), + new Fixer\PhpdocTypesCommaSpacesFixer(), new PhpCsFixer\Whitespace\LineBreakAfterStatementsFixer(), ), Name::fromString(\sprintf( @@ -57,6 +58,7 @@ public static function create(): RuleSet 'PhpCsFixerCustomFixers/no_import_from_global_namespace' => true, 'PhpCsFixerCustomFixers/phpdoc_array_style' => true, 'PhpCsFixerCustomFixers/phpdoc_type_list' => true, + 'PhpCsFixerCustomFixers/phpdoc_types_comma_spaces' => true, 'align_multiline_comment' => [ 'comment_type' => 'all_multiline', ], diff --git a/src/RuleSet/Php72.php b/src/RuleSet/Php72.php index 335d6ac9..06615945 100644 --- a/src/RuleSet/Php72.php +++ b/src/RuleSet/Php72.php @@ -39,6 +39,7 @@ public static function create(): RuleSet new Fixer\NoImportFromGlobalNamespaceFixer(), new Fixer\PhpdocArrayStyleFixer(), new Fixer\PhpdocTypeListFixer(), + new Fixer\PhpdocTypesCommaSpacesFixer(), new PhpCsFixer\Whitespace\LineBreakAfterStatementsFixer(), ), Name::fromString(\sprintf( @@ -57,6 +58,7 @@ public static function create(): RuleSet 'PhpCsFixerCustomFixers/no_import_from_global_namespace' => true, 'PhpCsFixerCustomFixers/phpdoc_array_style' => true, 'PhpCsFixerCustomFixers/phpdoc_type_list' => true, + 'PhpCsFixerCustomFixers/phpdoc_types_comma_spaces' => true, 'align_multiline_comment' => [ 'comment_type' => 'all_multiline', ], diff --git a/src/RuleSet/Php73.php b/src/RuleSet/Php73.php index b2ab5a0a..3d7a188f 100644 --- a/src/RuleSet/Php73.php +++ b/src/RuleSet/Php73.php @@ -39,6 +39,7 @@ public static function create(): RuleSet new Fixer\NoImportFromGlobalNamespaceFixer(), new Fixer\PhpdocArrayStyleFixer(), new Fixer\PhpdocTypeListFixer(), + new Fixer\PhpdocTypesCommaSpacesFixer(), new PhpCsFixer\Whitespace\LineBreakAfterStatementsFixer(), ), Name::fromString(\sprintf( @@ -57,6 +58,7 @@ public static function create(): RuleSet 'PhpCsFixerCustomFixers/no_import_from_global_namespace' => true, 'PhpCsFixerCustomFixers/phpdoc_array_style' => true, 'PhpCsFixerCustomFixers/phpdoc_type_list' => true, + 'PhpCsFixerCustomFixers/phpdoc_types_comma_spaces' => true, 'align_multiline_comment' => [ 'comment_type' => 'all_multiline', ], diff --git a/src/RuleSet/Php74.php b/src/RuleSet/Php74.php index fc8388aa..f2e6b6e3 100644 --- a/src/RuleSet/Php74.php +++ b/src/RuleSet/Php74.php @@ -39,6 +39,7 @@ public static function create(): RuleSet new Fixer\NoImportFromGlobalNamespaceFixer(), new Fixer\PhpdocArrayStyleFixer(), new Fixer\PhpdocTypeListFixer(), + new Fixer\PhpdocTypesCommaSpacesFixer(), new PhpCsFixer\Whitespace\LineBreakAfterStatementsFixer(), ), Name::fromString(\sprintf( @@ -57,6 +58,7 @@ public static function create(): RuleSet 'PhpCsFixerCustomFixers/no_import_from_global_namespace' => true, 'PhpCsFixerCustomFixers/phpdoc_array_style' => true, 'PhpCsFixerCustomFixers/phpdoc_type_list' => true, + 'PhpCsFixerCustomFixers/phpdoc_types_comma_spaces' => true, 'align_multiline_comment' => [ 'comment_type' => 'all_multiline', ], diff --git a/src/RuleSet/Php80.php b/src/RuleSet/Php80.php index f2472d80..0bc28e61 100644 --- a/src/RuleSet/Php80.php +++ b/src/RuleSet/Php80.php @@ -40,6 +40,7 @@ public static function create(): RuleSet new Fixer\NoImportFromGlobalNamespaceFixer(), new Fixer\PhpdocArrayStyleFixer(), new Fixer\PhpdocTypeListFixer(), + new Fixer\PhpdocTypesCommaSpacesFixer(), new PhpCsFixer\Whitespace\LineBreakAfterStatementsFixer(), ), Name::fromString(\sprintf( @@ -62,6 +63,7 @@ public static function create(): RuleSet 'PhpCsFixerCustomFixers/no_import_from_global_namespace' => true, 'PhpCsFixerCustomFixers/phpdoc_array_style' => true, 'PhpCsFixerCustomFixers/phpdoc_type_list' => true, + 'PhpCsFixerCustomFixers/phpdoc_types_comma_spaces' => true, 'align_multiline_comment' => [ 'comment_type' => 'all_multiline', ], diff --git a/src/RuleSet/Php81.php b/src/RuleSet/Php81.php index c7b403f3..0c5f5650 100644 --- a/src/RuleSet/Php81.php +++ b/src/RuleSet/Php81.php @@ -40,6 +40,7 @@ public static function create(): RuleSet new Fixer\NoImportFromGlobalNamespaceFixer(), new Fixer\PhpdocArrayStyleFixer(), new Fixer\PhpdocTypeListFixer(), + new Fixer\PhpdocTypesCommaSpacesFixer(), new PhpCsFixer\Whitespace\LineBreakAfterStatementsFixer(), ), Name::fromString(\sprintf( @@ -62,6 +63,7 @@ public static function create(): RuleSet 'PhpCsFixerCustomFixers/no_import_from_global_namespace' => true, 'PhpCsFixerCustomFixers/phpdoc_array_style' => true, 'PhpCsFixerCustomFixers/phpdoc_type_list' => true, + 'PhpCsFixerCustomFixers/phpdoc_types_comma_spaces' => true, 'align_multiline_comment' => [ 'comment_type' => 'all_multiline', ], diff --git a/src/RuleSet/Php82.php b/src/RuleSet/Php82.php index 680a59b4..d6d0f7a9 100644 --- a/src/RuleSet/Php82.php +++ b/src/RuleSet/Php82.php @@ -40,6 +40,7 @@ public static function create(): RuleSet new Fixer\NoImportFromGlobalNamespaceFixer(), new Fixer\PhpdocArrayStyleFixer(), new Fixer\PhpdocTypeListFixer(), + new Fixer\PhpdocTypesCommaSpacesFixer(), new PhpCsFixer\Whitespace\LineBreakAfterStatementsFixer(), ), Name::fromString(\sprintf( @@ -62,6 +63,7 @@ public static function create(): RuleSet 'PhpCsFixerCustomFixers/no_import_from_global_namespace' => true, 'PhpCsFixerCustomFixers/phpdoc_array_style' => true, 'PhpCsFixerCustomFixers/phpdoc_type_list' => true, + 'PhpCsFixerCustomFixers/phpdoc_types_comma_spaces' => true, 'align_multiline_comment' => [ 'comment_type' => 'all_multiline', ], diff --git a/src/RuleSet/Php83.php b/src/RuleSet/Php83.php index cd25e173..05a674d9 100644 --- a/src/RuleSet/Php83.php +++ b/src/RuleSet/Php83.php @@ -40,6 +40,7 @@ public static function create(): RuleSet new Fixer\NoImportFromGlobalNamespaceFixer(), new Fixer\PhpdocArrayStyleFixer(), new Fixer\PhpdocTypeListFixer(), + new Fixer\PhpdocTypesCommaSpacesFixer(), new PhpCsFixer\Whitespace\LineBreakAfterStatementsFixer(), ), Name::fromString(\sprintf( @@ -62,6 +63,7 @@ public static function create(): RuleSet 'PhpCsFixerCustomFixers/no_import_from_global_namespace' => true, 'PhpCsFixerCustomFixers/phpdoc_array_style' => true, 'PhpCsFixerCustomFixers/phpdoc_type_list' => true, + 'PhpCsFixerCustomFixers/phpdoc_types_comma_spaces' => true, 'align_multiline_comment' => [ 'comment_type' => 'all_multiline', ], diff --git a/test/Unit/RuleSet/Php53Test.php b/test/Unit/RuleSet/Php53Test.php index 175b6d45..ec93dc2b 100644 --- a/test/Unit/RuleSet/Php53Test.php +++ b/test/Unit/RuleSet/Php53Test.php @@ -50,6 +50,7 @@ protected function expectedCustomFixers(): Fixers new Fixer\NoImportFromGlobalNamespaceFixer(), new Fixer\PhpdocArrayStyleFixer(), new Fixer\PhpdocTypeListFixer(), + new Fixer\PhpdocTypesCommaSpacesFixer(), new PhpCsFixer\Whitespace\LineBreakAfterStatementsFixer(), ); } @@ -80,6 +81,7 @@ protected function expectedRules(): Rules 'PhpCsFixerCustomFixers/no_import_from_global_namespace' => true, 'PhpCsFixerCustomFixers/phpdoc_array_style' => true, 'PhpCsFixerCustomFixers/phpdoc_type_list' => true, + 'PhpCsFixerCustomFixers/phpdoc_types_comma_spaces' => true, 'align_multiline_comment' => [ 'comment_type' => 'all_multiline', ], diff --git a/test/Unit/RuleSet/Php54Test.php b/test/Unit/RuleSet/Php54Test.php index eed30eec..391f6854 100644 --- a/test/Unit/RuleSet/Php54Test.php +++ b/test/Unit/RuleSet/Php54Test.php @@ -50,6 +50,7 @@ protected function expectedCustomFixers(): Fixers new Fixer\NoImportFromGlobalNamespaceFixer(), new Fixer\PhpdocArrayStyleFixer(), new Fixer\PhpdocTypeListFixer(), + new Fixer\PhpdocTypesCommaSpacesFixer(), new PhpCsFixer\Whitespace\LineBreakAfterStatementsFixer(), ); } @@ -80,6 +81,7 @@ protected function expectedRules(): Rules 'PhpCsFixerCustomFixers/no_import_from_global_namespace' => true, 'PhpCsFixerCustomFixers/phpdoc_array_style' => true, 'PhpCsFixerCustomFixers/phpdoc_type_list' => true, + 'PhpCsFixerCustomFixers/phpdoc_types_comma_spaces' => true, 'align_multiline_comment' => [ 'comment_type' => 'all_multiline', ], diff --git a/test/Unit/RuleSet/Php55Test.php b/test/Unit/RuleSet/Php55Test.php index 1790c479..dccdd0b3 100644 --- a/test/Unit/RuleSet/Php55Test.php +++ b/test/Unit/RuleSet/Php55Test.php @@ -45,6 +45,7 @@ protected function expectedCustomFixers(): Fixers new Fixer\NoImportFromGlobalNamespaceFixer(), new Fixer\PhpdocArrayStyleFixer(), new Fixer\PhpdocTypeListFixer(), + new Fixer\PhpdocTypesCommaSpacesFixer(), new PhpCsFixer\Whitespace\LineBreakAfterStatementsFixer(), ); } @@ -80,6 +81,7 @@ protected function expectedRules(): Rules 'PhpCsFixerCustomFixers/no_import_from_global_namespace' => true, 'PhpCsFixerCustomFixers/phpdoc_array_style' => true, 'PhpCsFixerCustomFixers/phpdoc_type_list' => true, + 'PhpCsFixerCustomFixers/phpdoc_types_comma_spaces' => true, 'align_multiline_comment' => [ 'comment_type' => 'all_multiline', ], diff --git a/test/Unit/RuleSet/Php56Test.php b/test/Unit/RuleSet/Php56Test.php index e6376fb4..6c16ab0f 100644 --- a/test/Unit/RuleSet/Php56Test.php +++ b/test/Unit/RuleSet/Php56Test.php @@ -50,6 +50,7 @@ protected function expectedCustomFixers(): Fixers new Fixer\NoImportFromGlobalNamespaceFixer(), new Fixer\PhpdocArrayStyleFixer(), new Fixer\PhpdocTypeListFixer(), + new Fixer\PhpdocTypesCommaSpacesFixer(), new PhpCsFixer\Whitespace\LineBreakAfterStatementsFixer(), ); } @@ -80,6 +81,7 @@ protected function expectedRules(): Rules 'PhpCsFixerCustomFixers/no_import_from_global_namespace' => true, 'PhpCsFixerCustomFixers/phpdoc_array_style' => true, 'PhpCsFixerCustomFixers/phpdoc_type_list' => true, + 'PhpCsFixerCustomFixers/phpdoc_types_comma_spaces' => true, 'align_multiline_comment' => [ 'comment_type' => 'all_multiline', ], diff --git a/test/Unit/RuleSet/Php70Test.php b/test/Unit/RuleSet/Php70Test.php index eb28c973..1bc51cef 100644 --- a/test/Unit/RuleSet/Php70Test.php +++ b/test/Unit/RuleSet/Php70Test.php @@ -50,6 +50,7 @@ protected function expectedCustomFixers(): Fixers new Fixer\NoImportFromGlobalNamespaceFixer(), new Fixer\PhpdocArrayStyleFixer(), new Fixer\PhpdocTypeListFixer(), + new Fixer\PhpdocTypesCommaSpacesFixer(), new PhpCsFixer\Whitespace\LineBreakAfterStatementsFixer(), ); } @@ -80,6 +81,7 @@ protected function expectedRules(): Rules 'PhpCsFixerCustomFixers/no_import_from_global_namespace' => true, 'PhpCsFixerCustomFixers/phpdoc_array_style' => true, 'PhpCsFixerCustomFixers/phpdoc_type_list' => true, + 'PhpCsFixerCustomFixers/phpdoc_types_comma_spaces' => true, 'align_multiline_comment' => [ 'comment_type' => 'all_multiline', ], diff --git a/test/Unit/RuleSet/Php71Test.php b/test/Unit/RuleSet/Php71Test.php index 96c85be6..0add80b1 100644 --- a/test/Unit/RuleSet/Php71Test.php +++ b/test/Unit/RuleSet/Php71Test.php @@ -50,6 +50,7 @@ protected function expectedCustomFixers(): Fixers new Fixer\NoImportFromGlobalNamespaceFixer(), new Fixer\PhpdocArrayStyleFixer(), new Fixer\PhpdocTypeListFixer(), + new Fixer\PhpdocTypesCommaSpacesFixer(), new PhpCsFixer\Whitespace\LineBreakAfterStatementsFixer(), ); } @@ -80,6 +81,7 @@ protected function expectedRules(): Rules 'PhpCsFixerCustomFixers/no_import_from_global_namespace' => true, 'PhpCsFixerCustomFixers/phpdoc_array_style' => true, 'PhpCsFixerCustomFixers/phpdoc_type_list' => true, + 'PhpCsFixerCustomFixers/phpdoc_types_comma_spaces' => true, 'align_multiline_comment' => [ 'comment_type' => 'all_multiline', ], diff --git a/test/Unit/RuleSet/Php72Test.php b/test/Unit/RuleSet/Php72Test.php index a5e952b9..20c2f6b1 100644 --- a/test/Unit/RuleSet/Php72Test.php +++ b/test/Unit/RuleSet/Php72Test.php @@ -50,6 +50,7 @@ protected function expectedCustomFixers(): Fixers new Fixer\NoImportFromGlobalNamespaceFixer(), new Fixer\PhpdocArrayStyleFixer(), new Fixer\PhpdocTypeListFixer(), + new Fixer\PhpdocTypesCommaSpacesFixer(), new PhpCsFixer\Whitespace\LineBreakAfterStatementsFixer(), ); } @@ -80,6 +81,7 @@ protected function expectedRules(): Rules 'PhpCsFixerCustomFixers/no_import_from_global_namespace' => true, 'PhpCsFixerCustomFixers/phpdoc_array_style' => true, 'PhpCsFixerCustomFixers/phpdoc_type_list' => true, + 'PhpCsFixerCustomFixers/phpdoc_types_comma_spaces' => true, 'align_multiline_comment' => [ 'comment_type' => 'all_multiline', ], diff --git a/test/Unit/RuleSet/Php73Test.php b/test/Unit/RuleSet/Php73Test.php index 4f127d7a..a925dd67 100644 --- a/test/Unit/RuleSet/Php73Test.php +++ b/test/Unit/RuleSet/Php73Test.php @@ -50,6 +50,7 @@ protected function expectedCustomFixers(): Fixers new Fixer\NoImportFromGlobalNamespaceFixer(), new Fixer\PhpdocArrayStyleFixer(), new Fixer\PhpdocTypeListFixer(), + new Fixer\PhpdocTypesCommaSpacesFixer(), new PhpCsFixer\Whitespace\LineBreakAfterStatementsFixer(), ); } @@ -80,6 +81,7 @@ protected function expectedRules(): Rules 'PhpCsFixerCustomFixers/no_import_from_global_namespace' => true, 'PhpCsFixerCustomFixers/phpdoc_array_style' => true, 'PhpCsFixerCustomFixers/phpdoc_type_list' => true, + 'PhpCsFixerCustomFixers/phpdoc_types_comma_spaces' => true, 'align_multiline_comment' => [ 'comment_type' => 'all_multiline', ], diff --git a/test/Unit/RuleSet/Php74Test.php b/test/Unit/RuleSet/Php74Test.php index e0b4df99..a71ea0cf 100644 --- a/test/Unit/RuleSet/Php74Test.php +++ b/test/Unit/RuleSet/Php74Test.php @@ -50,6 +50,7 @@ protected function expectedCustomFixers(): Fixers new Fixer\NoImportFromGlobalNamespaceFixer(), new Fixer\PhpdocArrayStyleFixer(), new Fixer\PhpdocTypeListFixer(), + new Fixer\PhpdocTypesCommaSpacesFixer(), new PhpCsFixer\Whitespace\LineBreakAfterStatementsFixer(), ); } @@ -80,6 +81,7 @@ protected function expectedRules(): Rules 'PhpCsFixerCustomFixers/no_import_from_global_namespace' => true, 'PhpCsFixerCustomFixers/phpdoc_array_style' => true, 'PhpCsFixerCustomFixers/phpdoc_type_list' => true, + 'PhpCsFixerCustomFixers/phpdoc_types_comma_spaces' => true, 'align_multiline_comment' => [ 'comment_type' => 'all_multiline', ], diff --git a/test/Unit/RuleSet/Php80Test.php b/test/Unit/RuleSet/Php80Test.php index 111e6d69..cf3380ce 100644 --- a/test/Unit/RuleSet/Php80Test.php +++ b/test/Unit/RuleSet/Php80Test.php @@ -51,6 +51,7 @@ protected function expectedCustomFixers(): Fixers new Fixer\NoImportFromGlobalNamespaceFixer(), new Fixer\PhpdocArrayStyleFixer(), new Fixer\PhpdocTypeListFixer(), + new Fixer\PhpdocTypesCommaSpacesFixer(), new PhpCsFixer\Whitespace\LineBreakAfterStatementsFixer(), ); } @@ -85,6 +86,7 @@ protected function expectedRules(): Rules 'PhpCsFixerCustomFixers/no_import_from_global_namespace' => true, 'PhpCsFixerCustomFixers/phpdoc_array_style' => true, 'PhpCsFixerCustomFixers/phpdoc_type_list' => true, + 'PhpCsFixerCustomFixers/phpdoc_types_comma_spaces' => true, 'align_multiline_comment' => [ 'comment_type' => 'all_multiline', ], diff --git a/test/Unit/RuleSet/Php81Test.php b/test/Unit/RuleSet/Php81Test.php index 6ec4ad0f..0d7c6f0c 100644 --- a/test/Unit/RuleSet/Php81Test.php +++ b/test/Unit/RuleSet/Php81Test.php @@ -51,6 +51,7 @@ protected function expectedCustomFixers(): Fixers new Fixer\NoImportFromGlobalNamespaceFixer(), new Fixer\PhpdocArrayStyleFixer(), new Fixer\PhpdocTypeListFixer(), + new Fixer\PhpdocTypesCommaSpacesFixer(), new PhpCsFixer\Whitespace\LineBreakAfterStatementsFixer(), ); } @@ -85,6 +86,7 @@ protected function expectedRules(): Rules 'PhpCsFixerCustomFixers/no_import_from_global_namespace' => true, 'PhpCsFixerCustomFixers/phpdoc_array_style' => true, 'PhpCsFixerCustomFixers/phpdoc_type_list' => true, + 'PhpCsFixerCustomFixers/phpdoc_types_comma_spaces' => true, 'align_multiline_comment' => [ 'comment_type' => 'all_multiline', ], diff --git a/test/Unit/RuleSet/Php82Test.php b/test/Unit/RuleSet/Php82Test.php index dbef3602..eb4fe9da 100644 --- a/test/Unit/RuleSet/Php82Test.php +++ b/test/Unit/RuleSet/Php82Test.php @@ -51,6 +51,7 @@ protected function expectedCustomFixers(): Fixers new Fixer\NoImportFromGlobalNamespaceFixer(), new Fixer\PhpdocArrayStyleFixer(), new Fixer\PhpdocTypeListFixer(), + new Fixer\PhpdocTypesCommaSpacesFixer(), new PhpCsFixer\Whitespace\LineBreakAfterStatementsFixer(), ); } @@ -85,6 +86,7 @@ protected function expectedRules(): Rules 'PhpCsFixerCustomFixers/no_import_from_global_namespace' => true, 'PhpCsFixerCustomFixers/phpdoc_array_style' => true, 'PhpCsFixerCustomFixers/phpdoc_type_list' => true, + 'PhpCsFixerCustomFixers/phpdoc_types_comma_spaces' => true, 'align_multiline_comment' => [ 'comment_type' => 'all_multiline', ], diff --git a/test/Unit/RuleSet/Php83Test.php b/test/Unit/RuleSet/Php83Test.php index 26abc106..d4b970b2 100644 --- a/test/Unit/RuleSet/Php83Test.php +++ b/test/Unit/RuleSet/Php83Test.php @@ -51,6 +51,7 @@ protected function expectedCustomFixers(): Fixers new Fixer\NoImportFromGlobalNamespaceFixer(), new Fixer\PhpdocArrayStyleFixer(), new Fixer\PhpdocTypeListFixer(), + new Fixer\PhpdocTypesCommaSpacesFixer(), new PhpCsFixer\Whitespace\LineBreakAfterStatementsFixer(), ); } @@ -85,6 +86,7 @@ protected function expectedRules(): Rules 'PhpCsFixerCustomFixers/no_import_from_global_namespace' => true, 'PhpCsFixerCustomFixers/phpdoc_array_style' => true, 'PhpCsFixerCustomFixers/phpdoc_type_list' => true, + 'PhpCsFixerCustomFixers/phpdoc_types_comma_spaces' => true, 'align_multiline_comment' => [ 'comment_type' => 'all_multiline', ],