Merge branch refs/heads/1.21.x into 1.22.x

Author: phpstan-bot

Diff for: src/Parser/PhpDocParser.php

@@ -137,12 +137,8 @@ private function enrichWithAttributes(TokenIterator $tokens, Ast\Node $tag, int
 
 		if ($this->useIndexAttributes) {
 			$tokensArray = $tokens->getTokens();
-			if ($tokensArray[$endIndex][Lexer::TYPE_OFFSET] === Lexer::TOKEN_CLOSE_PHPDOC) {
-				$endIndex--;
-				if ($tokensArray[$endIndex][Lexer::TYPE_OFFSET] === Lexer::TOKEN_HORIZONTAL_WS) {
-					$endIndex--;
-				}
-			} elseif ($tokensArray[$endIndex][Lexer::TYPE_OFFSET] === Lexer::TOKEN_PHPDOC_EOL) {
+			$endIndex--;
+			if ($tokensArray[$endIndex][Lexer::TYPE_OFFSET] === Lexer::TOKEN_HORIZONTAL_WS) {
 				$endIndex--;
 			}
 

Diff for: tests/PHPStan/Parser/PhpDocParserTest.php

@@ -5614,7 +5614,7 @@ public function dataLinesAndIndexes(): iterable
 		yield [
 			'/** @phpstan-import-type TypeAlias from AnotherClass[] */',
 			[
-				[1, 1, 8, 12],
+				[1, 1, 8, 11],
 			],
 		];
 

Diff for: tests/PHPStan/Printer/PrinterTest.php

@@ -7,6 +7,7 @@
 use PHPStan\PhpDocParser\Ast\ConstExpr\ConstExprArrayItemNode;
 use PHPStan\PhpDocParser\Ast\ConstExpr\ConstExprArrayNode;
 use PHPStan\PhpDocParser\Ast\ConstExpr\ConstExprIntegerNode;
+use PHPStan\PhpDocParser\Ast\ConstExpr\ConstFetchNode;
 use PHPStan\PhpDocParser\Ast\ConstExpr\QuoteAwareConstExprStringNode;
 use PHPStan\PhpDocParser\Ast\Node;
 use PHPStan\PhpDocParser\Ast\NodeTraverser;
@@ -23,6 +24,7 @@
 use PHPStan\PhpDocParser\Ast\Type\ArrayTypeNode;
 use PHPStan\PhpDocParser\Ast\Type\CallableTypeNode;
 use PHPStan\PhpDocParser\Ast\Type\CallableTypeParameterNode;
+use PHPStan\PhpDocParser\Ast\Type\ConstTypeNode;
 use PHPStan\PhpDocParser\Ast\Type\GenericTypeNode;
 use PHPStan\PhpDocParser\Ast\Type\IdentifierTypeNode;
 use PHPStan\PhpDocParser\Ast\Type\IntersectionTypeNode;
@@ -1426,6 +1428,57 @@ public function enterNode(Node $node)
 
 			},
 		];
+
+		yield [
+			'/** @param \DateTimeImmutable::ATOM $date */',
+			'/** @param DateTimeImmutable::ATOM $date */',
+			new class extends AbstractNodeVisitor {
+
+				public function enterNode(Node $node)
+				{
+					if ($node instanceof ParamTagValueNode) {
+						$node->type = new ConstTypeNode(new ConstFetchNode('DateTimeImmutable', 'ATOM'));
+					}
+
+					return $node;
+				}
+
+			},
+		];
+
+		yield [
+			'/** @param \Lorem\Ipsum $ipsum */',
+			'/** @param Ipsum $ipsum */',
+			new class extends AbstractNodeVisitor {
+
+				public function enterNode(Node $node)
+				{
+					if ($node instanceof ParamTagValueNode) {
+						$node->type = new IdentifierTypeNode('Ipsum');
+					}
+
+					return $node;
+				}
+
+			},
+		];
+
+		yield [
+			'/** @phpstan-import-type Foo from \Bar as Lorem */',
+			'/** @phpstan-import-type Foo from Bar as Lorem */',
+			new class extends AbstractNodeVisitor {
+
+				public function enterNode(Node $node)
+				{
+					if ($node instanceof TypeAliasImportTagValueNode) {
+						$node->importedFrom = new IdentifierTypeNode('Bar');
+					}
+
+					return $node;
+				}
+
+			},
+		];
 	}
 
 	/**