bug #5010 SimplifiedNullReturnFixer - must run before VoidReturnFixer…

… (kubawerlos) This PR was squashed before being merged into the 2.15 branch. Discussion ---------- SimplifiedNullReturnFixer - must run before VoidReturnFixer Commits ------- d58e3cb SimplifiedNullReturnFixer - must run before VoidReturnFixer
PHP-CS-Fixer · Jun 27, 2020 · 52e1417 · 52e1417
2 parents ff8ca0e + d58e3cb
commit 52e1417
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 2 deletions.
diff --git a/src/Fixer/FunctionNotation/VoidReturnFixer.php b/src/Fixer/FunctionNotation/VoidReturnFixer.php
@@ -50,6 +50,7 @@ public function getDefinition()
      * {@inheritdoc}
      *
      * Must run before PhpdocNoEmptyReturnFixer, ReturnTypeDeclarationFixer.
+     * Must run after SimplifiedNullReturnFixer.
      */
     public function getPriority()
     {

diff --git a/src/Fixer/ReturnNotation/SimplifiedNullReturnFixer.php b/src/Fixer/ReturnNotation/SimplifiedNullReturnFixer.php
@@ -53,11 +53,11 @@ function xyz(): void { return null; }
     /**
      * {@inheritdoc}
      *
-     * Must run before NoUselessReturnFixer.
+     * Must run before NoUselessReturnFixer, VoidReturnFixer.
      */
     public function getPriority()
     {
-        return -17;
+        return 16;
     }
 
     /**

diff --git a/tests/AutoReview/FixerFactoryTest.php b/tests/AutoReview/FixerFactoryTest.php
@@ -225,6 +225,7 @@ public function provideFixersPriorityCases()
             [$fixers['protected_to_private'], $fixers['ordered_class_elements']],
             [$fixers['return_assignment'], $fixers['blank_line_before_statement']],
             [$fixers['simplified_null_return'], $fixers['no_useless_return']],
+            [$fixers['simplified_null_return'], $fixers['void_return']],
             [$fixers['single_import_per_statement'], $fixers['multiline_whitespace_before_semicolons']],
             [$fixers['single_import_per_statement'], $fixers['no_leading_import_slash']],
             [$fixers['single_import_per_statement'], $fixers['no_singleline_whitespace_before_semicolons']],

diff --git a/tests/Fixtures/Integration/priority/simplified_null_return,void_return.test b/tests/Fixtures/Integration/priority/simplified_null_return,void_return.test
@@ -0,0 +1,23 @@
+--TEST--
+Integration of fixers: simplified_null_return,void_return.
+--RULESET--
+{"simplified_null_return": true, "void_return": true}
+--REQUIREMENTS--
+{"php": 70100}
+--EXPECT--
+<?php
+class Foo {
+    public function bar(): void
+    {
+        return;
+    }
+}
+
+--INPUT--
+<?php
+class Foo {
+    public function bar()
+    {
+        return null;
+    }
+}