[DeadCode] Skip @template tag on RemoveUselessVarTagRector

rules-tests/DeadCode/Rector/Property/RemoveUselessVarTagRector/Fixture/non_existing_object.php.inc

@@ -0,0 +1,26 @@
+<?php
+
+namespace Rector\Tests\DeadCode\Rector\Property\RemoveUselessVarTagRector\Fixture;
+
+use Rector\Tests\DeadCode\Rector\Property\RemoveUselessVarTagRector\Source\Properties;
+
+final class NonExistingObject
+{
+    /** @var SomeNonExistingObject */
+    private Properties|null $properties;
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\DeadCode\Rector\Property\RemoveUselessVarTagRector\Fixture;
+
+use Rector\Tests\DeadCode\Rector\Property\RemoveUselessVarTagRector\Source\Properties;
+
+final class NonExistingObject
+{
+    private Properties|null $properties;
+}
+
+?>

rules-tests/DeadCode/Rector/Property/RemoveUselessVarTagRector/Fixture/skip_template_tag.php.inc

@@ -0,0 +1,14 @@
+<?php
+
+namespace Rector\Tests\DeadCode\Rector\Property\RemoveUselessVarTagRector\Fixture;
+
+use Rector\Tests\DeadCode\Rector\Property\RemoveUselessVarTagRector\Source\Properties;
+
+/**
+ * @template TProperties of Properties|null
+ */
+final class SkipTemplateTag
+{
+    /** @var TProperties */
+    private Properties|null $properties;
+}

rules-tests/DeadCode/Rector/Property/RemoveUselessVarTagRector/Source/Properties.php

@@ -0,0 +1,5 @@
+<?php
+
+namespace Rector\Tests\DeadCode\Rector\Property\RemoveUselessVarTagRector\Source;
+
+interface Properties{}

rules-tests/Renaming/Rector/Name/RenameClassRector/Source/MyNamespace/MylegacyClass.php

@@ -0,0 +1,7 @@
+<?php
+
+namespace MyNamespace;
+
+class MylegacyClass
+{
+}

rules/TypeDeclaration/PHPStan/ObjectTypeSpecifier.php

@@ -11,13 +11,19 @@
 use PhpParser\Node\Stmt\Use_;
 use PhpParser\Node\Stmt\UseUse;
 use PHPStan\Analyser\Scope;
+use PHPStan\PhpDoc\Tag\TemplateTag;
+use PHPStan\Reflection\ClassReflection;
 use PHPStan\Reflection\ReflectionProvider;
 use PHPStan\Type\Generic\GenericObjectType;
+use PHPStan\Type\Generic\TemplateType;
+use PHPStan\Type\Generic\TemplateTypeFactory;
+use PHPStan\Type\Generic\TemplateTypeScope;
 use PHPStan\Type\MixedType;
 use PHPStan\Type\ObjectType;
 use PHPStan\Type\TypeWithClassName;
 use PHPStan\Type\UnionType;
 use Rector\Naming\Naming\UseImportsResolver;
+use Rector\StaticTypeMapper\Naming\NameScopeFactory;
 use Rector\StaticTypeMapper\ValueObject\Type\AliasedObjectType;
 use Rector\StaticTypeMapper\ValueObject\Type\FullyQualifiedObjectType;
 use Rector\StaticTypeMapper\ValueObject\Type\NonExistingObjectType;
@@ -29,14 +35,15 @@
     public function __construct(
         private ReflectionProvider $reflectionProvider,
         private UseImportsResolver $useImportsResolver,
+        private NameScopeFactory $nameScopeFactory
     ) {
     }
 
     public function narrowToFullyQualifiedOrAliasedObjectType(
         Node $node,
         ObjectType $objectType,
         Scope|null $scope
-    ): TypeWithClassName | NonExistingObjectType | UnionType | MixedType {
+    ): TypeWithClassName | NonExistingObjectType | UnionType | MixedType | TemplateType {
         $uses = $this->useImportsResolver->resolve();
 
         $aliasedObjectType = $this->matchAliasedObjectType($objectType, $uses);
@@ -66,6 +73,35 @@ public function narrowToFullyQualifiedOrAliasedObjectType(
             }
         }
 
+        if ($scope instanceof Scope) {
+            $classReflection = $scope->getClassReflection();
+            if ($classReflection instanceof ClassReflection) {
+                $templateTags = $classReflection->getTemplateTags();
+                $nameScope = $this->nameScopeFactory->createNameScopeFromNodeWithoutTemplateTypes($node);
+                $templateTypeScope = $nameScope->getTemplateTypeScope();
+
+                if (! $templateTypeScope instanceof TemplateTypeScope) {
+                    // invalid type
+                    return new NonExistingObjectType($className);
+                }
+
+                // only support single @template for now
+                if (count($templateTags) !== 1) {
+                    // invalid type
+                    return new NonExistingObjectType($className);
+                }
+
+                /** @var TemplateTag $currentTemplateTag */
+                $currentTemplateTag = current($templateTags);
+                return TemplateTypeFactory::create(
+                    $templateTypeScope,
+                    $currentTemplateTag->getName(),
+                    $currentTemplateTag->getBound(),
+                    $currentTemplateTag->getVariance()
+                );
+            }
+        }
+
         // invalid type
         return new NonExistingObjectType($className);
     }

src/NodeTypeResolver/TypeComparator/TypeComparator.php

@@ -11,6 +11,7 @@
 use PHPStan\Type\BooleanType;
 use PHPStan\Type\Constant\ConstantBooleanType;
 use PHPStan\Type\ConstantScalarType;
+use PHPStan\Type\Generic\TemplateType;
 use PHPStan\Type\MixedType;
 use PHPStan\Type\ObjectType;
 use PHPStan\Type\StaticType;
@@ -75,6 +76,10 @@ public function arePhpParserAndPhpStanPhpDocTypesEqual(
             $node
         );
 
+        if ($phpStanDocType instanceof TemplateType) {
+            return false;
+        }
+
         if (! $this->areTypesEqual($phpParserNodeType, $phpStanDocType) && $this->isSubtype(
             $phpStanDocType,
             $phpParserNodeType

src/PhpAttribute/Contract/AnnotationToAttributeMapperInterface.php

@@ -16,5 +16,5 @@ public function isCandidate(mixed $value): bool;
     /**
      * @param T $value
      */
-    public function map($value): Expr;
+    public function map(mixed $value): Expr;
 }