Browse Source

NoUnusedImportsFixer - SingleLineAfterImportsFixer - fix priority

SpacePossum 5 years ago
parent
commit
eef6ec0066

+ 1 - 1
src/Fixer/Import/NoUnusedImportsFixer.php

@@ -42,7 +42,7 @@ final class NoUnusedImportsFixer extends AbstractFixer
     /**
     /**
      * {@inheritdoc}
      * {@inheritdoc}
      *
      *
-     * Must run before BlankLineAfterNamespaceFixer, NoExtraBlankLinesFixer, NoLeadingImportSlashFixer.
+     * Must run before BlankLineAfterNamespaceFixer, NoExtraBlankLinesFixer, NoLeadingImportSlashFixer, SingleLineAfterImportsFixer.
      * Must run after ClassKeywordRemoveFixer, PhpUnitFqcnAnnotationFixer, SingleImportPerStatementFixer.
      * Must run after ClassKeywordRemoveFixer, PhpUnitFqcnAnnotationFixer, SingleImportPerStatementFixer.
      */
      */
     public function getPriority()
     public function getPriority()

+ 10 - 0
src/Fixer/Import/SingleLineAfterImportsFixer.php

@@ -73,6 +73,16 @@ final class Example
         );
         );
     }
     }
 
 
+    /**
+     * {@inheritdoc}
+     *
+     * Must run after NoUnusedImportsFixer.
+     */
+    public function getPriority()
+    {
+        return -11;
+    }
+
     /**
     /**
      * {@inheritdoc}
      * {@inheritdoc}
      */
      */

+ 1 - 0
tests/AutoReview/FixerFactoryTest.php

@@ -154,6 +154,7 @@ final class FixerFactoryTest extends TestCase
             [$fixers['no_unused_imports'], $fixers['blank_line_after_namespace']],
             [$fixers['no_unused_imports'], $fixers['blank_line_after_namespace']],
             [$fixers['no_unused_imports'], $fixers['no_extra_blank_lines']],
             [$fixers['no_unused_imports'], $fixers['no_extra_blank_lines']],
             [$fixers['no_unused_imports'], $fixers['no_leading_import_slash']],
             [$fixers['no_unused_imports'], $fixers['no_leading_import_slash']],
+            [$fixers['no_unused_imports'], $fixers['single_line_after_imports']],
             [$fixers['no_useless_else'], $fixers['braces']],
             [$fixers['no_useless_else'], $fixers['braces']],
             [$fixers['no_useless_else'], $fixers['combine_consecutive_unsets']],
             [$fixers['no_useless_else'], $fixers['combine_consecutive_unsets']],
             [$fixers['no_useless_else'], $fixers['no_extra_blank_lines']],
             [$fixers['no_useless_else'], $fixers['no_extra_blank_lines']],

+ 21 - 0
tests/Fixtures/Integration/priority/no_unused_imports,single_line_after_imports.test

@@ -0,0 +1,21 @@
+--TEST--
+Integration of fixers: no_unused_imports,single_line_after_imports.
+--RULESET--
+{"no_unused_imports": true, "single_line_after_imports": true}
+--EXPECT--
+<?php
+
+use Foo\Bar;
+
+#
+
+Bar::Foo();
+
+--INPUT--
+<?php
+
+use Foo\Bar;
+#
+use \Not\Used;
+
+Bar::Foo();