From f5578df9b8b39050e2daf8073681790405a52cf5 Mon Sep 17 00:00:00 2001
From: Tomas Votruba <tomas.vot@gmail.com>
Date: Fri, 1 Mar 2019 12:59:42 +0100
Subject: [PATCH] [NodeTypeResolver] Add attribute factory to
 DocBlockManipulator

---
 .../src/PhpDoc/NodeAnalyzer/DocBlockManipulator.php   | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/packages/NodeTypeResolver/src/PhpDoc/NodeAnalyzer/DocBlockManipulator.php b/packages/NodeTypeResolver/src/PhpDoc/NodeAnalyzer/DocBlockManipulator.php
index 0e3fb37c47a..f534de75df9 100644
--- a/packages/NodeTypeResolver/src/PhpDoc/NodeAnalyzer/DocBlockManipulator.php
+++ b/packages/NodeTypeResolver/src/PhpDoc/NodeAnalyzer/DocBlockManipulator.php
@@ -7,6 +7,7 @@ use PhpParser\Comment\Doc;
 use PhpParser\Node;
 use PHPStan\PhpDocParser\Ast\PhpDoc\PhpDocChildNode;
 use PHPStan\PhpDocParser\Ast\PhpDoc\PhpDocTagNode;
+use Rector\BetterPhpDocParser\Attributes\Ast\AttributeAwareNodeFactory;
 use Rector\BetterPhpDocParser\Attributes\Ast\PhpDoc\AttributeAwareParamTagValueNode;
 use Rector\BetterPhpDocParser\Attributes\Ast\PhpDoc\AttributeAwarePhpDocNode;
 use Rector\BetterPhpDocParser\Attributes\Ast\PhpDoc\AttributeAwarePhpDocTagNode;
@@ -45,17 +46,23 @@ final class DocBlockManipulator
      * @var TypeAnalyzer
      */
     private $typeAnalyzer;
+    /**
+     * @var AttributeAwareNodeFactory
+     */
+    private $attributeAwareNodeFactory;
 
     public function __construct(
         PhpDocInfoFactory $phpDocInfoFactory,
         PhpDocInfoPrinter $phpDocInfoPrinter,
         PhpDocModifier $phpDocModifier,
-        TypeAnalyzer $typeAnalyzer
+        TypeAnalyzer $typeAnalyzer,
+        AttributeAwareNodeFactory $attributeAwareNodeFactory
     ) {
         $this->phpDocInfoFactory = $phpDocInfoFactory;
         $this->phpDocInfoPrinter = $phpDocInfoPrinter;
         $this->phpDocModifier = $phpDocModifier;
         $this->typeAnalyzer = $typeAnalyzer;
+        $this->attributeAwareNodeFactory = $attributeAwareNodeFactory;
     }
 
     public function hasTag(Node $node, string $name): bool
@@ -90,6 +97,8 @@ final class DocBlockManipulator
 
     public function addTag(Node $node, PhpDocChildNode $phpDocChildNode): void
     {
+        $phpDocChildNode = $this->attributeAwareNodeFactory->createFromNode($phpDocChildNode);
+
         if ($node->getDocComment() !== null) {
             $phpDocInfo = $this->createPhpDocInfoFromNode($node);
             $phpDocNode = $phpDocInfo->getPhpDocNode();