fixup! fixup! fixup! inliner var

rectorphp · Dec 23, 2022 · 6aa6a7a · 6aa6a7a
1 parent d2af4bd
commit 6aa6a7a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/...DocParser/PhpDocParser/ClassAnnotationMatcher/ResolveTagToKnownFullyQualifiedNameTest.php b/...DocParser/PhpDocParser/ClassAnnotationMatcher/ResolveTagToKnownFullyQualifiedNameTest.php
@@ -6,6 +6,7 @@
 
 use Iterator;
 use PhpParser\Node\Stmt\Property;
+use PHPStan\PhpDoc\Tag\VarTag;
 use PHPStan\PhpDocParser\Ast\PhpDoc\VarTagValueNode;
 use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory;
 use Rector\BetterPhpDocParser\PhpDocParser\ClassAnnotationMatcher;
@@ -50,9 +51,11 @@ public function testResolvesClass(string $filePath): void
         foreach ($properties as $property) {
             /** @var Property $property */
             $phpDoc = $this->phpDocInfoFactory->createFromNodeOrEmpty($property);
-            /** @var VarTagValueNode $varTag */
-            $varTag = $phpDoc->getByType(VarTagValueNode::class)[0];
-            $value = $varTag->type->__toString();
+
+            $varTagValueNode = $phpDoc->getVarTagValueNode();
+            $this->assertInstanceOf(VarTagValueNode::class, $varTagValueNode);
+
+            $value = $varTagValueNode->type->__toString();
             $propertyName = strtolower($this->nodeNameResolver->getName($property));
 
             $result = $this->classAnnotationMatcher->resolveTagToKnownFullyQualifiedName($value, $property);

diff --git a/packages/BetterPhpDocParser/PhpDocInfo/PhpDocInfo.php b/packages/BetterPhpDocParser/PhpDocInfo/PhpDocInfo.php
@@ -12,6 +12,7 @@
 use PHPStan\PhpDocParser\Ast\PhpDoc\PhpDocNode;
 use PHPStan\PhpDocParser\Ast\PhpDoc\PhpDocTagNode;
 use PHPStan\PhpDocParser\Ast\PhpDoc\PhpDocTagValueNode;
+use PHPStan\PhpDocParser\Ast\PhpDoc\PhpDocTextNode;
 use PHPStan\PhpDocParser\Ast\PhpDoc\PropertyTagValueNode;
 use PHPStan\PhpDocParser\Ast\PhpDoc\ReturnTagValueNode;
 use PHPStan\PhpDocParser\Ast\PhpDoc\TemplateTagValueNode;

diff --git a/packages/BetterPhpDocParser/PhpDocManipulator/VarAnnotationManipulator.php b/packages/BetterPhpDocParser/PhpDocManipulator/VarAnnotationManipulator.php
@@ -15,7 +15,6 @@ final class VarAnnotationManipulator
     public function __construct(
         private readonly PhpDocInfoFactory $phpDocInfoFactory,
         private readonly PhpDocTypeChanger $phpDocTypeChanger,
-        private readonly BetterNodeFinder $betterNodeFinder
     ) {
     }