Merge pull request #977 from ergebnis/feature/no-duplicated-imports

Enhancement: Enable `PhpCsFixerCustomFixers/no_duplicated_imports` fixer
ergebnis · Jan 4, 2024 · 6df6da4 · 6df6da4
2 parents 8f35865 + d5ad81c
commit 6df6da4
Show file tree

Hide file tree

Showing 27 changed files with 54 additions and 0 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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' => [