Updated Rector to commit 142f1c81c7a9d26fd5119526186aba14f4cf6382

rectorphp/rector-src@142f1c8 [DeadCode] Handle only remove 1 @var on multi vars on RemoveUselessVarTagRector (#7884)

Author: TomasVotruba

rules/DeadCode/PhpDoc/TagRemover/VarTagRemover.php

@@ -54,23 +54,23 @@ public function __construct(DoctrineTypeAnalyzer $doctrineTypeAnalyzer, PhpDocIn
         $this->typeComparator = $typeComparator;
     }
     /**
-     * @param \PhpParser\Node\Stmt\Property|\PhpParser\Node\Stmt\ClassConst|\PhpParser\Node\Stmt\Expression $property
+     * @param \PhpParser\Node\Stmt\Property|\PhpParser\Node\Stmt\ClassConst|\PhpParser\Node\Stmt\Expression $node
      */
-    public function removeVarTagIfUseless(PhpDocInfo $phpDocInfo, $property): bool
+    public function removeVarTagIfUseless(PhpDocInfo $phpDocInfo, $node): bool
     {
         $varTagValueNode = $phpDocInfo->getVarTagValueNode();
         if (!$varTagValueNode instanceof VarTagValueNode) {
             return \false;
         }
-        $isVarTagValueDead = $this->deadVarTagValueNodeAnalyzer->isDead($varTagValueNode, $property);
+        $isVarTagValueDead = $this->deadVarTagValueNodeAnalyzer->isDead($varTagValueNode, $node);
         if (!$isVarTagValueDead) {
             return \false;
         }
         if ($this->phpDocTypeChanger->isAllowed($varTagValueNode->type)) {
             return \false;
         }
-        $phpDocInfo->removeByType(VarTagValueNode::class);
-        $this->docBlockUpdater->updateRefactoredNodeWithPhpDocInfo($property);
+        $phpDocInfo->removeByType(VarTagValueNode::class, $varTagValueNode->variableName);
+        $this->docBlockUpdater->updateRefactoredNodeWithPhpDocInfo($node);
         return \true;
     }
     /**

src/Application/VersionResolver.php

@@ -19,12 +19,12 @@ final class VersionResolver
      * @api
      * @var string
      */
-    public const PACKAGE_VERSION = '2.3.6';
+    public const PACKAGE_VERSION = '142f1c81c7a9d26fd5119526186aba14f4cf6382';
     /**
      * @api
      * @var string
      */
-    public const RELEASE_DATE = '2026-02-05 16:20:29';
+    public const RELEASE_DATE = '2026-02-06 17:31:57';
     /**
      * @var int
      */

src/BetterPhpDocParser/PhpDocInfo/PhpDocInfo.php

@@ -232,6 +232,9 @@ public function findOneByAnnotationClass(string $desiredClass): ?DoctrineAnnotat
     public function removeByType(string $typeToRemove, ?string $name = null): bool
     {
         $hasChanged = \false;
+        if ($name === '') {
+            $name = null;
+        }
         $phpDocNodeTraverser = new PhpDocNodeTraverser();
         $phpDocNodeTraverser->traverseWithCallable($this->phpDocNode, '', static function (Node $node) use ($typeToRemove, &$hasChanged, $name): ?int {
             if ($node instanceof PhpDocTagNode && $node->value instanceof $typeToRemove) {

src/Comments/NodeDocBlock/DocBlockUpdater.php

@@ -39,7 +39,19 @@ public function updateRefactoredNodeWithPhpDocInfo(Node $node): void
     }
     private function setCommentsAttribute(Node $node): void
     {
-        $comments = array_filter($node->getComments(), static fn(Comment $comment): bool => !$comment instanceof Doc);
+        $docComment = $node->getDocComment();
+        $docCommentText = $docComment instanceof Doc ? $docComment->getText() : null;
+        $comments = array_filter($node->getComments(), static function (Comment $comment) use ($docCommentText): bool {
+            if (!$comment instanceof Doc) {
+                return \true;
+            }
+            // remove only the docblock that belongs to the node itself;
+            // keep other preceding docblocks (possible with multiple @var docblocks before a statement)
+            if ($docCommentText !== null && $comment->getText() === $docCommentText) {
+                return \false;
+            }
+            return \true;
+        });
         $node->setAttribute(AttributeKey::COMMENTS, array_values($comments));
     }
     private function clearEmptyDoc(Node $node): void