Updated Rector to commit 3bc3c849b36368f898f9a79ff13a7c9cbed3ddae

rectorphp/rector-src@3bc3c84 Revert goto handling on ExplicitReturnNullRector (#7021)

Author: TomasVotruba

rules/CodeQuality/Rector/ClassMethod/ExplicitReturnNullRector.php

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

@@ -25,7 +25,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;
@@ -96,25 +95,13 @@ 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;
             }
             if ($this->isStopped($stmt)) {
                 return \true;
             }
-            if ($stmt instanceof Goto_ && $hasAlwaysReturnOrExitAfterLabelPosition < $key) {
-                return \true;
-            }
             // has switch with always return
             if ($stmt instanceof Switch_ && $this->isSwitchWithAlwaysReturnOrExit($stmt)) {
                 return \true;

src/Application/VersionResolver.php

@@ -19,12 +19,12 @@ final class VersionResolver
      * @api
      * @var string
      */
-    public const PACKAGE_VERSION = '3dacd700b6cf461af650cd2714a460f08cc3d6fb';
+    public const PACKAGE_VERSION = '3bc3c849b36368f898f9a79ff13a7c9cbed3ddae';
     /**
      * @api
      * @var string
      */
-    public const RELEASE_DATE = '2025-06-25 16:45:58';
+    public const RELEASE_DATE = '2025-06-25 16:55:43';
     /**
      * @var int
      */

vendor/scoper-autoload.php

@@ -14,7 +14,7 @@
     // Restore the backup and ensure the excluded files are properly marked as loaded
     $GLOBALS['__composer_autoload_files'] = \array_merge(
         $existingComposerAutoloadFiles,
-        \array_fill_keys(['0e6d7bf4a5811bfa5cf40c5ccd6fae6a', '5928a00fa978807cf85d90ec3f4b0147'], true)
+        \array_fill_keys(['5928a00fa978807cf85d90ec3f4b0147', '0e6d7bf4a5811bfa5cf40c5ccd6fae6a'], true)
     );
 
     return $loader;