Updated Rector to commit 909090d68bd4a522c7986459c038c7c46a926948

rectorphp/rector-src@909090d [DeadCode] Keep generic @var/@return self<...> narrowing annotations (#8147)

Author: TomasVotruba

rules/DeadCode/Rector/ClassMethod/RemoveDuplicatedReturnSelfDocblockRector.php

@@ -10,6 +10,7 @@
 use PHPStan\PhpDocParser\Ast\PhpDoc\ReturnTagValueNode;
 use PHPStan\PhpDocParser\Ast\Type\TypeNode;
 use PHPStan\Reflection\ClassReflection;
+use PHPStan\Type\Generic\GenericObjectType;
 use PHPStan\Type\ObjectType;
 use PHPStan\Type\StaticType;
 use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfo;
@@ -117,6 +118,10 @@ public function refactor(Node $node): ?Node
     private function isCurrentObjectReturnDocType(TypeNode $typeNode, ClassMethod $classMethod, ClassReflection $classReflection): bool
     {
         $docType = $this->staticTypeMapper->mapPHPStanPhpDocTypeNodeToPHPStanType($typeNode, $classMethod);
+        // generic narrowing, e.g. @return self<TValue, never> is not a plain duplicate of the native self type
+        if ($docType instanceof GenericObjectType) {
+            return \false;
+        }
         // covers @return $this and @return static
         if ($docType instanceof StaticType) {
             return $docType->getClassName() === $classReflection->getName();

rules/DeadCode/Rector/Node/RemoveNonExistingVarAnnotationRector.php

@@ -21,6 +21,7 @@
 use PhpParser\Node\Stmt\Switch_;
 use PhpParser\Node\Stmt\While_;
 use PHPStan\PhpDocParser\Ast\PhpDoc\VarTagValueNode;
+use PHPStan\PhpDocParser\Ast\Type\GenericTypeNode;
 use PHPStan\PhpDocParser\Ast\Type\IdentifierTypeNode;
 use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory;
 use Rector\Comments\NodeDocBlock\DocBlockUpdater;
@@ -138,7 +139,7 @@ public function refactor(Node $node): ?Node
                     continue;
                 }
                 $variableName = ltrim($varTagValueNode->variableName, '$');
-                if ($variableName === '' && $this->isAllowedEmptyVariableName($stmt)) {
+                if ($variableName === '' && $this->isAllowedEmptyVariableName($stmt, $varTagValueNode)) {
                     continue;
                 }
                 if ($this->hasVariableName($stmt, $variableName)) {
@@ -214,11 +215,26 @@ private function isObjectShapePseudoType(VarTagValueNode $varTagValueNode): bool
         }
         return strpos($varTagValueNode->description, '}') !== \false;
     }
-    private function isAllowedEmptyVariableName(Stmt $stmt): bool
+    private function isAllowedEmptyVariableName(Stmt $stmt, VarTagValueNode $varTagValueNode): bool
     {
         if ($stmt instanceof Return_ && $stmt->expr instanceof CallLike && !$stmt->expr instanceof New_) {
             return \true;
         }
+        // generic/template narrowing over the instantiated class, e.g. /** @var self<TValue, never> */ return new self(...)
+        if ($stmt instanceof Return_ && $stmt->expr instanceof New_ && $this->isGenericTypeOfNewClass($stmt->expr, $varTagValueNode)) {
+            return \true;
+        }
         return $stmt instanceof Expression && $stmt->expr instanceof Assign && $stmt->expr->var instanceof Variable;
     }
+    private function isGenericTypeOfNewClass(New_ $new, VarTagValueNode $varTagValueNode): bool
+    {
+        if (!$varTagValueNode->type instanceof GenericTypeNode) {
+            return \false;
+        }
+        $newClassName = $this->getName($new->class);
+        if ($newClassName === null) {
+            return \false;
+        }
+        return strcasecmp($varTagValueNode->type->type->name, $newClassName) === 0;
+    }
 }

src/Application/VersionResolver.php

@@ -19,12 +19,12 @@ final class VersionResolver
      * @api
      * @var string
      */
-    public const PACKAGE_VERSION = '9ca6fae0e4ed28519c8e942971e3e347bf74229b';
+    public const PACKAGE_VERSION = '909090d68bd4a522c7986459c038c7c46a926948';
     /**
      * @api
      * @var string
      */
-    public const RELEASE_DATE = '2026-07-05 11:23:59';
+    public const RELEASE_DATE = '2026-07-05 14:50:36';
     /**
      * @var int
      */