Updated Rector to commit 4ed71aeee69c5f327243c840d2ead5cbf064e378

rectorphp/rector-src@4ed71ae Skip ClosureToArrowFunctionRector when closure has @var docblock (#7885)

Author: TomasVotruba

rules/Php74/NodeAnalyzer/ClosureArrowFunctionAnalyzer.php

@@ -11,11 +11,9 @@
 use PhpParser\Node\Expr\Variable;
 use PhpParser\Node\Stmt\Return_;
 use PHPStan\PhpDocParser\Ast\PhpDoc\VarTagValueNode;
-use PHPStan\Type\MixedType;
 use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfo;
 use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory;
 use Rector\NodeAnalyzer\CompactFuncCallAnalyzer;
-use Rector\NodeTypeResolver\NodeTypeResolver;
 use Rector\PhpParser\Comparing\NodeComparator;
 use Rector\PhpParser\Node\BetterNodeFinder;
 use Rector\Util\ArrayChecker;
@@ -37,21 +35,16 @@ final class ClosureArrowFunctionAnalyzer
      * @readonly
      */
     private PhpDocInfoFactory $phpDocInfoFactory;
-    /**
-     * @readonly
-     */
-    private NodeTypeResolver $nodeTypeResolver;
     /**
      * @readonly
      */
     private CompactFuncCallAnalyzer $compactFuncCallAnalyzer;
-    public function __construct(BetterNodeFinder $betterNodeFinder, NodeComparator $nodeComparator, ArrayChecker $arrayChecker, PhpDocInfoFactory $phpDocInfoFactory, NodeTypeResolver $nodeTypeResolver, CompactFuncCallAnalyzer $compactFuncCallAnalyzer)
+    public function __construct(BetterNodeFinder $betterNodeFinder, NodeComparator $nodeComparator, ArrayChecker $arrayChecker, PhpDocInfoFactory $phpDocInfoFactory, CompactFuncCallAnalyzer $compactFuncCallAnalyzer)
     {
         $this->betterNodeFinder = $betterNodeFinder;
         $this->nodeComparator = $nodeComparator;
         $this->arrayChecker = $arrayChecker;
         $this->phpDocInfoFactory = $phpDocInfoFactory;
-        $this->nodeTypeResolver = $nodeTypeResolver;
         $this->compactFuncCallAnalyzer = $compactFuncCallAnalyzer;
     }
     public function matchArrowFunctionExpr(Closure $closure): ?Expr
@@ -98,7 +91,8 @@ private function shouldSkipForUseVariableUsedByCompact(Closure $closure): bool
         });
     }
     /**
-     * Ensure @var doc usage with more specific type on purpose to be skipped
+     * Ensure @var doc usage to be skipped, as arrow functions do not support
+     * inline @var annotations for type narrowing (e.g. generic types like Builder<Team>)
      */
     private function shouldSkipMoreSpecificTypeWithVarDoc(Return_ $return, Expr $expr): bool
     {
@@ -107,21 +101,7 @@ private function shouldSkipMoreSpecificTypeWithVarDoc(Return_ $return, Expr $exp
             return \false;
         }
         $varTagValueNode = $phpDocInfo->getVarTagValueNode();
-        if (!$varTagValueNode instanceof VarTagValueNode) {
-            return \false;
-        }
-        $varType = $phpDocInfo->getVarType();
-        if ($varType instanceof MixedType) {
-            return \false;
-        }
-        $variableName = ltrim($varTagValueNode->variableName, '$');
-        $variable = $this->betterNodeFinder->findFirst($expr, static fn(Node $node): bool => $node instanceof Variable && $node->name === $variableName);
-        if (!$variable instanceof Variable) {
-            return \false;
-        }
-        $nativeVariableType = $this->nodeTypeResolver->getNativeType($variable);
-        // not equal with native type means more specific type
-        return !$nativeVariableType->equals($varType);
+        return $varTagValueNode instanceof VarTagValueNode;
     }
     private function shouldSkipForUsedReferencedValue(Closure $closure): bool
     {

src/Application/VersionResolver.php

@@ -19,12 +19,12 @@ final class VersionResolver
      * @api
      * @var string
      */
-    public const PACKAGE_VERSION = '142f1c81c7a9d26fd5119526186aba14f4cf6382';
+    public const PACKAGE_VERSION = '4ed71aeee69c5f327243c840d2ead5cbf064e378';
     /**
      * @api
      * @var string
      */
-    public const RELEASE_DATE = '2026-02-06 17:31:57';
+    public const RELEASE_DATE = '2026-02-08 11:29:50';
     /**
      * @var int
      */