Merge pull request #367 from dereuromark/phpstan-update

Compat with phpstan parser v2

Author: dereuromark

composer.json

@@ -34,7 +34,7 @@
 		"php": ">=8.1",
 		"cakephp/bake": "^3.0.4",
 		"cakephp/cakephp": "^5.0.7",
-		"phpstan/phpdoc-parser": "^1.23.1",
+		"phpstan/phpdoc-parser": "^1.23.1 || ^2.1.0",
 		"sebastian/diff": "^5.0 || ^6.0",
 		"squizlabs/php_codesniffer": "^3.8"
 	},

src/Annotator/Traits/DocBlockTrait.php

@@ -21,6 +21,7 @@
 use PHPStan\PhpDocParser\Parser\PhpDocParser;
 use PHPStan\PhpDocParser\Parser\TokenIterator;
 use PHPStan\PhpDocParser\Parser\TypeParser;
+use PHPStan\PhpDocParser\ParserConfig;
 
 /**
  * Common functionality around doc block parsing and writing.
@@ -36,13 +37,27 @@ trait DocBlockTrait {
 	protected static function getValueNode(string $tagName, string $tagComment): PhpDocTagValueNode {
 		static $phpDocParser;
 		if (!$phpDocParser) {
-			$constExprParser = new ConstExprParser();
-			$phpDocParser = new PhpDocParser(new TypeParser($constExprParser), $constExprParser);
+			if (class_exists(ParserConfig::class)) {
+				$config = new ParserConfig(usedAttributes: []);
+				$constExprParser = new ConstExprParser($config);
+				$phpDocParser = new PhpDocParser($config, new TypeParser($config, $constExprParser), $constExprParser);
+			} else {
+				/** @phpstan-ignore-next-line */
+				$constExprParser = new ConstExprParser();
+				/** @phpstan-ignore-next-line */
+				$phpDocParser = new PhpDocParser(new TypeParser($constExprParser), $constExprParser);
+			}
 		}
 
 		static $phpDocLexer;
 		if (!$phpDocLexer) {
-			$phpDocLexer = new Lexer();
+			if (class_exists(ParserConfig::class)) {
+				$config = new ParserConfig(usedAttributes: []);
+				$phpDocLexer = new Lexer($config);
+			} else {
+				/** @phpstan-ignore-next-line */
+				$phpDocLexer = new Lexer();
+			}
 		}
 
 		return $phpDocParser->parseTagValue(new TokenIterator($phpDocLexer->tokenize($tagComment)), $tagName);