Revert goto handling on ExplicitReturnNullRector (#7021)

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

This reverts commit 3dacd70.

* Revert "[CodeQuality] Properly handle Goto_ on ExplicitReturnNullRector take 2 (#7019)"

This reverts commit 0966124.

* Revert "[CodeQuality] Properly handle Goto_ on ExplicitReturnNullRector (#7018)"

This reverts commit c671491.

Author: samsonasik

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

@@ -0,0 +1,19 @@
+<?php
+
+namespace Rector\Tests\CodeQuality\Rector\ClassMethod\ExplicitReturnNullRector\Fixture;
+
+final class SkipDoWhileMaybeReturned4
+{
+    public function run(int $i)
+    {
+		do {
+			if (rand(0, 1)) {
+				goto execute;
+			}
+
+			return 2;
+		} while (++$i < 1);
+		execute:
+			echo 'test';
+    }
+}

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

@@ -12,13 +12,15 @@
 use PhpParser\Node\Stmt\Class_;
 use PhpParser\Node\Stmt\ClassMethod;
 use PhpParser\Node\Stmt\Function_;
+use PhpParser\Node\Stmt\Goto_;
 use PhpParser\Node\Stmt\Return_;
 use PhpParser\NodeVisitor;
 use PHPStan\Type\NullType;
 use PHPStan\Type\UnionType;
 use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory;
 use Rector\BetterPhpDocParser\PhpDocManipulator\PhpDocTypeChanger;
 use Rector\NodeTypeResolver\PHPStan\Type\TypeFactory;
+use Rector\PhpParser\Node\BetterNodeFinder;
 use Rector\Rector\AbstractRector;
 use Rector\TypeDeclaration\TypeInferer\ReturnTypeInferer;
 use Rector\TypeDeclaration\TypeInferer\SilentVoidResolver;
@@ -37,6 +39,7 @@ public function __construct(
         private readonly TypeFactory $typeFactory,
         private readonly PhpDocTypeChanger $phpDocTypeChanger,
         private readonly ReturnTypeInferer $returnTypeInferer,
+        private readonly BetterNodeFinder $betterNodeFinder,
     ) {
     }
 
@@ -111,6 +114,15 @@ public function refactor(Node $node): ?Node
             return null;
         }
 
+        $hasGoto = (bool) $this->betterNodeFinder->findFirstInFunctionLikeScoped(
+            $node,
+            fn (Node $node): bool => $node instanceof Goto_
+        );
+
+        if ($hasGoto) {
+            return null;
+        }
+
         $hasChanged = false;
         $this->traverseNodesWithCallable((array) $node->stmts, static function (Node $node) use (
             &$hasChanged

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

@@ -26,7 +26,6 @@
 use PhpParser\Node\Stmt\Function_;
 use PhpParser\Node\Stmt\Goto_;
 use PhpParser\Node\Stmt\If_;
-use PhpParser\Node\Stmt\Label;
 use PhpParser\Node\Stmt\Return_;
 use PhpParser\Node\Stmt\Switch_;
 use PhpParser\Node\Stmt\TryCatch;
@@ -84,17 +83,7 @@ public function hasSilentVoid(FunctionLike $functionLike): bool
      */
     private function hasStmtsAlwaysReturnOrExit(array $stmts): bool
     {
-        // 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]) && $this->hasStmtsAlwaysReturnOrExit(array_slice($stmts, $key + 1))) {
-                $hasAlwaysReturnOrExitAfterLabelPosition = $key;
-                break;
-            }
-        }
-
-        foreach ($stmts as $key => $stmt) {
+        foreach ($stmts as $stmt) {
             if ($this->neverFuncCallAnalyzer->isWithNeverTypeExpr($stmt)) {
                 return true;
             }
@@ -103,10 +92,6 @@ 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;