rectorphp · TomasVotruba · Mar 19, 2021 · Mar 19, 2021 · Mar 14, 2021 · Mar 14, 2021
diff --git a/composer.json b/composer.json
@@ -38,8 +38,8 @@
         "nette/robot-loader": "^3.4",
         "nette/utils": "^3.2",
         "nikic/php-parser": "^4.10.4",
-        "phpstan/phpdoc-parser": "^0.5",
         "phpstan/phpstan": "^0.12.82",
+        "phpstan/phpdoc-parser": "^0.5.1",
         "phpstan/phpstan-phpunit": "^0.12.18",
         "rector/rector-symfony": "dev-main",
         "rector/rector-nette": "dev-main",
@@ -52,32 +52,32 @@
         "symfony/http-kernel": "^4.4.8|^5.1",
         "symfony/process": "^4.4.8|^5.1",
         "symfony/uid": "^4.4.8|^5.1",
-        "symplify/astral": "^9.2",
-        "symplify/autowire-array-parameter": "^9.2",
-        "symplify/console-color-diff": "^9.2",
-        "symplify/package-builder": "^9.2",
-        "symplify/rule-doc-generator-contracts": "^9.2",
-        "symplify/set-config-resolver": "^9.2",
-        "symplify/simple-php-doc-parser": "^9.2",
-        "symplify/skipper": "^9.2",
-        "symplify/smart-file-system": "^9.2",
-        "symplify/symfony-php-config": "^9.2",
+        "symplify/astral": "^9.2.12",
+        "symplify/autowire-array-parameter": "^9.2.12",
+        "symplify/console-color-diff": "^9.2.12",
+        "symplify/package-builder": "^9.2.12",
+        "symplify/rule-doc-generator-contracts": "^9.2.12",
+        "symplify/set-config-resolver": "^9.2.12",
+        "symplify/simple-php-doc-parser": "^9.2.12",
+        "symplify/skipper": "^9.2.12",
+        "symplify/smart-file-system": "^9.2.12",
+        "symplify/symfony-php-config": "^9.2.12",
         "webmozart/assert": "^1.10"
     },
     "require-dev": {
-        "symplify/rule-doc-generator": "^9.2",
+        "symplify/rule-doc-generator": "^9.2.12",
         "friendsofphp/php-cs-fixer": "^2.18.3",
         "nette/application": "^3.0.7",
         "nette/di": "^3.0",
         "nette/forms": "^3.0",
         "phpstan/phpstan-nette": "^0.12.16",
         "phpunit/phpunit": "^9.5",
         "rector/rector-generator": "^0.1.1",
-        "symplify/coding-standard": "^9.2",
-        "symplify/easy-ci": "^9.2",
-        "symplify/easy-coding-standard": "^9.2",
-        "symplify/easy-testing": "^9.2",
-        "symplify/phpstan-extensions": "^9.2",
+        "symplify/coding-standard": "^9.2.12",
+        "symplify/easy-ci": "^9.2.12",
+        "symplify/easy-coding-standard": "^9.2.12",
+        "symplify/easy-testing": "^9.2.12",
+        "symplify/phpstan-extensions": "^9.2.12",
         "symplify/phpstan-rules": "^9.2",
         "tracy/tracy": "^2.8"
     },

diff --git a/packages-tests/BetterPhpDocParser/Attributes/Ast/AttributeAwareNodeFactoryTest.php b/packages-tests/BetterPhpDocParser/Attributes/Ast/AttributeAwareNodeFactoryTest.php
@@ -11,9 +11,6 @@
 use PHPStan\PhpDocParser\Ast\Type\IdentifierTypeNode;
 use PHPStan\PhpDocParser\Ast\Type\NullableTypeNode;
 use Rector\AttributeAwarePhpDoc\Ast\PhpDoc\AttributeAwarePhpDocNode;
-use Rector\AttributeAwarePhpDoc\Ast\PhpDoc\AttributeAwarePropertyTagValueNode;
-use Rector\AttributeAwarePhpDoc\Ast\Type\AttributeAwareIdentifierTypeNode;
-use Rector\AttributeAwarePhpDoc\Ast\Type\AttributeAwareNullableTypeNode;
 use Rector\BetterPhpDocParser\Attributes\Ast\AttributeAwareNodeFactory;
 use Rector\Core\HttpKernel\RectorKernel;
 use Symplify\PackageBuilder\Testing\AbstractKernelTestCase;
