Updated Rector to commit eac1efd2ac2c2fce0ee6ed758d52f57acbf08a27

rectorphp/rector-src@eac1efd [DeadCode] Allow remove @var on expression assign on RemoveUselessVarTagRector (#7871)

Author: TomasVotruba

rules/CodingStyle/Rector/Catch_/CatchExceptionNameMatchingTypeRector.php

@@ -93,7 +93,6 @@ public function refactor(Node $node): ?Node
             $catch = $stmt->catches[0];
             /** @var Variable $catchVar */
             $catchVar = $catch->var;
-            /** @var string $oldVariableName */
             $oldVariableName = (string) $this->getName($catchVar);
             $typeShortName = $this->resolveVariableName($catch->types[0]);
             $newVariableName = $this->resolveNewVariableName($typeShortName);

rules/DeadCode/PhpDoc/DeadVarTagValueNodeAnalyzer.php

@@ -4,7 +4,10 @@
 namespace Rector\DeadCode\PhpDoc;
 
 use PhpParser\Node;
+use PhpParser\Node\Expr;
+use PhpParser\Node\Expr\Assign;
 use PhpParser\Node\Stmt\ClassConst;
+use PhpParser\Node\Stmt\Expression;
 use PhpParser\Node\Stmt\Property;
 use PHPStan\PhpDocParser\Ast\PhpDoc\VarTagValueNode;
 use PHPStan\PhpDocParser\Ast\Type\GenericTypeNode;
@@ -14,6 +17,7 @@
 use PHPStan\Type\UnionType;
 use Rector\DeadCode\PhpDoc\Guard\TemplateTypeRemovalGuard;
 use Rector\NodeTypeResolver\TypeComparator\TypeComparator;
+use Rector\PHPStan\ScopeFetcher;
 use Rector\StaticTypeMapper\StaticTypeMapper;
 final class DeadVarTagValueNodeAnalyzer
 {
@@ -36,22 +40,43 @@ public function __construct(TypeComparator $typeComparator, StaticTypeMapper $st
         $this->templateTypeRemovalGuard = $templateTypeRemovalGuard;
     }
     /**
-     * @param \PhpParser\Node\Stmt\Property|\PhpParser\Node\Stmt\ClassConst $property
+     * @param \PhpParser\Node\Stmt\Property|\PhpParser\Node\Stmt\ClassConst|\PhpParser\Node\Stmt\Expression $node
      */
-    public function isDead(VarTagValueNode $varTagValueNode, $property): bool
+    public function isDead(VarTagValueNode $varTagValueNode, $node): bool
     {
-        if (!$property->type instanceof Node) {
+        if (!$node instanceof Expression && !$node->type instanceof Node) {
             return \false;
         }
         if ($varTagValueNode->description !== '') {
             return \false;
         }
+        $targetNode = null;
+        if ($node instanceof Expression && $node->expr instanceof Assign) {
+            $targetNode = $node->expr->expr;
+        } elseif ($node instanceof Property || $node instanceof ClassConst) {
+            $targetNode = $node->type;
+        }
+        // allow Identifier, ComplexType, and Name on Property and ClassConst
+        if (!$targetNode instanceof Node) {
+            return \false;
+        }
         if ($varTagValueNode->type instanceof GenericTypeNode) {
             return \false;
         }
         // is strict type superior to doc type? keep strict type only
-        $propertyType = $this->staticTypeMapper->mapPhpParserNodePHPStanType($property->type);
-        $docType = $this->staticTypeMapper->mapPHPStanPhpDocTypeNodeToPHPStanType($varTagValueNode->type, $property);
+        $propertyType = $this->staticTypeMapper->mapPhpParserNodePHPStanType($targetNode);
+        $docType = $this->staticTypeMapper->mapPHPStanPhpDocTypeNodeToPHPStanType($varTagValueNode->type, $node);
+        if ($node instanceof Expression) {
+            $scope = ScopeFetcher::fetch($node);
+            // only allow Expr on assign expr
+            if (!$targetNode instanceof Expr) {
+                return \false;
+            }
+            $nativeType = $scope->getNativeType($targetNode);
+            if (!$docType->equals($nativeType)) {
+                return \false;
+            }
+        }
         if (!$this->templateTypeRemovalGuard->isLegal($docType)) {
             return \false;
         }
@@ -62,7 +87,7 @@ public function isDead(VarTagValueNode $varTagValueNode, $property): bool
             // more specific type is already in the property
             return $docType->isSuperTypeOf($propertyType)->yes();
         }
-        if ($this->typeComparator->arePhpParserAndPhpStanPhpDocTypesEqual($property->type, $varTagValueNode->type, $property)) {
+        if ($this->typeComparator->arePhpParserAndPhpStanPhpDocTypesEqual($targetNode, $varTagValueNode->type, $node)) {
             return \true;
         }
         return $docType instanceof UnionType && $this->typeComparator->areTypesEqual(TypeCombinator::removeNull($docType), $propertyType);

rules/DeadCode/PhpDoc/TagRemover/VarTagRemover.php

@@ -54,7 +54,7 @@ public function __construct(DoctrineTypeAnalyzer $doctrineTypeAnalyzer, PhpDocIn
         $this->typeComparator = $typeComparator;
     }
     /**
-     * @param \PhpParser\Node\Stmt\Property|\PhpParser\Node\Stmt\ClassConst $property
+     * @param \PhpParser\Node\Stmt\Property|\PhpParser\Node\Stmt\ClassConst|\PhpParser\Node\Stmt\Expression $property
      */
     public function removeVarTagIfUseless(PhpDocInfo $phpDocInfo, $property): bool
     {

rules/DeadCode/Rector/Property/RemoveUselessVarTagRector.php

@@ -5,6 +5,7 @@
 
 use PhpParser\Node;
 use PhpParser\Node\Stmt\ClassConst;
+use PhpParser\Node\Stmt\Expression;
 use PhpParser\Node\Stmt\Property;
 use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory;
 use Rector\DeadCode\PhpDoc\TagRemover\VarTagRemover;
@@ -53,10 +54,10 @@ final class SomeClass
      */
     public function getNodeTypes(): array
     {
-        return [Property::class, ClassConst::class];
+        return [Property::class, ClassConst::class, Expression::class];
     }
     /**
-     * @param Property|ClassConst $node
+     * @param Property|ClassConst|Expression $node
      */
     public function refactor(Node $node): ?Node
     {

rules/Php55/RegexMatcher.php

@@ -49,7 +49,6 @@ public function resolvePatternExpressionWithoutEIfFound(Expr $expr)
                     $delimiter = $delimiter;
                     break;
             }
-            /** @var string $modifiers */
             $modifiers = $this->resolveModifiers((string) Strings::after($pattern, $delimiter, -1));
             if (strpos($modifiers, 'e') === \false) {
                 return null;

src/Application/VersionResolver.php

@@ -19,12 +19,12 @@ final class VersionResolver
      * @api
      * @var string
      */
-    public const PACKAGE_VERSION = '6d81eab51f2637758ad0fbee47b2b6e3fb6309c8';
+    public const PACKAGE_VERSION = 'eac1efd2ac2c2fce0ee6ed758d52f57acbf08a27';
     /**
      * @api
      * @var string
      */
-    public const RELEASE_DATE = '2026-02-01 00:55:31';
+    public const RELEASE_DATE = '2026-02-01 16:47:01';
     /**
      * @var int
      */