Merge pull request #2048 from rectorphp/allow-variosu-doc-format

Add support for various annotation formats
rectorphp · Sep 27, 2019 · 641ede1 · 641ede1
2 parents 767dc05 + 1202ca2
commit 641ede1
Show file tree

Hide file tree

Showing 62 changed files with 364 additions and 195 deletions.
diff --git a/packages/BetterPhpDocParser/config/config.yaml b/packages/BetterPhpDocParser/config/config.yaml
@@ -5,7 +5,7 @@ services:
 
     Rector\BetterPhpDocParser\:
         resource: '../src'
-        exclude: '../src/{HttpKernel,ValueObject/*,*/*Info.php,*Info.php,Attributes/Ast/PhpDoc/*,Ast/PhpDoc/*,PhpDocNode/*}'
+        exclude: '../src/{ValueObject/*,*/*Info.php,*Info.php,Attributes/Ast/PhpDoc/*,PhpDocNode/*}'
 
     PHPStan\PhpDocParser\Lexer\Lexer: ~
     PHPStan\PhpDocParser\Parser\TypeParser: ~

diff --git a/packages/BetterPhpDocParser/src/AnnotationReader/AnnotationReaderFactory.php b/packages/BetterPhpDocParser/src/AnnotationReader/AnnotationReaderFactory.php
@@ -34,6 +34,9 @@ public function create(): AnnotationReader
         $annotationReader::addGlobalIgnoredName('Gedmo\SoftDeleteable');
         $annotationReader::addGlobalIgnoredName('SoftDeleteable');
 
+        // nette @inject dummy annotation
+        $annotationReader::addGlobalIgnoredName('inject');
+
         // warning: nested tags must be parse-able, e.g. @ORM\Table must include @ORM\UniqueConstraint!
 
         return $annotationReader;

diff --git a/packages/BetterPhpDocParser/src/Attributes/Ast/AttributeAwareNodeFactory.php b/packages/BetterPhpDocParser/src/Attributes/Ast/AttributeAwareNodeFactory.php
@@ -47,7 +47,7 @@
 use Rector\BetterPhpDocParser\Attributes\Ast\PhpDoc\Type\AttributeAwareNullableTypeNode;
 use Rector\BetterPhpDocParser\Attributes\Ast\PhpDoc\Type\AttributeAwareThisTypeNode;
 use Rector\BetterPhpDocParser\Attributes\Ast\PhpDoc\Type\AttributeAwareUnionTypeNode;
-use Rector\BetterPhpDocParser\Attributes\Contract\Ast\AttributeAwareNodeInterface;
+use Rector\BetterPhpDocParser\Contract\PhpDocNode\AttributeAwareNodeInterface;
 use Rector\Exception\NotImplementedYetException;
 use Rector\Exception\ShouldNotHappenException;
 

diff --git a/...ges/BetterPhpDocParser/src/Attributes/Ast/PhpDoc/AttributeAwareDeprecatedTagValueNode.php b/...ges/BetterPhpDocParser/src/Attributes/Ast/PhpDoc/AttributeAwareDeprecatedTagValueNode.php
@@ -4,7 +4,7 @@
 
 use PHPStan\PhpDocParser\Ast\PhpDoc\DeprecatedTagValueNode;
 use Rector\BetterPhpDocParser\Attributes\Attribute\AttributeTrait;