@@ -57,28 +54,17 @@ public function testPropertyTag(): void
         /** @var PhpDocTagNode $childNode */
         $propertyTagValueNode = $childNode->value;
         $this->assertInstanceOf(PropertyTagValueNode::class, $propertyTagValueNode);
-        $this->assertInstanceOf(AttributeAwarePropertyTagValueNode::class, $propertyTagValueNode);
 
         // test nullable
         /** @var PropertyTagValueNode $propertyTagValueNode */
         $nullableTypeNode = $propertyTagValueNode->type;
 
         $this->assertInstanceOf(NullableTypeNode::class, $nullableTypeNode);
-        $this->assertInstanceOf(AttributeAwareNullableTypeNode::class, $nullableTypeNode);
 
         // test type inside nullable
         /** @var NullableTypeNode $nullableTypeNode */
         $identifierTypeNode = $nullableTypeNode->type;
         $this->assertInstanceOf(IdentifierTypeNode::class, $identifierTypeNode);
-        $this->assertInstanceOf(AttributeAwareIdentifierTypeNode::class, $identifierTypeNode);
-    }
-
-    public function testAlreadyAttributeAware(): void
-    {
-        $attributeAwarePhpDocNode = new AttributeAwarePhpDocNode([]);
-        $returnedNode = $this->attributeAwareNodeFactory->createFromNode($attributeAwarePhpDocNode, '');
-
-        $this->assertSame($returnedNode, $attributeAwarePhpDocNode);
     }
 
     /**

diff --git a/...rPhpDocParser/PhpDocParser/TagValueNodeReprint/Fixture/DoctrineTable/TableWithIndexes.php b/...rPhpDocParser/PhpDocParser/TagValueNodeReprint/Fixture/DoctrineTable/TableWithIndexes.php
diff --git a/packages/AttributeAwarePhpDoc/Ast/PhpDoc/AttributeAwareDeprecatedTagValueNode.php b/packages/AttributeAwarePhpDoc/Ast/PhpDoc/AttributeAwareDeprecatedTagValueNode.php
diff --git a/packages/AttributeAwarePhpDoc/Ast/PhpDoc/AttributeAwareExtendsTagValueNode.php b/packages/AttributeAwarePhpDoc/Ast/PhpDoc/AttributeAwareExtendsTagValueNode.php
diff --git a/packages/AttributeAwarePhpDoc/Ast/PhpDoc/AttributeAwareGenericTagValueNode.php b/packages/AttributeAwarePhpDoc/Ast/PhpDoc/AttributeAwareGenericTagValueNode.php
diff --git a/packages/AttributeAwarePhpDoc/Ast/PhpDoc/AttributeAwareImplementsTagValueNode.php b/packages/AttributeAwarePhpDoc/Ast/PhpDoc/AttributeAwareImplementsTagValueNode.php
diff --git a/packages/AttributeAwarePhpDoc/Ast/PhpDoc/AttributeAwareInvalidTagValueNode.php b/packages/AttributeAwarePhpDoc/Ast/PhpDoc/AttributeAwareInvalidTagValueNode.php
diff --git a/packages/AttributeAwarePhpDoc/Ast/PhpDoc/AttributeAwareMethodTagValueNode.php b/packages/AttributeAwarePhpDoc/Ast/PhpDoc/AttributeAwareMethodTagValueNode.php
diff --git a/packages/AttributeAwarePhpDoc/Ast/PhpDoc/AttributeAwareMethodTagValueParameterNode.php b/packages/AttributeAwarePhpDoc/Ast/PhpDoc/AttributeAwareMethodTagValueParameterNode.php
diff --git a/packages/AttributeAwarePhpDoc/Ast/PhpDoc/AttributeAwareMixinTagValueNode.php b/packages/AttributeAwarePhpDoc/Ast/PhpDoc/AttributeAwareMixinTagValueNode.php
diff --git a/packages/AttributeAwarePhpDoc/Ast/PhpDoc/AttributeAwareParamTagValueNode.php b/packages/AttributeAwarePhpDoc/Ast/PhpDoc/AttributeAwareParamTagValueNode.php
@@ -5,14 +5,9 @@
 namespace Rector\AttributeAwarePhpDoc\Ast\PhpDoc;
 
 use PHPStan\PhpDocParser\Ast\PhpDoc\ParamTagValueNode;
-use Rector\BetterPhpDocParser\Attributes\Attribute\AttributeTrait;
-use Rector\BetterPhpDocParser\Contract\PhpDocNode\AttributeAwareNodeInterface;
-use Rector\BetterPhpDocParser\Contract\PhpDocNode\TypeAwareTagValueNodeInterface;
 
-final class AttributeAwareParamTagValueNode extends ParamTagValueNode implements AttributeAwareNodeInterface, TypeAwareTagValueNodeInterface
+final class AttributeAwareParamTagValueNode extends ParamTagValueNode
 {
-    use AttributeTrait;
-
     public function __toString(): string
     {
         $variadic = $this->isVariadic ? '...' : '';

diff --git a/packages/AttributeAwarePhpDoc/Ast/PhpDoc/AttributeAwarePhpDocNode.php b/packages/AttributeAwarePhpDoc/Ast/PhpDoc/AttributeAwarePhpDocNode.php
@@ -4,17 +4,16 @@
 
 namespace Rector\AttributeAwarePhpDoc\Ast\PhpDoc;
 
+use PHPStan\PhpDocParser\Ast\NodeAttributes;
 use PHPStan\PhpDocParser\Ast\PhpDoc\PhpDocChildNode;
-use Rector\BetterPhpDocParser\Attributes\Attribute\AttributeTrait;
-use Rector\BetterPhpDocParser\Contract\PhpDocNode\AttributeAwareNodeInterface;
 use Symplify\SimplePhpDocParser\ValueObject\Ast\PhpDoc\SimplePhpDocNode;
 
-final class AttributeAwarePhpDocNode extends SimplePhpDocNode implements AttributeAwareNodeInterface
+final class AttributeAwarePhpDocNode extends SimplePhpDocNode
 {
-    use AttributeTrait;
+    use NodeAttributes;
 
     /**
-     * @var PhpDocChildNode[]|AttributeAwareNodeInterface[]
+     * @var array<PhpDocChildNode>
      */
     public $children = [];
 

