[CodeQuality] Properly handle Goto_ on ExplicitReturnNullRector take 3 (#7020)

* [CodeQuality] Properly handle Goto_ on ExplicitReturnNullRector take 3

* more fixture

* typo fix

Author: samsonasik

rules-tests/CodeQuality/Rector/ClassMethod/ExplicitReturnNullRector/Fixture/maybe_not_returned_before_label.php.inc

@@ -0,0 +1,46 @@
+<?php
+
+namespace Rector\Tests\CodeQuality\Rector\ClassMethod\ExplicitReturnNullRector\Fixture;
+
+final class MaybeNotReturnedBeforeLabel
+{
+    public function run()
+    {
+        if (rand(0, 1)) {
+            return 1;
+        } elseif (rand(0, 2)) {
+            return null;
+        } else {
+            // nothing to do here...
+        }
+
+        unusedLabel:
+            echo 'unused';
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\CodeQuality\Rector\ClassMethod\ExplicitReturnNullRector\Fixture;
+
+final class MaybeNotReturnedBeforeLabel
+{
+    public function run()
+    {
+        if (rand(0, 1)) {
+            return 1;
+        } elseif (rand(0, 2)) {
+            return null;
+        } else {
+            // nothing to do here...
+        }
+
+        unusedLabel:
+            echo 'unused';
+            return null;
+    }
+}
+
+?>

rules-tests/CodeQuality/Rector/ClassMethod/ExplicitReturnNullRector/Fixture/skip_exit_too_early_before_label.php.inc

@@ -0,0 +1,18 @@
+<?php
+
+namespace Rector\Tests\CodeQuality\Rector\ClassMethod\ExplicitReturnNullRector\Fixture;
+
+final class SkipExitTooEarlyBeforeLabel
+{
+    public function run()
+    {
+        exit;
+
+        if (rand(0, 1)) {
+            return 1;
+        }
+
+        unusedLabel:
+            echo 'unused';
+    }
+}

rules-tests/CodeQuality/Rector/ClassMethod/ExplicitReturnNullRector/Fixture/skip_return_too_early_before_label.php.inc

@@ -0,0 +1,18 @@
+<?php
+
+namespace Rector\Tests\CodeQuality\Rector\ClassMethod\ExplicitReturnNullRector\Fixture;
+
+final class SkipReturnTooEarlyBeforeLabel
+{
+    public function run()
+    {
+        if (rand(0, 1)) {
+            return 1;
+        } else {
+            return null;
+        }
+
+        unusedLabel:
+            echo 'unused';
+    }
+}

rules/TypeDeclaration/TypeInferer/SilentVoidResolver.php

@@ -84,15 +84,17 @@ public function hasSilentVoid(FunctionLike $functionLike): bool
      */
     private function hasStmtsAlwaysReturnOrExit(array $stmts): bool
     {
-        // early label check
+        // early label check position key stmt
         // as label can be defined later after goto
+        $hasAlwaysReturnOrExitAfterLabelPosition = null;
         foreach ($stmts as $key => $stmt) {
-            if ($stmt instanceof Label && isset($stmts[$key + 1])) {
-                return $this->hasStmtsAlwaysReturnOrExit(array_slice($stmts, $key + 1));
+            if ($stmt instanceof Label && isset($stmts[$key + 1]) && $this->hasStmtsAlwaysReturnOrExit(array_slice($stmts, $key + 1))) {
+                $hasAlwaysReturnOrExitAfterLabelPosition = $key;
+                break;
             }
         }
 
-        foreach ($stmts as $stmt) {
+        foreach ($stmts as $key => $stmt) {
             if ($this->neverFuncCallAnalyzer->isWithNeverTypeExpr($stmt)) {
                 return true;
             }
@@ -101,6 +103,10 @@ private function hasStmtsAlwaysReturnOrExit(array $stmts): bool
                 return true;
             }
 
+            if ($stmt instanceof Goto_ && $hasAlwaysReturnOrExitAfterLabelPosition < $key) {
+                return true;
+            }
+
             // has switch with always return
             if ($stmt instanceof Switch_ && $this->isSwitchWithAlwaysReturnOrExit($stmt)) {
                 return true;
@@ -194,8 +200,7 @@ private function isStopped(Stmt $stmt): bool
             || $stmt instanceof Exit_
             || ($stmt instanceof Return_ && $stmt->expr instanceof Expr)
             || $stmt instanceof Yield_
-            || $stmt instanceof YieldFrom
-            || $stmt instanceof Goto_;
+            || $stmt instanceof YieldFrom;
     }
 
     private function isSwitchWithAlwaysReturnOrExit(Switch_ $switch): bool