bug PHP-CS-Fixer#5033 VoidReturnFixer - must run after NoSuperfluousP…

…hpdocTagsFixer (kubawerlos)

This PR was merged into the 2.15 branch.

Discussion
----------

VoidReturnFixer - must run after NoSuperfluousPhpdocTagsFixer

Commits
-------

f27a841 VoidReturnFixer - must run after NoSuperfluousPhpdocTagsFixer

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/NoEmptyPhpdocFixer.php

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

src/Fixer/Phpdoc/NoSuperfluousPhpdocTagsFixer.php

@@ -82,7 +82,7 @@ class Foo {
     /**
      * {@inheritdoc}
      *
-     * Must run before NoEmptyPhpdocFixer, PhpdocAlignFixer.
+     * Must run before NoEmptyPhpdocFixer, PhpdocAlignFixer, VoidReturnFixer.
      * Must run after CommentToPhpdocFixer, FullyQualifiedStrictTypesFixer, PhpdocAddMissingParamAnnotationFixer, PhpdocIndentFixer, PhpdocReturnSelfReferenceFixer, PhpdocScalarFixer, PhpdocToCommentFixer, PhpdocToReturnTypeFixer, PhpdocTypesFixer.
      */
     public function getPriority()

src/Fixer/Phpdoc/PhpdocNoEmptyReturnFixer.php

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

tests/AutoReview/FixerFactoryTest.php

@@ -153,6 +153,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/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() {}