diff --git a/packages/AttributeAwarePhpDoc/Ast/PhpDoc/AttributeAwarePhpDocTagNode.php b/packages/AttributeAwarePhpDoc/Ast/PhpDoc/AttributeAwarePhpDocTagNode.php
diff --git a/packages/AttributeAwarePhpDoc/Ast/PhpDoc/AttributeAwarePhpDocTextNode.php b/packages/AttributeAwarePhpDoc/Ast/PhpDoc/AttributeAwarePhpDocTextNode.php
diff --git a/packages/AttributeAwarePhpDoc/Ast/PhpDoc/AttributeAwarePropertyTagValueNode.php b/packages/AttributeAwarePhpDoc/Ast/PhpDoc/AttributeAwarePropertyTagValueNode.php
diff --git a/packages/AttributeAwarePhpDoc/Ast/PhpDoc/AttributeAwareReturnTagValueNode.php b/packages/AttributeAwarePhpDoc/Ast/PhpDoc/AttributeAwareReturnTagValueNode.php
diff --git a/packages/AttributeAwarePhpDoc/Ast/PhpDoc/AttributeAwareTemplateTagValueNode.php b/packages/AttributeAwarePhpDoc/Ast/PhpDoc/AttributeAwareTemplateTagValueNode.php
@@ -7,13 +7,9 @@
 use Nette\Utils\Strings;
 use PHPStan\PhpDocParser\Ast\PhpDoc\TemplateTagValueNode;
 use PHPStan\PhpDocParser\Ast\Type\TypeNode;
-use Rector\BetterPhpDocParser\Attributes\Attribute\AttributeTrait;
-use Rector\BetterPhpDocParser\Contract\PhpDocNode\AttributeAwareNodeInterface;
 
-final class AttributeAwareTemplateTagValueNode extends TemplateTagValueNode implements AttributeAwareNodeInterface
+final class AttributeAwareTemplateTagValueNode extends TemplateTagValueNode
 {
-    use AttributeTrait;
-
     /**
      * @var string
      * @see https://regex101.com/r/4WtsUS/1

diff --git a/packages/AttributeAwarePhpDoc/Ast/PhpDoc/AttributeAwareThrowsTagValueNode.php b/packages/AttributeAwarePhpDoc/Ast/PhpDoc/AttributeAwareThrowsTagValueNode.php
diff --git a/packages/AttributeAwarePhpDoc/Ast/PhpDoc/AttributeAwareUsesTagValueNode.php b/packages/AttributeAwarePhpDoc/Ast/PhpDoc/AttributeAwareUsesTagValueNode.php
diff --git a/packages/AttributeAwarePhpDoc/Ast/PhpDoc/AttributeAwareVarTagValueNode.php b/packages/AttributeAwarePhpDoc/Ast/PhpDoc/AttributeAwareVarTagValueNode.php