From d5ad81c30c86a0fe9a7107e749a80b7eb5a8e2b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=B6ller?= Date: Thu, 4 Jan 2024 10:12:34 +0100 Subject: [PATCH] Enhancement: Enable PhpCsFixerCustomFixers/no_duplicated_imports fixer --- CHANGELOG.md | 2 ++ 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, 54 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0a3a74f7..826ea297 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ For a full diff see [`6.18.0...main`][6.18.0...main]. - Enabled the `PhpCsFixerCustomFixers/multiline_comment_opening_closing_alone` fixer ([#974]), by [@localheinz] - Enabled the `PhpCsFixerCustomFixers/multiline_promoted_properties` fixer ([#975]), by [@localheinz] - Enabled the `PhpCsFixerCustomFixers/no_duplicated_array_key` fixer ([#976]), by [@localheinz] +- Enabled the `PhpCsFixerCustomFixers/no_duplicated_imports` fixer ([#977]), by [@localheinz] ## [`6.18.0`][6.18.0] @@ -1488,6 +1489,7 @@ For a full diff see [`d899e77...1.0.0`][d899e77...1.0.0]. [#974]: https://github.com/ergebnis/php-cs-fixer-config/pull/974 [#975]: https://github.com/ergebnis/php-cs-fixer-config/pull/975 [#976]: https://github.com/ergebnis/php-cs-fixer-config/pull/976 +[#977]: https://github.com/ergebnis/php-cs-fixer-config/pull/977 [@dependabot]: https://github.com/apps/dependabot [@linuxjuggler]: https://github.com/linuxjuggler diff --git a/src/RuleSet/Php53.php b/src/RuleSet/Php53.php index c159f710..a2155138 100644 --- a/src/RuleSet/Php53.php +++ b/src/RuleSet/Php53.php @@ -35,6 +35,7 @@ public static function create(): RuleSet Fixers::fromFixers( new Fixer\MultilineCommentOpeningClosingAloneFixer(), new Fixer\NoDuplicatedArrayKeyFixer(), + new Fixer\NoDuplicatedImportsFixer(), new Fixer\PhpdocArrayStyleFixer(), new Fixer\PhpdocTypeListFixer(), new PhpCsFixer\Whitespace\LineBreakAfterStatementsFixer(), @@ -51,6 +52,7 @@ public static function create(): RuleSet 'PhpCsFixerCustomFixers/no_duplicated_array_key' => [ 'ignore_expressions' => true, ], + 'PhpCsFixerCustomFixers/no_duplicated_imports' => true, 'PhpCsFixerCustomFixers/phpdoc_array_style' => true, 'PhpCsFixerCustomFixers/phpdoc_type_list' => true, 'align_multiline_comment' => [ diff --git a/src/RuleSet/Php54.php b/src/RuleSet/Php54.php index ebad967d..49aeb724 100644 --- a/src/RuleSet/Php54.php +++ b/src/RuleSet/Php54.php @@ -35,6 +35,7 @@ public static function create(): RuleSet Fixers::fromFixers( new Fixer\MultilineCommentOpeningClosingAloneFixer(), new Fixer\NoDuplicatedArrayKeyFixer(), + new Fixer\NoDuplicatedImportsFixer(), new Fixer\PhpdocArrayStyleFixer(), new Fixer\PhpdocTypeListFixer(), new PhpCsFixer\Whitespace\LineBreakAfterStatementsFixer(), @@ -51,6 +52,7 @@ public static function create(): RuleSet 'PhpCsFixerCustomFixers/no_duplicated_array_key' => [ 'ignore_expressions' => true, ], + 'PhpCsFixerCustomFixers/no_duplicated_imports' => true, 'PhpCsFixerCustomFixers/phpdoc_array_style' => true, 'PhpCsFixerCustomFixers/phpdoc_type_list' => true, 'align_multiline_comment' => [ diff --git a/src/RuleSet/Php55.php b/src/RuleSet/Php55.php index 9599b941..f542565c 100644 --- a/src/RuleSet/Php55.php +++ b/src/RuleSet/Php55.php @@ -35,6 +35,7 @@ public static function create(): RuleSet Fixers::fromFixers( new Fixer\MultilineCommentOpeningClosingAloneFixer(), new Fixer\NoDuplicatedArrayKeyFixer(), + new Fixer\NoDuplicatedImportsFixer(), new Fixer\PhpdocArrayStyleFixer(), new Fixer\PhpdocTypeListFixer(), new PhpCsFixer\Whitespace\LineBreakAfterStatementsFixer(), @@ -51,6 +52,7 @@ public static function create(): RuleSet 'PhpCsFixerCustomFixers/no_duplicated_array_key' => [ 'ignore_expressions' => true, ], + 'PhpCsFixerCustomFixers/no_duplicated_imports' => true, 'PhpCsFixerCustomFixers/phpdoc_array_style' => true, 'PhpCsFixerCustomFixers/phpdoc_type_list' => true, 'align_multiline_comment' => [ diff --git a/src/RuleSet/Php56.php b/src/RuleSet/Php56.php index f94c5245..637e24bb 100644 --- a/src/RuleSet/Php56.php +++ b/src/RuleSet/Php56.php @@ -35,6 +35,7 @@ public static function create(): RuleSet Fixers::fromFixers( new Fixer\MultilineCommentOpeningClosingAloneFixer(), new Fixer\NoDuplicatedArrayKeyFixer(), + new Fixer\NoDuplicatedImportsFixer(), new Fixer\PhpdocArrayStyleFixer(), new Fixer\PhpdocTypeListFixer(), new PhpCsFixer\Whitespace\LineBreakAfterStatementsFixer(), @@ -51,6 +52,7 @@ public static function create(): RuleSet 'PhpCsFixerCustomFixers/no_duplicated_array_key' => [ 'ignore_expressions' => true, ], + 'PhpCsFixerCustomFixers/no_duplicated_imports' => true, 'PhpCsFixerCustomFixers/phpdoc_array_style' => true, 'PhpCsFixerCustomFixers/phpdoc_type_list' => true, 'align_multiline_comment' => [ diff --git a/src/RuleSet/Php70.php b/src/RuleSet/Php70.php index 72aa64a7..86592b85 100644 --- a/src/RuleSet/Php70.php +++ b/src/RuleSet/Php70.php @@ -35,6 +35,7 @@ public static function create(): RuleSet Fixers::fromFixers( new Fixer\MultilineCommentOpeningClosingAloneFixer(), new Fixer\NoDuplicatedArrayKeyFixer(), + new Fixer\NoDuplicatedImportsFixer(), new Fixer\PhpdocArrayStyleFixer(), new Fixer\PhpdocTypeListFixer(), new PhpCsFixer\Whitespace\LineBreakAfterStatementsFixer(), @@ -51,6 +52,7 @@ public static function create(): RuleSet 'PhpCsFixerCustomFixers/no_duplicated_array_key' => [ 'ignore_expressions' => true, ], + 'PhpCsFixerCustomFixers/no_duplicated_imports' => true, 'PhpCsFixerCustomFixers/phpdoc_array_style' => true, 'PhpCsFixerCustomFixers/phpdoc_type_list' => true, 'align_multiline_comment' => [ diff --git a/src/RuleSet/Php71.php b/src/RuleSet/Php71.php index f3244109..ea665e27 100644 --- a/src/RuleSet/Php71.php +++ b/src/RuleSet/Php71.php @@ -35,6 +35,7 @@ public static function create(): RuleSet Fixers::fromFixers( new Fixer\MultilineCommentOpeningClosingAloneFixer(), new Fixer\NoDuplicatedArrayKeyFixer(), + new Fixer\NoDuplicatedImportsFixer(), new Fixer\PhpdocArrayStyleFixer(), new Fixer\PhpdocTypeListFixer(), new PhpCsFixer\Whitespace\LineBreakAfterStatementsFixer(), @@ -51,6 +52,7 @@ public static function create(): RuleSet 'PhpCsFixerCustomFixers/no_duplicated_array_key' => [ 'ignore_expressions' => true, ], + 'PhpCsFixerCustomFixers/no_duplicated_imports' => true, 'PhpCsFixerCustomFixers/phpdoc_array_style' => true, 'PhpCsFixerCustomFixers/phpdoc_type_list' => true, 'align_multiline_comment' => [ diff --git a/src/RuleSet/Php72.php b/src/RuleSet/Php72.php index dc1bcf65..757996ad 100644 --- a/src/RuleSet/Php72.php +++ b/src/RuleSet/Php72.php @@ -35,6 +35,7 @@ public static function create(): RuleSet Fixers::fromFixers( new Fixer\MultilineCommentOpeningClosingAloneFixer(), new Fixer\NoDuplicatedArrayKeyFixer(), + new Fixer\NoDuplicatedImportsFixer(), new Fixer\PhpdocArrayStyleFixer(), new Fixer\PhpdocTypeListFixer(), new PhpCsFixer\Whitespace\LineBreakAfterStatementsFixer(), @@ -51,6 +52,7 @@ public static function create(): RuleSet 'PhpCsFixerCustomFixers/no_duplicated_array_key' => [ 'ignore_expressions' => true, ], + 'PhpCsFixerCustomFixers/no_duplicated_imports' => true, 'PhpCsFixerCustomFixers/phpdoc_array_style' => true, 'PhpCsFixerCustomFixers/phpdoc_type_list' => true, 'align_multiline_comment' => [ diff --git a/src/RuleSet/Php73.php b/src/RuleSet/Php73.php index b0405b0e..04711e85 100644 --- a/src/RuleSet/Php73.php +++ b/src/RuleSet/Php73.php @@ -35,6 +35,7 @@ public static function create(): RuleSet Fixers::fromFixers( new Fixer\MultilineCommentOpeningClosingAloneFixer(), new Fixer\NoDuplicatedArrayKeyFixer(), + new Fixer\NoDuplicatedImportsFixer(), new Fixer\PhpdocArrayStyleFixer(), new Fixer\PhpdocTypeListFixer(), new PhpCsFixer\Whitespace\LineBreakAfterStatementsFixer(), @@ -51,6 +52,7 @@ public static function create(): RuleSet 'PhpCsFixerCustomFixers/no_duplicated_array_key' => [ 'ignore_expressions' => true, ], + 'PhpCsFixerCustomFixers/no_duplicated_imports' => true, 'PhpCsFixerCustomFixers/phpdoc_array_style' => true, 'PhpCsFixerCustomFixers/phpdoc_type_list' => true, 'align_multiline_comment' => [ diff --git a/src/RuleSet/Php74.php b/src/RuleSet/Php74.php index 64780045..bc93aaf0 100644 --- a/src/RuleSet/Php74.php +++ b/src/RuleSet/Php74.php @@ -35,6 +35,7 @@ public static function create(): RuleSet Fixers::fromFixers( new Fixer\MultilineCommentOpeningClosingAloneFixer(), new Fixer\NoDuplicatedArrayKeyFixer(), + new Fixer\NoDuplicatedImportsFixer(), new Fixer\PhpdocArrayStyleFixer(), new Fixer\PhpdocTypeListFixer(), new PhpCsFixer\Whitespace\LineBreakAfterStatementsFixer(), @@ -51,6 +52,7 @@ public static function create(): RuleSet 'PhpCsFixerCustomFixers/no_duplicated_array_key' => [ 'ignore_expressions' => true, ], + 'PhpCsFixerCustomFixers/no_duplicated_imports' => true, 'PhpCsFixerCustomFixers/phpdoc_array_style' => true, 'PhpCsFixerCustomFixers/phpdoc_type_list' => true, 'align_multiline_comment' => [ diff --git a/src/RuleSet/Php80.php b/src/RuleSet/Php80.php index a8de1278..9fd968f8 100644 --- a/src/RuleSet/Php80.php +++ b/src/RuleSet/Php80.php @@ -36,6 +36,7 @@ public static function create(): RuleSet new Fixer\MultilineCommentOpeningClosingAloneFixer(), new Fixer\MultilinePromotedPropertiesFixer(), new Fixer\NoDuplicatedArrayKeyFixer(), + new Fixer\NoDuplicatedImportsFixer(), new Fixer\PhpdocArrayStyleFixer(), new Fixer\PhpdocTypeListFixer(), new PhpCsFixer\Whitespace\LineBreakAfterStatementsFixer(), @@ -56,6 +57,7 @@ public static function create(): RuleSet 'PhpCsFixerCustomFixers/no_duplicated_array_key' => [ 'ignore_expressions' => true, ], + 'PhpCsFixerCustomFixers/no_duplicated_imports' => true, 'PhpCsFixerCustomFixers/phpdoc_array_style' => true, 'PhpCsFixerCustomFixers/phpdoc_type_list' => true, 'align_multiline_comment' => [ diff --git a/src/RuleSet/Php81.php b/src/RuleSet/Php81.php index 6f283bb0..9de7c0b9 100644 --- a/src/RuleSet/Php81.php +++ b/src/RuleSet/Php81.php @@ -36,6 +36,7 @@ public static function create(): RuleSet new Fixer\MultilineCommentOpeningClosingAloneFixer(), new Fixer\MultilinePromotedPropertiesFixer(), new Fixer\NoDuplicatedArrayKeyFixer(), + new Fixer\NoDuplicatedImportsFixer(), new Fixer\PhpdocArrayStyleFixer(), new Fixer\PhpdocTypeListFixer(), new PhpCsFixer\Whitespace\LineBreakAfterStatementsFixer(), @@ -56,6 +57,7 @@ public static function create(): RuleSet 'PhpCsFixerCustomFixers/no_duplicated_array_key' => [ 'ignore_expressions' => true, ], + 'PhpCsFixerCustomFixers/no_duplicated_imports' => true, 'PhpCsFixerCustomFixers/phpdoc_array_style' => true, 'PhpCsFixerCustomFixers/phpdoc_type_list' => true, 'align_multiline_comment' => [ diff --git a/src/RuleSet/Php82.php b/src/RuleSet/Php82.php index 019bfae8..0ee7741e 100644 --- a/src/RuleSet/Php82.php +++ b/src/RuleSet/Php82.php @@ -36,6 +36,7 @@ public static function create(): RuleSet new Fixer\MultilineCommentOpeningClosingAloneFixer(), new Fixer\MultilinePromotedPropertiesFixer(), new Fixer\NoDuplicatedArrayKeyFixer(), + new Fixer\NoDuplicatedImportsFixer(), new Fixer\PhpdocArrayStyleFixer(), new Fixer\PhpdocTypeListFixer(), new PhpCsFixer\Whitespace\LineBreakAfterStatementsFixer(), @@ -56,6 +57,7 @@ public static function create(): RuleSet 'PhpCsFixerCustomFixers/no_duplicated_array_key' => [ 'ignore_expressions' => true, ], + 'PhpCsFixerCustomFixers/no_duplicated_imports' => true, 'PhpCsFixerCustomFixers/phpdoc_array_style' => true, 'PhpCsFixerCustomFixers/phpdoc_type_list' => true, 'align_multiline_comment' => [ diff --git a/src/RuleSet/Php83.php b/src/RuleSet/Php83.php index a633af85..655adc53 100644 --- a/src/RuleSet/Php83.php +++ b/src/RuleSet/Php83.php @@ -36,6 +36,7 @@ public static function create(): RuleSet new Fixer\MultilineCommentOpeningClosingAloneFixer(), new Fixer\MultilinePromotedPropertiesFixer(), new Fixer\NoDuplicatedArrayKeyFixer(), + new Fixer\NoDuplicatedImportsFixer(), new Fixer\PhpdocArrayStyleFixer(), new Fixer\PhpdocTypeListFixer(), new PhpCsFixer\Whitespace\LineBreakAfterStatementsFixer(), @@ -56,6 +57,7 @@ public static function create(): RuleSet 'PhpCsFixerCustomFixers/no_duplicated_array_key' => [ 'ignore_expressions' => true, ], + 'PhpCsFixerCustomFixers/no_duplicated_imports' => true, 'PhpCsFixerCustomFixers/phpdoc_array_style' => true, 'PhpCsFixerCustomFixers/phpdoc_type_list' => true, 'align_multiline_comment' => [ diff --git a/test/Unit/RuleSet/Php53Test.php b/test/Unit/RuleSet/Php53Test.php index 40fbcdcd..52b9ca47 100644 --- a/test/Unit/RuleSet/Php53Test.php +++ b/test/Unit/RuleSet/Php53Test.php @@ -46,6 +46,7 @@ protected function expectedCustomFixers(): Fixers return Fixers::fromFixers( new Fixer\MultilineCommentOpeningClosingAloneFixer(), new Fixer\NoDuplicatedArrayKeyFixer(), + new Fixer\NoDuplicatedImportsFixer(), new Fixer\PhpdocArrayStyleFixer(), new Fixer\PhpdocTypeListFixer(), new PhpCsFixer\Whitespace\LineBreakAfterStatementsFixer(), @@ -74,6 +75,7 @@ protected function expectedRules(): Rules 'PhpCsFixerCustomFixers/no_duplicated_array_key' => [ 'ignore_expressions' => true, ], + 'PhpCsFixerCustomFixers/no_duplicated_imports' => true, 'PhpCsFixerCustomFixers/phpdoc_array_style' => true, 'PhpCsFixerCustomFixers/phpdoc_type_list' => true, 'align_multiline_comment' => [ diff --git a/test/Unit/RuleSet/Php54Test.php b/test/Unit/RuleSet/Php54Test.php index 1677b959..d3a5e360 100644 --- a/test/Unit/RuleSet/Php54Test.php +++ b/test/Unit/RuleSet/Php54Test.php @@ -46,6 +46,7 @@ protected function expectedCustomFixers(): Fixers return Fixers::fromFixers( new Fixer\MultilineCommentOpeningClosingAloneFixer(), new Fixer\NoDuplicatedArrayKeyFixer(), + new Fixer\NoDuplicatedImportsFixer(), new Fixer\PhpdocArrayStyleFixer(), new Fixer\PhpdocTypeListFixer(), new PhpCsFixer\Whitespace\LineBreakAfterStatementsFixer(), @@ -74,6 +75,7 @@ protected function expectedRules(): Rules 'PhpCsFixerCustomFixers/no_duplicated_array_key' => [ 'ignore_expressions' => true, ], + 'PhpCsFixerCustomFixers/no_duplicated_imports' => true, 'PhpCsFixerCustomFixers/phpdoc_array_style' => true, 'PhpCsFixerCustomFixers/phpdoc_type_list' => true, 'align_multiline_comment' => [ diff --git a/test/Unit/RuleSet/Php55Test.php b/test/Unit/RuleSet/Php55Test.php index 2d946ace..0cec40cb 100644 --- a/test/Unit/RuleSet/Php55Test.php +++ b/test/Unit/RuleSet/Php55Test.php @@ -41,6 +41,7 @@ protected function expectedCustomFixers(): Fixers return Fixers::fromFixers( new Fixer\MultilineCommentOpeningClosingAloneFixer(), new Fixer\NoDuplicatedArrayKeyFixer(), + new Fixer\NoDuplicatedImportsFixer(), new Fixer\PhpdocArrayStyleFixer(), new Fixer\PhpdocTypeListFixer(), new PhpCsFixer\Whitespace\LineBreakAfterStatementsFixer(), @@ -74,6 +75,7 @@ protected function expectedRules(): Rules 'PhpCsFixerCustomFixers/no_duplicated_array_key' => [ 'ignore_expressions' => true, ], + 'PhpCsFixerCustomFixers/no_duplicated_imports' => true, 'PhpCsFixerCustomFixers/phpdoc_array_style' => true, 'PhpCsFixerCustomFixers/phpdoc_type_list' => true, 'align_multiline_comment' => [ diff --git a/test/Unit/RuleSet/Php56Test.php b/test/Unit/RuleSet/Php56Test.php index a4761565..b2d3424a 100644 --- a/test/Unit/RuleSet/Php56Test.php +++ b/test/Unit/RuleSet/Php56Test.php @@ -46,6 +46,7 @@ protected function expectedCustomFixers(): Fixers return Fixers::fromFixers( new Fixer\MultilineCommentOpeningClosingAloneFixer(), new Fixer\NoDuplicatedArrayKeyFixer(), + new Fixer\NoDuplicatedImportsFixer(), new Fixer\PhpdocArrayStyleFixer(), new Fixer\PhpdocTypeListFixer(), new PhpCsFixer\Whitespace\LineBreakAfterStatementsFixer(), @@ -74,6 +75,7 @@ protected function expectedRules(): Rules 'PhpCsFixerCustomFixers/no_duplicated_array_key' => [ 'ignore_expressions' => true, ], + 'PhpCsFixerCustomFixers/no_duplicated_imports' => true, 'PhpCsFixerCustomFixers/phpdoc_array_style' => true, 'PhpCsFixerCustomFixers/phpdoc_type_list' => true, 'align_multiline_comment' => [ diff --git a/test/Unit/RuleSet/Php70Test.php b/test/Unit/RuleSet/Php70Test.php index 9400b5da..647fcb79 100644 --- a/test/Unit/RuleSet/Php70Test.php +++ b/test/Unit/RuleSet/Php70Test.php @@ -46,6 +46,7 @@ protected function expectedCustomFixers(): Fixers return Fixers::fromFixers( new Fixer\MultilineCommentOpeningClosingAloneFixer(), new Fixer\NoDuplicatedArrayKeyFixer(), + new Fixer\NoDuplicatedImportsFixer(), new Fixer\PhpdocArrayStyleFixer(), new Fixer\PhpdocTypeListFixer(), new PhpCsFixer\Whitespace\LineBreakAfterStatementsFixer(), @@ -74,6 +75,7 @@ protected function expectedRules(): Rules 'PhpCsFixerCustomFixers/no_duplicated_array_key' => [ 'ignore_expressions' => true, ], + 'PhpCsFixerCustomFixers/no_duplicated_imports' => true, 'PhpCsFixerCustomFixers/phpdoc_array_style' => true, 'PhpCsFixerCustomFixers/phpdoc_type_list' => true, 'align_multiline_comment' => [ diff --git a/test/Unit/RuleSet/Php71Test.php b/test/Unit/RuleSet/Php71Test.php index a29b02ed..7bf85746 100644 --- a/test/Unit/RuleSet/Php71Test.php +++ b/test/Unit/RuleSet/Php71Test.php @@ -46,6 +46,7 @@ protected function expectedCustomFixers(): Fixers return Fixers::fromFixers( new Fixer\MultilineCommentOpeningClosingAloneFixer(), new Fixer\NoDuplicatedArrayKeyFixer(), + new Fixer\NoDuplicatedImportsFixer(), new Fixer\PhpdocArrayStyleFixer(), new Fixer\PhpdocTypeListFixer(), new PhpCsFixer\Whitespace\LineBreakAfterStatementsFixer(), @@ -74,6 +75,7 @@ protected function expectedRules(): Rules 'PhpCsFixerCustomFixers/no_duplicated_array_key' => [ 'ignore_expressions' => true, ], + 'PhpCsFixerCustomFixers/no_duplicated_imports' => true, 'PhpCsFixerCustomFixers/phpdoc_array_style' => true, 'PhpCsFixerCustomFixers/phpdoc_type_list' => true, 'align_multiline_comment' => [ diff --git a/test/Unit/RuleSet/Php72Test.php b/test/Unit/RuleSet/Php72Test.php index 31dd9378..554c5a11 100644 --- a/test/Unit/RuleSet/Php72Test.php +++ b/test/Unit/RuleSet/Php72Test.php @@ -46,6 +46,7 @@ protected function expectedCustomFixers(): Fixers return Fixers::fromFixers( new Fixer\MultilineCommentOpeningClosingAloneFixer(), new Fixer\NoDuplicatedArrayKeyFixer(), + new Fixer\NoDuplicatedImportsFixer(), new Fixer\PhpdocArrayStyleFixer(), new Fixer\PhpdocTypeListFixer(), new PhpCsFixer\Whitespace\LineBreakAfterStatementsFixer(), @@ -74,6 +75,7 @@ protected function expectedRules(): Rules 'PhpCsFixerCustomFixers/no_duplicated_array_key' => [ 'ignore_expressions' => true, ], + 'PhpCsFixerCustomFixers/no_duplicated_imports' => true, 'PhpCsFixerCustomFixers/phpdoc_array_style' => true, 'PhpCsFixerCustomFixers/phpdoc_type_list' => true, 'align_multiline_comment' => [ diff --git a/test/Unit/RuleSet/Php73Test.php b/test/Unit/RuleSet/Php73Test.php index a6042df6..e9d63e27 100644 --- a/test/Unit/RuleSet/Php73Test.php +++ b/test/Unit/RuleSet/Php73Test.php @@ -46,6 +46,7 @@ protected function expectedCustomFixers(): Fixers return Fixers::fromFixers( new Fixer\MultilineCommentOpeningClosingAloneFixer(), new Fixer\NoDuplicatedArrayKeyFixer(), + new Fixer\NoDuplicatedImportsFixer(), new Fixer\PhpdocArrayStyleFixer(), new Fixer\PhpdocTypeListFixer(), new PhpCsFixer\Whitespace\LineBreakAfterStatementsFixer(), @@ -74,6 +75,7 @@ protected function expectedRules(): Rules 'PhpCsFixerCustomFixers/no_duplicated_array_key' => [ 'ignore_expressions' => true, ], + 'PhpCsFixerCustomFixers/no_duplicated_imports' => true, 'PhpCsFixerCustomFixers/phpdoc_array_style' => true, 'PhpCsFixerCustomFixers/phpdoc_type_list' => true, 'align_multiline_comment' => [ diff --git a/test/Unit/RuleSet/Php74Test.php b/test/Unit/RuleSet/Php74Test.php index e2f9dc01..821e9b9a 100644 --- a/test/Unit/RuleSet/Php74Test.php +++ b/test/Unit/RuleSet/Php74Test.php @@ -46,6 +46,7 @@ protected function expectedCustomFixers(): Fixers return Fixers::fromFixers( new Fixer\MultilineCommentOpeningClosingAloneFixer(), new Fixer\NoDuplicatedArrayKeyFixer(), + new Fixer\NoDuplicatedImportsFixer(), new Fixer\PhpdocArrayStyleFixer(), new Fixer\PhpdocTypeListFixer(), new PhpCsFixer\Whitespace\LineBreakAfterStatementsFixer(), @@ -74,6 +75,7 @@ protected function expectedRules(): Rules 'PhpCsFixerCustomFixers/no_duplicated_array_key' => [ 'ignore_expressions' => true, ], + 'PhpCsFixerCustomFixers/no_duplicated_imports' => true, 'PhpCsFixerCustomFixers/phpdoc_array_style' => true, 'PhpCsFixerCustomFixers/phpdoc_type_list' => true, 'align_multiline_comment' => [ diff --git a/test/Unit/RuleSet/Php80Test.php b/test/Unit/RuleSet/Php80Test.php index ecc4bd4d..b0798127 100644 --- a/test/Unit/RuleSet/Php80Test.php +++ b/test/Unit/RuleSet/Php80Test.php @@ -47,6 +47,7 @@ protected function expectedCustomFixers(): Fixers new Fixer\MultilineCommentOpeningClosingAloneFixer(), new Fixer\MultilinePromotedPropertiesFixer(), new Fixer\NoDuplicatedArrayKeyFixer(), + new Fixer\NoDuplicatedImportsFixer(), new Fixer\PhpdocArrayStyleFixer(), new Fixer\PhpdocTypeListFixer(), new PhpCsFixer\Whitespace\LineBreakAfterStatementsFixer(), @@ -79,6 +80,7 @@ protected function expectedRules(): Rules 'PhpCsFixerCustomFixers/no_duplicated_array_key' => [ 'ignore_expressions' => true, ], + 'PhpCsFixerCustomFixers/no_duplicated_imports' => true, 'PhpCsFixerCustomFixers/phpdoc_array_style' => true, 'PhpCsFixerCustomFixers/phpdoc_type_list' => true, 'align_multiline_comment' => [ diff --git a/test/Unit/RuleSet/Php81Test.php b/test/Unit/RuleSet/Php81Test.php index ceea5e83..6179fdeb 100644 --- a/test/Unit/RuleSet/Php81Test.php +++ b/test/Unit/RuleSet/Php81Test.php @@ -47,6 +47,7 @@ protected function expectedCustomFixers(): Fixers new Fixer\MultilineCommentOpeningClosingAloneFixer(), new Fixer\MultilinePromotedPropertiesFixer(), new Fixer\NoDuplicatedArrayKeyFixer(), + new Fixer\NoDuplicatedImportsFixer(), new Fixer\PhpdocArrayStyleFixer(), new Fixer\PhpdocTypeListFixer(), new PhpCsFixer\Whitespace\LineBreakAfterStatementsFixer(), @@ -79,6 +80,7 @@ protected function expectedRules(): Rules 'PhpCsFixerCustomFixers/no_duplicated_array_key' => [ 'ignore_expressions' => true, ], + 'PhpCsFixerCustomFixers/no_duplicated_imports' => true, 'PhpCsFixerCustomFixers/phpdoc_array_style' => true, 'PhpCsFixerCustomFixers/phpdoc_type_list' => true, 'align_multiline_comment' => [ diff --git a/test/Unit/RuleSet/Php82Test.php b/test/Unit/RuleSet/Php82Test.php index bc59c5ff..53badfb8 100644 --- a/test/Unit/RuleSet/Php82Test.php +++ b/test/Unit/RuleSet/Php82Test.php @@ -47,6 +47,7 @@ protected function expectedCustomFixers(): Fixers new Fixer\MultilineCommentOpeningClosingAloneFixer(), new Fixer\MultilinePromotedPropertiesFixer(), new Fixer\NoDuplicatedArrayKeyFixer(), + new Fixer\NoDuplicatedImportsFixer(), new Fixer\PhpdocArrayStyleFixer(), new Fixer\PhpdocTypeListFixer(), new PhpCsFixer\Whitespace\LineBreakAfterStatementsFixer(), @@ -79,6 +80,7 @@ protected function expectedRules(): Rules 'PhpCsFixerCustomFixers/no_duplicated_array_key' => [ 'ignore_expressions' => true, ], + 'PhpCsFixerCustomFixers/no_duplicated_imports' => true, 'PhpCsFixerCustomFixers/phpdoc_array_style' => true, 'PhpCsFixerCustomFixers/phpdoc_type_list' => true, 'align_multiline_comment' => [ diff --git a/test/Unit/RuleSet/Php83Test.php b/test/Unit/RuleSet/Php83Test.php index 1b4ede86..f68cf232 100644 --- a/test/Unit/RuleSet/Php83Test.php +++ b/test/Unit/RuleSet/Php83Test.php @@ -47,6 +47,7 @@ protected function expectedCustomFixers(): Fixers new Fixer\MultilineCommentOpeningClosingAloneFixer(), new Fixer\MultilinePromotedPropertiesFixer(), new Fixer\NoDuplicatedArrayKeyFixer(), + new Fixer\NoDuplicatedImportsFixer(), new Fixer\PhpdocArrayStyleFixer(), new Fixer\PhpdocTypeListFixer(), new PhpCsFixer\Whitespace\LineBreakAfterStatementsFixer(), @@ -79,6 +80,7 @@ protected function expectedRules(): Rules 'PhpCsFixerCustomFixers/no_duplicated_array_key' => [ 'ignore_expressions' => true, ], + 'PhpCsFixerCustomFixers/no_duplicated_imports' => true, 'PhpCsFixerCustomFixers/phpdoc_array_style' => true, 'PhpCsFixerCustomFixers/phpdoc_type_list' => true, 'align_multiline_comment' => [