Fix Printer

Author: ondrejmirtes

src/Printer/Printer.php

@@ -100,6 +100,8 @@ final class Printer
 		GenericTypeNode::class . '->genericTypes' => ', ',
 		ConstExprArrayNode::class . '->items' => ', ',
 		MethodTagValueNode::class . '->parameters' => ', ',
+		DoctrineArray::class . '->items' => ', ',
+		DoctrineAnnotation::class . '->arguments' => ', ',
 	];
 
 	/**
@@ -111,6 +113,8 @@ final class Printer
 		CallableTypeNode::class . '->parameters' => ['(', '', ''],
 		ArrayShapeNode::class . '->items' => ['{', '', ''],
 		ObjectShapeNode::class . '->items' => ['{', '', ''],
+		DoctrineArray::class . '->items' => ['{', '', ''],
+		DoctrineAnnotation::class . '->arguments' => ['(', '', ''],
 	];
 
 	/** @var array<string, list<class-string<TypeNode>>> */

tests/PHPStan/Parser/PhpDocParserTest.php

@@ -5980,6 +5980,22 @@ public function dataDeepNodesLinesAndIndexes(): iterable
 				[6, 6, 18, 18], // ConstExprIntegerNode
 			],
 		];
+
+		yield [
+			'/**' . PHP_EOL .
+			' * @\Foo\Bar({' . PHP_EOL .
+			' * }' . PHP_EOL .
+			' * )' . PHP_EOL .
+			' */',
+			[
+				[1, 5, 0, 10], // PhpDocNode
+				[2, 4, 2, 8], // PhpDocTagNode
+				[2, 4, 3, 8], // DoctrineTagValueNode
+				[2, 4, 3, 8], // DoctrineAnnotation
+				[2, 4, 4, 6], // DoctrineArgument
+				[2, 4, 4, 6], // DoctrineArray
+			],
+		];
 	}
 
 

tests/PHPStan/Printer/PrinterTest.php

@@ -12,6 +12,9 @@
 use PHPStan\PhpDocParser\Ast\Node;
 use PHPStan\PhpDocParser\Ast\NodeTraverser;
 use PHPStan\PhpDocParser\Ast\NodeVisitor;
+use PHPStan\PhpDocParser\Ast\PhpDoc\Doctrine\DoctrineAnnotation;
+use PHPStan\PhpDocParser\Ast\PhpDoc\Doctrine\DoctrineArgument;
+use PHPStan\PhpDocParser\Ast\PhpDoc\Doctrine\DoctrineArray;
 use PHPStan\PhpDocParser\Ast\PhpDoc\Doctrine\DoctrineArrayItem;
 use PHPStan\PhpDocParser\Ast\PhpDoc\MethodTagValueNode;
 use PHPStan\PhpDocParser\Ast\PhpDoc\ParamTagValueNode;
@@ -46,6 +49,7 @@
 use function array_unshift;
 use function array_values;
 use function count;
+use const PHP_EOL;
 
 class PrinterTest extends TestCase
 {
@@ -1532,6 +1536,105 @@ public function enterNode(Node $node)
 
 			},
 		];
+
+		yield [
+			'/** @Foo() */',
+			'/** @Foo(1, 2, 3) */',
+			new class extends AbstractNodeVisitor {
+
+				public function enterNode(Node $node)
+				{
+					if ($node instanceof DoctrineAnnotation) {
+						$node->arguments = [
+							new DoctrineArgument(null, new ConstExprIntegerNode('1')),
+							new DoctrineArgument(null, new ConstExprIntegerNode('2')),
+							new DoctrineArgument(null, new ConstExprIntegerNode('3')),
+						];
+					}
+
+					return $node;
+				}
+
+			},
+		];
+
+		yield [
+			'/** @Foo(
+			  *     1,
+			  *     2,
+			  *  ) */',
+			'/** @Foo(
+			  *     1,
+			  *     2,
+			  *     3,
+			  *  ) */',
+			new class extends AbstractNodeVisitor {
+
+				public function enterNode(Node $node)
+				{
+					if ($node instanceof DoctrineAnnotation) {
+						$node->arguments[] = new DoctrineArgument(null, new ConstExprIntegerNode('3'));
+					}
+
+					return $node;
+				}
+
+			},
+		];
+
+		yield [
+			'/**' . PHP_EOL .
+			' * @X({' . PHP_EOL .
+			' *     1,' . PHP_EOL .
+			' *     2' . PHP_EOL .
+			' *    ,    ' . PHP_EOL .
+			' *     3,' . PHP_EOL .
+			' * }' . PHP_EOL .
+			' * )' . PHP_EOL .
+			' */',
+			'/**' . PHP_EOL .
+			' * @X({' . PHP_EOL .
+			' *     1,' . PHP_EOL .
+			' *     2' . PHP_EOL .
+			' *    ,    ' . PHP_EOL .
+			' *     3,' . PHP_EOL .
+			' *     4,' . PHP_EOL .
+			' * }' . PHP_EOL .
+			' * )' . PHP_EOL .
+			' */',
+			new class extends AbstractNodeVisitor {
+
+				public function enterNode(Node $node)
+				{
+					if ($node instanceof DoctrineArray) {
+						$node->items[] = new DoctrineArrayItem(null, new ConstExprIntegerNode('4'));
+					}
+
+					return $node;
+				}
+
+			},
+		];
+
+		yield [
+			'/** @Foo() */',
+			'/** @Bar() */',
+			new class extends AbstractNodeVisitor {
+
+				public function enterNode(Node $node)
+				{
+					if ($node instanceof PhpDocTagNode) {
+						$node->name = '@Bar';
+					}
+					if ($node instanceof DoctrineAnnotation) {
+						$node->name = '@Bar';
+					}
+
+					return $node;
+				}
+
+			},
+		];
 	}
 
 	/**