-use Rector\BetterPhpDocParser\Attributes\Contract\Ast\AttributeAwareNodeInterface;
+use Rector\BetterPhpDocParser\Contract\PhpDocNode\AttributeAwareNodeInterface;
 
 final class AttributeAwareDeprecatedTagValueNode extends DeprecatedTagValueNode implements AttributeAwareNodeInterface
 {

diff --git a/packages/BetterPhpDocParser/src/Attributes/Ast/PhpDoc/AttributeAwareGenericTagValueNode.php b/packages/BetterPhpDocParser/src/Attributes/Ast/PhpDoc/AttributeAwareGenericTagValueNode.php
@@ -4,7 +4,7 @@
 
 use PHPStan\PhpDocParser\Ast\PhpDoc\GenericTagValueNode;
 use Rector\BetterPhpDocParser\Attributes\Attribute\AttributeTrait;
-use Rector\BetterPhpDocParser\Attributes\Contract\Ast\AttributeAwareNodeInterface;
+use Rector\BetterPhpDocParser\Contract\PhpDocNode\AttributeAwareNodeInterface;
 
 final class AttributeAwareGenericTagValueNode extends GenericTagValueNode implements AttributeAwareNodeInterface
 {

diff --git a/packages/BetterPhpDocParser/src/Attributes/Ast/PhpDoc/AttributeAwareInvalidTagValueNode.php b/packages/BetterPhpDocParser/src/Attributes/Ast/PhpDoc/AttributeAwareInvalidTagValueNode.php
@@ -4,7 +4,7 @@
 
 use PHPStan\PhpDocParser\Ast\PhpDoc\InvalidTagValueNode;
 use Rector\BetterPhpDocParser\Attributes\Attribute\AttributeTrait;
-use Rector\BetterPhpDocParser\Attributes\Contract\Ast\AttributeAwareNodeInterface;
+use Rector\BetterPhpDocParser\Contract\PhpDocNode\AttributeAwareNodeInterface;
 
 final class AttributeAwareInvalidTagValueNode extends InvalidTagValueNode implements AttributeAwareNodeInterface
 {

diff --git a/packages/BetterPhpDocParser/src/Attributes/Ast/PhpDoc/AttributeAwareMethodTagValueNode.php b/packages/BetterPhpDocParser/src/Attributes/Ast/PhpDoc/AttributeAwareMethodTagValueNode.php
@@ -4,7 +4,7 @@
 
 use PHPStan\PhpDocParser\Ast\PhpDoc\MethodTagValueNode;
 use Rector\BetterPhpDocParser\Attributes\Attribute\AttributeTrait;
-use Rector\BetterPhpDocParser\Attributes\Contract\Ast\AttributeAwareNodeInterface;
+use Rector\BetterPhpDocParser\Contract\PhpDocNode\AttributeAwareNodeInterface;
 
 final class AttributeAwareMethodTagValueNode extends MethodTagValueNode implements AttributeAwareNodeInterface
 {

diff --git a/packages/BetterPhpDocParser/src/Attributes/Ast/PhpDoc/AttributeAwareParamTagValueNode.php b/packages/BetterPhpDocParser/src/Attributes/Ast/PhpDoc/AttributeAwareParamTagValueNode.php
@@ -5,7 +5,7 @@
 use PHPStan\PhpDocParser\Ast\PhpDoc\ParamTagValueNode;
 use PHPStan\PhpDocParser\Ast\Type\TypeNode;
 use Rector\BetterPhpDocParser\Attributes\Attribute\AttributeTrait;
-use Rector\BetterPhpDocParser\Attributes\Contract\Ast\AttributeAwareNodeInterface;
+use Rector\BetterPhpDocParser\Contract\PhpDocNode\AttributeAwareNodeInterface;
 
 final class AttributeAwareParamTagValueNode extends ParamTagValueNode implements AttributeAwareNodeInterface
 {

diff --git a/packages/BetterPhpDocParser/src/Attributes/Ast/PhpDoc/AttributeAwarePhpDocNode.php b/packages/BetterPhpDocParser/src/Attributes/Ast/PhpDoc/AttributeAwarePhpDocNode.php
@@ -5,7 +5,7 @@
 use PHPStan\PhpDocParser\Ast\PhpDoc\PhpDocChildNode;
 use PHPStan\PhpDocParser\Ast\PhpDoc\PhpDocNode;
 use Rector\BetterPhpDocParser\Attributes\Attribute\AttributeTrait;
-use Rector\BetterPhpDocParser\Attributes\Contract\Ast\AttributeAwareNodeInterface;
+use Rector\BetterPhpDocParser\Contract\PhpDocNode\AttributeAwareNodeInterface;
 
 final class AttributeAwarePhpDocNode extends PhpDocNode implements AttributeAwareNodeInterface
 {

diff --git a/packages/BetterPhpDocParser/src/Attributes/Ast/PhpDoc/AttributeAwarePhpDocTagNode.php b/packages/BetterPhpDocParser/src/Attributes/Ast/PhpDoc/AttributeAwarePhpDocTagNode.php
@@ -4,7 +4,7 @@
 
 use PHPStan\PhpDocParser\Ast\PhpDoc\PhpDocTagNode;
 use Rector\BetterPhpDocParser\Attributes\Attribute\AttributeTrait;
-use Rector\BetterPhpDocParser\Attributes\Contract\Ast\AttributeAwareNodeInterface;
+use Rector\BetterPhpDocParser\Contract\PhpDocNode\AttributeAwareNodeInterface;
 
 final class AttributeAwarePhpDocTagNode extends PhpDocTagNode implements AttributeAwareNodeInterface
 {

diff --git a/packages/BetterPhpDocParser/src/Attributes/Ast/PhpDoc/AttributeAwarePhpDocTextNode.php b/packages/BetterPhpDocParser/src/Attributes/Ast/PhpDoc/AttributeAwarePhpDocTextNode.php
@@ -4,7 +4,7 @@
 
 use PHPStan\PhpDocParser\Ast\PhpDoc\PhpDocTextNode;
 use Rector\BetterPhpDocParser\Attributes\Attribute\AttributeTrait;
-use Rector\BetterPhpDocParser\Attributes\Contract\Ast\AttributeAwareNodeInterface;
+use Rector\BetterPhpDocParser\Contract\PhpDocNode\AttributeAwareNodeInterface;
 
 final class AttributeAwarePhpDocTextNode extends PhpDocTextNode implements AttributeAwareNodeInterface
 {

diff --git a/packages/BetterPhpDocParser/src/Attributes/Ast/PhpDoc/AttributeAwarePropertyTagValueNode.php b/packages/BetterPhpDocParser/src/Attributes/Ast/PhpDoc/AttributeAwarePropertyTagValueNode.php
@@ -4,7 +4,7 @@
 
 use PHPStan\PhpDocParser\Ast\PhpDoc\PropertyTagValueNode;
 use Rector\BetterPhpDocParser\Attributes\Attribute\AttributeTrait;
-use Rector\BetterPhpDocParser\Attributes\Contract\Ast\AttributeAwareNodeInterface;
+use Rector\BetterPhpDocParser\Contract\PhpDocNode\AttributeAwareNodeInterface;
 
 final class AttributeAwarePropertyTagValueNode extends PropertyTagValueNode implements AttributeAwareNodeInterface
 {

diff --git a/packages/BetterPhpDocParser/src/Attributes/Ast/PhpDoc/AttributeAwareReturnTagValueNode.php b/packages/BetterPhpDocParser/src/Attributes/Ast/PhpDoc/AttributeAwareReturnTagValueNode.php
@@ -4,7 +4,7 @@
 
 use PHPStan\PhpDocParser\Ast\PhpDoc\ReturnTagValueNode;
 use Rector\BetterPhpDocParser\Attributes\Attribute\AttributeTrait;
-use Rector\BetterPhpDocParser\Attributes\Contract\Ast\AttributeAwareNodeInterface;
+use Rector\BetterPhpDocParser\Contract\PhpDocNode\AttributeAwareNodeInterface;
 
 final class AttributeAwareReturnTagValueNode extends ReturnTagValueNode implements AttributeAwareNodeInterface
 {

diff --git a/packages/BetterPhpDocParser/src/Attributes/Ast/PhpDoc/AttributeAwareThrowsTagValueNode.php b/packages/BetterPhpDocParser/src/Attributes/Ast/PhpDoc/AttributeAwareThrowsTagValueNode.php
@@ -4,7 +4,7 @@
 
 use PHPStan\PhpDocParser\Ast\PhpDoc\ThrowsTagValueNode;
 use Rector\BetterPhpDocParser\Attributes\Attribute\AttributeTrait;
-use Rector\BetterPhpDocParser\Attributes\Contract\Ast\AttributeAwareNodeInterface;
+use Rector\BetterPhpDocParser\Contract\PhpDocNode\AttributeAwareNodeInterface;
 
 final class AttributeAwareThrowsTagValueNode extends ThrowsTagValueNode implements AttributeAwareNodeInterface
 {

diff --git a/packages/BetterPhpDocParser/src/Attributes/Ast/PhpDoc/AttributeAwareVarTagValueNode.php b/packages/BetterPhpDocParser/src/Attributes/Ast/PhpDoc/AttributeAwareVarTagValueNode.php
@@ -4,7 +4,7 @@
 
 use PHPStan\PhpDocParser\Ast\PhpDoc\VarTagValueNode;
 use Rector\BetterPhpDocParser\Attributes\Attribute\AttributeTrait;
-use Rector\BetterPhpDocParser\Attributes\Contract\Ast\AttributeAwareNodeInterface;
+use Rector\BetterPhpDocParser\Contract\PhpDocNode\AttributeAwareNodeInterface;
 
 final class AttributeAwareVarTagValueNode extends VarTagValueNode implements AttributeAwareNodeInterface
 {

diff --git a/packages/BetterPhpDocParser/src/Attributes/Ast/PhpDoc/SpacelessPhpDocTagNode.php b/packages/BetterPhpDocParser/src/Attributes/Ast/PhpDoc/SpacelessPhpDocTagNode.php
@@ -4,7 +4,7 @@
 
 use PHPStan\PhpDocParser\Ast\PhpDoc\PhpDocTagNode;
 use Rector\BetterPhpDocParser\Attributes\Attribute\AttributeTrait;
-use Rector\BetterPhpDocParser\Attributes\Contract\Ast\AttributeAwareNodeInterface;
+use Rector\BetterPhpDocParser\Contract\PhpDocNode\AttributeAwareNodeInterface;
 
 /**
  * Useful for annotation class based annotation, e.g. @ORM\Entity to prevent space

diff --git a/packages/BetterPhpDocParser/src/Attributes/Ast/PhpDoc/Type/AttributeAwareArrayTypeNode.php b/packages/BetterPhpDocParser/src/Attributes/Ast/PhpDoc/Type/AttributeAwareArrayTypeNode.php
@@ -4,7 +4,7 @@
 
 use PHPStan\PhpDocParser\Ast\Type\ArrayTypeNode;
 use Rector\BetterPhpDocParser\Attributes\Attribute\AttributeTrait;
-use Rector\BetterPhpDocParser\Attributes\Contract\Ast\AttributeAwareNodeInterface;
+use Rector\BetterPhpDocParser\Contract\PhpDocNode\AttributeAwareNodeInterface;
 
 final class AttributeAwareArrayTypeNode extends ArrayTypeNode implements AttributeAwareNodeInterface
 {

diff --git a/...ages/BetterPhpDocParser/src/Attributes/Ast/PhpDoc/Type/AttributeAwareCallableTypeNode.php b/...ages/BetterPhpDocParser/src/Attributes/Ast/PhpDoc/Type/AttributeAwareCallableTypeNode.php
@@ -4,7 +4,7 @@
 
 use PHPStan\PhpDocParser\Ast\Type\CallableTypeNode;
 use Rector\BetterPhpDocParser\Attributes\Attribute\AttributeTrait;
-use Rector\BetterPhpDocParser\Attributes\Contract\Ast\AttributeAwareNodeInterface;
+use Rector\BetterPhpDocParser\Contract\PhpDocNode\AttributeAwareNodeInterface;
 
 final class AttributeAwareCallableTypeNode extends CallableTypeNode implements AttributeAwareNodeInterface
 {

diff --git a/packages/BetterPhpDocParser/src/Attributes/Ast/PhpDoc/Type/AttributeAwareGenericTypeNode.php b/packages/BetterPhpDocParser/src/Attributes/Ast/PhpDoc/Type/AttributeAwareGenericTypeNode.php
@@ -4,7 +4,7 @@
 
 use PHPStan\PhpDocParser\Ast\Type\GenericTypeNode;
 use Rector\BetterPhpDocParser\Attributes\Attribute\AttributeTrait;
-use Rector\BetterPhpDocParser\Attributes\Contract\Ast\AttributeAwareNodeInterface;
+use Rector\BetterPhpDocParser\Contract\PhpDocNode\AttributeAwareNodeInterface;
 
 final class AttributeAwareGenericTypeNode extends GenericTypeNode implements AttributeAwareNodeInterface
 {

diff --git a/...es/BetterPhpDocParser/src/Attributes/Ast/PhpDoc/Type/AttributeAwareIdentifierTypeNode.php b/...es/BetterPhpDocParser/src/Attributes/Ast/PhpDoc/Type/AttributeAwareIdentifierTypeNode.php
@@ -4,7 +4,7 @@
 
 use PHPStan\PhpDocParser\Ast\Type\IdentifierTypeNode;
 use Rector\BetterPhpDocParser\Attributes\Attribute\AttributeTrait;
-use Rector\BetterPhpDocParser\Attributes\Contract\Ast\AttributeAwareNodeInterface;
+use Rector\BetterPhpDocParser\Contract\PhpDocNode\AttributeAwareNodeInterface;
 
 final class AttributeAwareIdentifierTypeNode extends IdentifierTypeNode implements AttributeAwareNodeInterface
 {

diff --git a/.../BetterPhpDocParser/src/Attributes/Ast/PhpDoc/Type/AttributeAwareIntersectionTypeNode.php b/.../BetterPhpDocParser/src/Attributes/Ast/PhpDoc/Type/AttributeAwareIntersectionTypeNode.php
@@ -4,7 +4,7 @@
 
 use PHPStan\PhpDocParser\Ast\Type\IntersectionTypeNode;
 use Rector\BetterPhpDocParser\Attributes\Attribute\AttributeTrait;
-use Rector\BetterPhpDocParser\Attributes\Contract\Ast\AttributeAwareNodeInterface;
+use Rector\BetterPhpDocParser\Contract\PhpDocNode\AttributeAwareNodeInterface;
 
 final class AttributeAwareIntersectionTypeNode extends IntersectionTypeNode implements AttributeAwareNodeInterface
 {

diff --git a/...ages/BetterPhpDocParser/src/Attributes/Ast/PhpDoc/Type/AttributeAwareNullableTypeNode.php b/...ages/BetterPhpDocParser/src/Attributes/Ast/PhpDoc/Type/AttributeAwareNullableTypeNode.php
@@ -4,7 +4,7 @@
 
 use PHPStan\PhpDocParser\Ast\Type\NullableTypeNode;
 use Rector\BetterPhpDocParser\Attributes\Attribute\AttributeTrait;
-use Rector\BetterPhpDocParser\Attributes\Contract\Ast\AttributeAwareNodeInterface;
+use Rector\BetterPhpDocParser\Contract\PhpDocNode\AttributeAwareNodeInterface;
 
 final class AttributeAwareNullableTypeNode extends NullableTypeNode implements AttributeAwareNodeInterface
 {

diff --git a/packages/BetterPhpDocParser/src/Attributes/Ast/PhpDoc/Type/AttributeAwareThisTypeNode.php b/packages/BetterPhpDocParser/src/Attributes/Ast/PhpDoc/Type/AttributeAwareThisTypeNode.php
@@ -4,7 +4,7 @@
 
 use PHPStan\PhpDocParser\Ast\Type\ThisTypeNode;
 use Rector\BetterPhpDocParser\Attributes\Attribute\AttributeTrait;
-use Rector\BetterPhpDocParser\Attributes\Contract\Ast\AttributeAwareNodeInterface;
+use Rector\BetterPhpDocParser\Contract\PhpDocNode\AttributeAwareNodeInterface;
 
 final class AttributeAwareThisTypeNode extends ThisTypeNode implements AttributeAwareNodeInterface
 {

diff --git a/packages/BetterPhpDocParser/src/Attributes/Ast/PhpDoc/Type/AttributeAwareUnionTypeNode.php b/packages/BetterPhpDocParser/src/Attributes/Ast/PhpDoc/Type/AttributeAwareUnionTypeNode.php
@@ -4,7 +4,7 @@
 
 use PHPStan\PhpDocParser\Ast\Type\UnionTypeNode;
 use Rector\BetterPhpDocParser\Attributes\Attribute\AttributeTrait;
-use Rector\BetterPhpDocParser\Attributes\Contract\Ast\AttributeAwareNodeInterface;
+use Rector\BetterPhpDocParser\Contract\PhpDocNode\AttributeAwareNodeInterface;
 
 final class AttributeAwareUnionTypeNode extends UnionTypeNode implements AttributeAwareNodeInterface
 {

diff --git a/packages/BetterPhpDocParser/src/Contract/Doctrine/OriginalTagAwareInterface.php b/packages/BetterPhpDocParser/src/Contract/Doctrine/OriginalTagAwareInterface.php
diff --git a/...tract/Ast/AttributeAwareNodeInterface.php → ...hpDocNode/AttributeAwareNodeInterface.php b/...tract/Ast/AttributeAwareNodeInterface.php → ...hpDocNode/AttributeAwareNodeInterface.php
@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 
-namespace Rector\BetterPhpDocParser\Attributes\Contract\Ast;
+namespace Rector\BetterPhpDocParser\Contract\PhpDocNode;
 
 use PHPStan\PhpDocParser\Ast\Node;
 

diff --git a/packages/BetterPhpDocParser/src/Contract/PhpDocNode/TagAwareNodeInterface.php b/packages/BetterPhpDocParser/src/Contract/PhpDocNode/TagAwareNodeInterface.php
@@ -0,0 +1,8 @@
+<?php declare(strict_types=1);
+
+namespace Rector\BetterPhpDocParser\Contract\PhpDocNode;
+
+interface TagAwareNodeInterface
+{
+    public function getTag(): ?string;
+}
diff --git a/packages/BetterPhpDocParser/src/Contract/PhpDocParserExtensionInterface.php b/packages/BetterPhpDocParser/src/Contract/PhpDocParserExtensionInterface.php
diff --git a/packages/BetterPhpDocParser/src/PhpDocInfo/PhpDocInfo.php b/packages/BetterPhpDocParser/src/PhpDocInfo/PhpDocInfo.php
@@ -14,7 +14,7 @@
 use Rector\BetterPhpDocParser\Attributes\Ast\PhpDoc\AttributeAwarePhpDocNode;
 use Rector\BetterPhpDocParser\Attributes\Ast\PhpDoc\AttributeAwareReturnTagValueNode;
 use Rector\BetterPhpDocParser\Attributes\Ast\PhpDoc\AttributeAwareVarTagValueNode;
-use Rector\BetterPhpDocParser\Attributes\Contract\Ast\AttributeAwareNodeInterface;
+use Rector\BetterPhpDocParser\Contract\PhpDocNode\AttributeAwareNodeInterface;
 use Rector\Exception\ShouldNotHappenException;
 use Rector\NodeTypeResolver\StaticTypeMapper;
 

diff --git a/packages/BetterPhpDocParser/src/PhpDocInfo/PhpDocInfoFactory.php b/packages/BetterPhpDocParser/src/PhpDocInfo/PhpDocInfoFactory.php
@@ -8,8 +8,8 @@
 use PHPStan\PhpDocParser\Parser\TokenIterator;
 use Rector\BetterPhpDocParser\Attributes\Ast\PhpDoc\AttributeAwarePhpDocNode;
 use Rector\BetterPhpDocParser\Attributes\Attribute\Attribute;
-use Rector\BetterPhpDocParser\Attributes\Contract\Ast\AttributeAwareNodeInterface;
-use Rector\BetterPhpDocParser\PhpDocParser\OrmTagParser;
+use Rector\BetterPhpDocParser\Contract\PhpDocNode\AttributeAwareNodeInterface;
+use Rector\BetterPhpDocParser\Contract\PhpDocNodeFactoryInterface;
 use Rector\Configuration\CurrentNodeProvider;
 use Rector\Exception\ShouldNotHappenException;
 use Rector\NodeTypeResolver\StaticTypeMapper;
@@ -61,7 +61,7 @@ public function createFromNode(Node $node): PhpDocInfo
             return $this->phpDocInfoByObjectHash[$hash];
         }
 
-        /** needed for @see OrmTagParser */
+        /** needed for @see PhpDocNodeFactoryInterface */
         $this->currentNodeProvider->setNode($node);
 
         $content = $node->getDocComment()->getText();

diff --git a/packages/BetterPhpDocParser/src/PhpDocInfo/TokenIteratorFactory.php b/packages/BetterPhpDocParser/src/PhpDocInfo/TokenIteratorFactory.php
@@ -0,0 +1,26 @@
+<?php declare(strict_types=1);
+
+namespace Rector\BetterPhpDocParser\PhpDocInfo;
+
+use PHPStan\PhpDocParser\Lexer\Lexer;
+use PHPStan\PhpDocParser\Parser\TokenIterator;
+
+final class TokenIteratorFactory
+{
+    /**
+     * @var Lexer
+     */
+    private $lexer;
+
+    public function __construct(Lexer $lexer)
+    {
+        $this->lexer = $lexer;
+    }
+
+    public function create(string $content): TokenIterator
+    {
+        $tokens = $this->lexer->tokenize($content);
+
+        return new TokenIterator($tokens);
+    }
+}
diff --git a/...arser/Ast/PhpDoc/AbstractTagValueNode.php → ...r/src/PhpDocNode/AbstractTagValueNode.php b/...arser/Ast/PhpDoc/AbstractTagValueNode.php → ...r/src/PhpDocNode/AbstractTagValueNode.php
@@ -1,12 +1,13 @@
 <?php declare(strict_types=1);
 
-namespace Rector\BetterPhpDocParser\PhpDocParser\Ast\PhpDoc;
+namespace Rector\BetterPhpDocParser\PhpDocNode;
 
 use Nette\Utils\Json;
 use Nette\Utils\Strings;
 use PHPStan\PhpDocParser\Ast\PhpDoc\PhpDocTagValueNode;
 use Rector\BetterPhpDocParser\Attributes\Attribute\AttributeTrait;
-use Rector\BetterPhpDocParser\Attributes\Contract\Ast\AttributeAwareNodeInterface;
+use Rector\BetterPhpDocParser\Contract\PhpDocNode\AttributeAwareNodeInterface;
+use Rector\BetterPhpDocParser\Contract\PhpDocNode\TagAwareNodeInterface;
 use Rector\BetterPhpDocParser\Utils\ArrayItemStaticHelper;
 
 abstract class AbstractTagValueNode implements AttributeAwareNodeInterface, PhpDocTagValueNode
@@ -71,25 +72,39 @@ protected function printContentItems(array $contentItems): string
     /**
      * @param PhpDocTagValueNode[] $tagValueNodes
      */
-    protected function printNestedTag(array $tagValueNodes, string $shortName, string $label): string
+    protected function printNestedTag(array $tagValueNodes, string $label, bool $haveFinalComma = false): string
     {
-        $tagValueNodesAsString = $this->printTagValueNodesSeparatedByComma($tagValueNodes, $shortName);
+        $tagValueNodesAsString = $this->printTagValueNodesSeparatedByComma($tagValueNodes);
 
-        return sprintf('%s={%s%s%s}', $label, PHP_EOL . '    ', $tagValueNodesAsString, PHP_EOL);
+        return sprintf(
+            '%s={%s%s%s%s}',
+            $label,
+            PHP_EOL . '    ',
+            $tagValueNodesAsString,
+            $haveFinalComma ? ',' : '',
+            PHP_EOL
+        );
     }
 
     /**
      * @param PhpDocTagValueNode[] $tagValueNodes
      */
-    protected function printTagValueNodesSeparatedByComma(array $tagValueNodes, string $prefix = ''): string
+    protected function printTagValueNodesSeparatedByComma(array $tagValueNodes): string
     {
         if ($tagValueNodes === []) {
             return '';
         }
 
         $itemsAsStrings = [];
         foreach ($tagValueNodes as $tagValueNode) {
-            $itemsAsStrings[] = $prefix . (string) $tagValueNode;
+            $item = '';
+            if ($tagValueNode instanceof TagAwareNodeInterface) {
+                $item .= $tagValueNode->getTag();
+            }
+
+            $item .= (string) $tagValueNode;
+
+            $itemsAsStrings[] = $item;
         }
 
         return implode(', ', $itemsAsStrings);