use directly ParamTagValueNode (#2412)

rectorphp · Jun 2, 2022 · ba0869a · ba0869a
1 parent d3a9210
commit ba0869a
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 69 deletions.
diff --git a/packages-tests/BetterPhpDocParser/PhpDocNodeMapperTest.php b/packages-tests/BetterPhpDocParser/PhpDocNodeMapperTest.php
@@ -11,7 +11,6 @@
 use PHPStan\PhpDocParser\Ast\Type\NullableTypeNode;
 use Rector\BetterPhpDocParser\PhpDocNodeMapper;
 use Rector\BetterPhpDocParser\ValueObject\Parser\BetterTokenIterator;
-use Rector\BetterPhpDocParser\ValueObject\PhpDoc\VariadicAwareParamTagValueNode;
 use Rector\Testing\PHPUnit\AbstractTestCase;
 
 final class PhpDocNodeMapperTest extends AbstractTestCase
@@ -36,7 +35,7 @@ public function testParamTag(): void
         // test param tag
         /** @var PhpDocTagNode $childNode */
         $propertyTagValueNode = $childNode->value;
-        $this->assertInstanceOf(VariadicAwareParamTagValueNode::class, $propertyTagValueNode);
+        $this->assertInstanceOf(ParamTagValueNode::class, $propertyTagValueNode);
     }
 
     /**

diff --git a/packages/BetterPhpDocParser/PhpDocNodeVisitor/ParamPhpDocNodeVisitor.php b/packages/BetterPhpDocParser/PhpDocNodeVisitor/ParamPhpDocNodeVisitor.php
diff --git a/packages/BetterPhpDocParser/ValueObject/PhpDoc/VariadicAwareParamTagValueNode.php b/packages/BetterPhpDocParser/ValueObject/PhpDoc/VariadicAwareParamTagValueNode.php
diff --git a/rules/DeadCode/PhpDoc/DeadParamTagValueNodeAnalyzer.php b/rules/DeadCode/PhpDoc/DeadParamTagValueNodeAnalyzer.php
@@ -16,7 +16,6 @@
 use PHPStan\PhpDocParser\Ast\PhpDoc\PhpDocTextNode;
 use PHPStan\PhpDocParser\Ast\Type\IdentifierTypeNode;
 use Rector\BetterPhpDocParser\PhpDocManipulator\PhpDocTypeChanger;
-use Rector\BetterPhpDocParser\ValueObject\PhpDoc\VariadicAwareParamTagValueNode;
 use Rector\BetterPhpDocParser\ValueObject\PhpDocAttributeKey;
 use Rector\BetterPhpDocParser\ValueObject\Type\BracketsAwareUnionTypeNode;
 use Rector\DeadCode\TypeNodeAnalyzer\GenericTypeNodeAnalyzer;
@@ -122,7 +121,7 @@ private function isTextNextline(int $key, PhpDocChildNode $phpDocChildNode): boo
 
     private function isUnionIdentifier(PhpDocTagNode $phpDocTagNode): bool
     {
-        if (! $phpDocTagNode->value instanceof VariadicAwareParamTagValueNode) {
+        if (! $phpDocTagNode->value instanceof ParamTagValueNode) {
             return true;
         }
 

diff --git a/rules/TypeDeclaration/PhpDocParser/ParamPhpDocNodeFactory.php b/rules/TypeDeclaration/PhpDocParser/ParamPhpDocNodeFactory.php
@@ -5,8 +5,8 @@
 namespace Rector\TypeDeclaration\PhpDocParser;
 
 use PhpParser\Node\Param;
+use PHPStan\PhpDocParser\Ast\PhpDoc\ParamTagValueNode;
 use PHPStan\PhpDocParser\Ast\Type\TypeNode;
-use Rector\BetterPhpDocParser\ValueObject\PhpDoc\VariadicAwareParamTagValueNode;
 use Rector\NodeNameResolver\NodeNameResolver;
 
 final class ParamPhpDocNodeFactory
@@ -16,9 +16,9 @@ public function __construct(
     ) {
     }
 
-    public function create(TypeNode $typeNode, Param $param): VariadicAwareParamTagValueNode
+    public function create(TypeNode $typeNode, Param $param): ParamTagValueNode
     {
-        return new VariadicAwareParamTagValueNode(
+        return new ParamTagValueNode(
             $typeNode,
             $param->variadic,
             '$' . $this->nodeNameResolver->getName($param),