bug PHP-CS-Fixer#5017 PhpdocTrimConsecutiveBlankLineSeparationFixer -…

… must run after AlignMultilineCommentFixer (kubawerlos) This PR was merged into the 2.15 branch. Discussion ---------- PhpdocTrimConsecutiveBlankLineSeparationFixer - must run after AlignMultilineCommentFixer Commits ------- 556c371 PhpdocTrimConsecutiveBlankLineSeparationFixer - must run after AlignMultilineCommentFixer
nutshellcrm · Jul 3, 2020 · a559874 · a559874
2 parents a8de87d + 556c371
commit a559874
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 3 deletions.
diff --git a/src/Fixer/Phpdoc/AlignMultilineCommentFixer.php b/src/Fixer/Phpdoc/AlignMultilineCommentFixer.php
@@ -86,6 +86,7 @@ public function getDefinition()
     /**
      * {@inheritdoc}
      *
+     * Must run before PhpdocTrimConsecutiveBlankLineSeparationFixer.
      * Must run after ArrayIndentationFixer.
      */
     public function getPriority()

diff --git a/src/Fixer/Phpdoc/PhpdocAlignFixer.php b/src/Fixer/Phpdoc/PhpdocAlignFixer.php
@@ -155,7 +155,7 @@ public function getPriority()
          * annotations are of the correct type, and are grouped correctly
          * before running this fixer.
          */
-        return -21;
+        return -42;
     }
 
     /**

diff --git a/src/Fixer/Phpdoc/PhpdocTrimConsecutiveBlankLineSeparationFixer.php b/src/Fixer/Phpdoc/PhpdocTrimConsecutiveBlankLineSeparationFixer.php
@@ -63,11 +63,11 @@ function fnc($foo) {}
      * {@inheritdoc}
      *
      * Must run before PhpdocAlignFixer.
-     * Must run after CommentToPhpdocFixer, PhpdocIndentFixer, PhpdocScalarFixer, PhpdocToCommentFixer, PhpdocTypesFixer.
+     * Must run after AlignMultilineCommentFixer, CommentToPhpdocFixer, PhpdocIndentFixer, PhpdocScalarFixer, PhpdocToCommentFixer, PhpdocTypesFixer.
      */
     public function getPriority()
     {
-        return 0;
+        return -41;
     }
 
     /**

diff --git a/tests/AutoReview/FixerFactoryTest.php b/tests/AutoReview/FixerFactoryTest.php
@@ -61,6 +61,7 @@ public function provideFixersPriorityCases()
         }
 
         return [
+            [$fixers['align_multiline_comment'], $fixers['phpdoc_trim_consecutive_blank_line_separation']],
             [$fixers['array_indentation'], $fixers['align_multiline_comment']],
             [$fixers['array_indentation'], $fixers['binary_operator_spaces']],
             [$fixers['array_syntax'], $fixers['binary_operator_spaces']],

diff --git a/...ation/priority/align_multiline_comment,phpdoc_trim_consecutive_blank_line_separation.test b/...ation/priority/align_multiline_comment,phpdoc_trim_consecutive_blank_line_separation.test
@@ -0,0 +1,20 @@
+--TEST--
+Integration of fixers: align_multiline_comment,phpdoc_trim_consecutive_blank_line_separation.
+--RULESET--
+{"align_multiline_comment": true, "phpdoc_trim_consecutive_blank_line_separation": true}
+--EXPECT--
+<?php
+/**
+ * foo
+ *
+ * bar
+ */
+
+--INPUT--
+<?php
+/**
+ * foo
+ *
+
+ * bar
+ */