[DeadCode] Allow remove useless @var on typed class constant as well …

…on RemoveUselessVarTagRector (#6633) * [DeadCode] Allow remove useless @var on typed class constant as well on RemoveUselessVarTagRector * grammar
rectorphp · Dec 28, 2024 · dfe6f2d · dfe6f2d
1 parent 7bbe9ba
commit dfe6f2d
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 5 deletions.
diff --git a/...sts/DeadCode/Rector/Property/RemoveUselessVarTagRector/Fixture/with_constant_type.php.inc b/...sts/DeadCode/Rector/Property/RemoveUselessVarTagRector/Fixture/with_constant_type.php.inc
@@ -0,0 +1,24 @@
+<?php
+
+namespace Rector\Tests\DeadCode\Rector\Property\RemoveUselessVarTagRector\Fixture;
+
+final class WithConstantType
+{
+    /**
+     * @var string
+     */
+    public const string NAME = 'value';
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\DeadCode\Rector\Property\RemoveUselessVarTagRector\Fixture;
+
+final class WithConstantType
+{
+    public const string NAME = 'value';
+}
+
+?>
diff --git a/rules/DeadCode/PhpDoc/DeadVarTagValueNodeAnalyzer.php b/rules/DeadCode/PhpDoc/DeadVarTagValueNodeAnalyzer.php
@@ -5,6 +5,7 @@
 namespace Rector\DeadCode\PhpDoc;
 
 use PhpParser\Node;
+use PhpParser\Node\Stmt\ClassConst;
 use PhpParser\Node\Stmt\Property;
 use PHPStan\PhpDocParser\Ast\PhpDoc\VarTagValueNode;
 use PHPStan\Type\IntersectionType;
@@ -24,7 +25,7 @@ public function __construct(
     ) {
     }
 
-    public function isDead(VarTagValueNode $varTagValueNode, Property $property): bool
+    public function isDead(VarTagValueNode $varTagValueNode, Property|ClassConst $property): bool
     {
         if (! $property->type instanceof Node) {
             return false;

diff --git a/rules/DeadCode/PhpDoc/TagRemover/VarTagRemover.php b/rules/DeadCode/PhpDoc/TagRemover/VarTagRemover.php
@@ -6,6 +6,7 @@
 
 use PhpParser\Node;
 use PhpParser\Node\Param;
+use PhpParser\Node\Stmt\ClassConst;
 use PhpParser\Node\Stmt\Expression;
 use PhpParser\Node\Stmt\Property;
 use PHPStan\PhpDocParser\Ast\PhpDoc\VarTagValueNode;
@@ -31,7 +32,7 @@ public function __construct(
     ) {
     }
 
-    public function removeVarTagIfUseless(PhpDocInfo $phpDocInfo, Property $property): bool
+    public function removeVarTagIfUseless(PhpDocInfo $phpDocInfo, Property|ClassConst $property): bool
     {
         $varTagValueNode = $phpDocInfo->getVarTagValueNode();
         if (! $varTagValueNode instanceof VarTagValueNode) {

diff --git a/rules/DeadCode/Rector/Property/RemoveUselessVarTagRector.php b/rules/DeadCode/Rector/Property/RemoveUselessVarTagRector.php
@@ -5,6 +5,7 @@
 namespace Rector\DeadCode\Rector\Property;
 
 use PhpParser\Node;
+use PhpParser\Node\Stmt\ClassConst;
 use PhpParser\Node\Stmt\Property;
 use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory;
 use Rector\DeadCode\PhpDoc\TagRemover\VarTagRemover;
@@ -25,7 +26,7 @@ public function __construct(
 
     public function getRuleDefinition(): RuleDefinition
     {
-        return new RuleDefinition('Remove unused @var annotation for properties', [
+        return new RuleDefinition('Remove unused @var annotation for properties and class constants', [
             new CodeSample(
                 <<<'CODE_SAMPLE'
 final class SomeClass
@@ -53,11 +54,11 @@ final class SomeClass
      */
     public function getNodeTypes(): array
     {
-        return [Property::class];
+        return [Property::class, ClassConst::class];
     }
 
     /**
-     * @param Property $node
+     * @param Property|ClassConst $node
      */
     public function refactor(Node $node): ?Node
     {