Updated Rector to commit c671491e7141870aba0f138e3197876cee5eac7b

rectorphp/rector-src@c671491 [CodeQuality] Properly handle Goto_ on ExplicitReturnNullRector (#7018)

Author: TomasVotruba

rules/CodeQuality/Rector/ClassMethod/ExplicitReturnNullRector.php

@@ -11,15 +11,13 @@
 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;
@@ -51,18 +49,13 @@ final class ExplicitReturnNullRector extends AbstractRector
      * @readonly
      */
     private ReturnTypeInferer $returnTypeInferer;
-    /**
-     * @readonly
-     */
-    private BetterNodeFinder $betterNodeFinder;
-    public function __construct(SilentVoidResolver $silentVoidResolver, PhpDocInfoFactory $phpDocInfoFactory, TypeFactory $typeFactory, PhpDocTypeChanger $phpDocTypeChanger, ReturnTypeInferer $returnTypeInferer, BetterNodeFinder $betterNodeFinder)
+    public function __construct(SilentVoidResolver $silentVoidResolver, PhpDocInfoFactory $phpDocInfoFactory, TypeFactory $typeFactory, PhpDocTypeChanger $phpDocTypeChanger, ReturnTypeInferer $returnTypeInferer)
     {
         $this->silentVoidResolver = $silentVoidResolver;
         $this->phpDocInfoFactory = $phpDocInfoFactory;
         $this->typeFactory = $typeFactory;
         $this->phpDocTypeChanger = $phpDocTypeChanger;
         $this->returnTypeInferer = $returnTypeInferer;
-        $this->betterNodeFinder = $betterNodeFinder;
     }
     public function getRuleDefinition() : RuleDefinition
     {
@@ -121,10 +114,6 @@ public function refactor(Node $node) : ?Node
         if (!$returnType instanceof UnionType) {
             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) {
             if ($node instanceof Class_ || $node instanceof Function_ || $node instanceof Closure) {

rules/TypeDeclaration/TypeInferer/SilentVoidResolver.php

@@ -175,7 +175,7 @@ private function isStopped(Stmt $stmt) : bool
         if ($stmt instanceof Expression) {
             $stmt = $stmt->expr;
         }
-        return $stmt instanceof Throw_ || $stmt instanceof Exit_ || $stmt instanceof Return_ && $stmt->expr instanceof Expr || $stmt instanceof Yield_ || $stmt instanceof YieldFrom;
+        return $stmt instanceof Throw_ || $stmt instanceof Exit_ || $stmt instanceof Return_ && $stmt->expr instanceof Expr || $stmt instanceof Yield_ || $stmt instanceof YieldFrom || $stmt instanceof Goto_;
     }
     private function isSwitchWithAlwaysReturnOrExit(Switch_ $switch) : bool
     {

src/Application/VersionResolver.php

@@ -19,12 +19,12 @@ final class VersionResolver
      * @api
      * @var string
      */
-    public const PACKAGE_VERSION = '2.1.0';
+    public const PACKAGE_VERSION = 'c671491e7141870aba0f138e3197876cee5eac7b';
     /**
      * @api
      * @var string
      */
-    public const RELEASE_DATE = '2025-06-24 22:23:49';
+    public const RELEASE_DATE = '2025-06-25 11:01:09';
     /**
      * @var int
      */