Merge branch '2.15' into 2.16

* 2.15:
  VoidReturnFixer - must run after NoSuperfluousPhpdocTagsFixer
  PhpdocTrimConsecutiveBlankLineSeparationFixer - must run after AlignMultilineCommentFixer

# Conflicts:
#	src/Fixer/Phpdoc/NoSuperfluousPhpdocTagsFixer.php

Author: SpacePossum

src/Fixer/FunctionNotation/VoidReturnFixer.php

@@ -50,11 +50,11 @@ public function getDefinition()
      * {@inheritdoc}
      *
      * Must run before PhpdocNoEmptyReturnFixer, ReturnTypeDeclarationFixer.
-     * Must run after SimplifiedNullReturnFixer.
+     * Must run after NoSuperfluousPhpdocTagsFixer, SimplifiedNullReturnFixer.
      */
     public function getPriority()
     {
-        return 15;
+        return 5;
     }
 
     /**

src/Fixer/Phpdoc/AlignMultilineCommentFixer.php

@@ -86,6 +86,7 @@ public function getDefinition()
     /**
      * {@inheritdoc}
      *
+     * Must run before PhpdocTrimConsecutiveBlankLineSeparationFixer.
      * Must run after ArrayIndentationFixer.
      */
     public function getPriority()

src/Fixer/Phpdoc/NoEmptyPhpdocFixer.php

@@ -42,7 +42,7 @@ public function getDefinition()
      */
     public function getPriority()
     {
-        return 5;
+        return 3;
     }
 
     /**

src/Fixer/Phpdoc/NoSuperfluousPhpdocTagsFixer.php

@@ -92,7 +92,7 @@ public function doFoo(Bar $bar, $baz /*, $qux = null */) {}
     /**
      * {@inheritdoc}
      *
-     * Must run before NoEmptyPhpdocFixer, PhpdocAlignFixer.
+     * Must run before NoEmptyPhpdocFixer, PhpdocAlignFixer, VoidReturnFixer.
      * Must run after CommentToPhpdocFixer, FullyQualifiedStrictTypesFixer, PhpdocAddMissingParamAnnotationFixer, PhpdocIndentFixer, PhpdocReturnSelfReferenceFixer, PhpdocScalarFixer, PhpdocToCommentFixer, PhpdocToParamTypeFixer, PhpdocToReturnTypeFixer, PhpdocTypesFixer.
      */
     public function getPriority()

src/Fixer/Phpdoc/PhpdocAlignFixer.php

@@ -157,7 +157,7 @@ public function getPriority()
          * annotations are of the correct type, and are grouped correctly
          * before running this fixer.
          */
-        return -21;
+        return -42;
     }
 
     /**

src/Fixer/Phpdoc/PhpdocNoEmptyReturnFixer.php

@@ -69,7 +69,7 @@ function foo() {}
      */
     public function getPriority()
     {
-        return 10;
+        return 4;
     }
 
     /**

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;
     }
 
     /**

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']],
@@ -160,6 +161,7 @@ public function provideFixersPriorityCases()
             [$fixers['no_spaces_after_function_name'], $fixers['function_to_constant']],
             [$fixers['no_spaces_inside_parenthesis'], $fixers['function_to_constant']],
             [$fixers['no_superfluous_phpdoc_tags'], $fixers['no_empty_phpdoc']],
+            [$fixers['no_superfluous_phpdoc_tags'], $fixers['void_return']],
             [$fixers['no_unneeded_control_parentheses'], $fixers['no_trailing_whitespace']],
             [$fixers['no_unneeded_curly_braces'], $fixers['no_useless_else']],
             [$fixers['no_unneeded_curly_braces'], $fixers['no_useless_return']],

tests/Fixtures/Integration/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
+ */

tests/Fixtures/Integration/priority/no_superfluous_phpdoc_tags,void_return.test

@@ -0,0 +1,18 @@
+--TEST--
+Integration of fixers: no_superfluous_phpdoc_tags,void_return.
+--RULESET--
+{"no_superfluous_phpdoc_tags": true, "void_return": true}
+--REQUIREMENTS--
+{"php": 70100}
+--EXPECT--
+<?php
+/**
+ */
+function test(): void {}
+
+--INPUT--
+<?php
+/**
+ * @return mixed
+ */
+function test() {}