Compatibility with PHP-Parser v5

Author: ondrejmirtes

conf/config.neon

@@ -1859,7 +1859,7 @@ services:
 		autowired: false
 
 	currentPhpVersionPhpParser:
-		class: PhpParser\Parser\Php7
+		class: PhpParser\Parser\Php8 # todo use factory and create Php7/Php8
 		arguments:
 			lexer: @currentPhpVersionLexer
 		autowired: false
@@ -1971,7 +1971,7 @@ services:
 		autowired: false
 
 	php8PhpParser:
-		class: PhpParser\Parser\Php7
+		class: PhpParser\Parser\Php8
 		arguments:
 			lexer: @php8Lexer
 		autowired: false

src/Parser/LexerFactory.php

@@ -9,27 +9,22 @@
 class LexerFactory
 {
 
-	private const OPTIONS = ['usedAttributes' => ['comments', 'startLine', 'endLine', 'startTokenPos', 'endTokenPos', 'startFilePos', 'endFilePos']];
-
 	public function __construct(private PhpVersion $phpVersion)
 	{
 	}
 
 	public function create(): Lexer
 	{
-		$options = self::OPTIONS;
 		if ($this->phpVersion->getVersionId() === PHP_VERSION_ID) {
-			return new Lexer($options);
+			return new Lexer();
 		}
 
-		$options['phpVersion'] = $this->phpVersion->getVersionString();
-
-		return new Lexer\Emulative($options);
+		return new Lexer\Emulative(\PhpParser\PhpVersion::fromString($this->phpVersion->getVersionString()));
 	}
 
 	public function createEmulative(): Lexer\Emulative
 	{
-		return new Lexer\Emulative(self::OPTIONS);
+		return new Lexer\Emulative();
 	}
 
 }

src/Parser/PhpParserDecorator.php

@@ -31,4 +31,9 @@ public function parse(string $code, ?ErrorHandler $errorHandler = null): array
 		}
 	}
 
+	public function getTokens(): array
+	{
+		return $this->wrappedParser->getTokens();
+	}
+
 }

src/Parser/RichParser.php

@@ -7,6 +7,7 @@
 use PhpParser\Node;
 use PhpParser\NodeTraverser;
 use PhpParser\NodeVisitor\NameResolver;
+use PhpParser\Token;
 use PHPStan\Analyser\Ignore\IgnoreLexer;
 use PHPStan\Analyser\Ignore\IgnoreParseException;
 use PHPStan\DependencyInjection\Container;
@@ -17,7 +18,6 @@
 use function array_values;
 use function count;
 use function in_array;
-use function is_string;
 use function str_contains;
 use function strlen;
 use function strpos;
@@ -64,8 +64,7 @@ public function parseString(string $sourceCode): array
 		$errorHandler = new Collecting();
 		$nodes = $this->parser->parse($sourceCode, $errorHandler);
 
-		/** @var list<string|array{0:int,1:string,2:int}> $tokens */
-		$tokens = $this->lexer->getTokens();
+		$tokens = $this->parser->getTokens();
 		if ($errorHandler->hasErrors()) {
 			throw new ParserErrorsException($errorHandler->getErrors(), null);
 		}
@@ -101,7 +100,7 @@ public function parseString(string $sourceCode): array
 	}
 
 	/**
-	 * @param list<string|array{0:int,1:string,2:int}> $tokens
+	 * @param Token[] $tokens
 	 * @return array{lines: array<int, non-empty-list<string>|null>, errors: array<int, non-empty-list<string>>}
 	 */
 	private function getLinesToIgnore(array $tokens): array
@@ -111,12 +110,8 @@ private function getLinesToIgnore(array $tokens): array
 		$pendingToken = null;
 		$errors = [];
 		foreach ($tokens as $token) {
-			if (is_string($token)) {
-				continue;
-			}
-
-			$type = $token[0];
-			$line = $token[2];
+			$type = $token->id;
+			$line = $token->line;
 			if ($type !== T_COMMENT && $type !== T_DOC_COMMENT) {
 				if ($type !== T_WHITESPACE) {
 					if ($pendingToken !== null) {
@@ -147,14 +142,14 @@ private function getLinesToIgnore(array $tokens): array
 				continue;
 			}
 
-			$text = $token[1];
+			$text = $token->text;
 			$isNextLine = str_contains($text, '@phpstan-ignore-next-line');
 			$isCurrentLine = str_contains($text, '@phpstan-ignore-line');
 			if ($isNextLine) {
 				$line++;
 			}
 			if ($isNextLine || $isCurrentLine) {
-				$line += substr_count($token[1], "\n");
+				$line += substr_count($token->text, "\n");
 
 				$lines[$line] = null;
 				continue;
@@ -167,20 +162,20 @@ private function getLinesToIgnore(array $tokens): array
 
 			$ignoreLine = substr_count(substr($text, 0, $ignorePos), "\n") - 1;
 
-			if ($previousToken !== null && $previousToken[2] === $line) {
+			if ($previousToken !== null && $previousToken->line === $line) {
 				try {
 					foreach ($this->parseIdentifiers($text, $ignorePos) as $identifier) {
 						$lines[$line][] = $identifier;
 					}
 				} catch (IgnoreParseException $e) {
-					$errors[] = [$token[2] + $e->getPhpDocLine() + $ignoreLine, $e->getMessage()];
+					$errors[] = [$token->line + $e->getPhpDocLine() + $ignoreLine, $e->getMessage()];
 				}
 
 				continue;
 			}
 
-			$line += substr_count($token[1], "\n");
-			$pendingToken = [$text, $ignorePos, $token[2] + $ignoreLine, $line];
+			$line += substr_count($token->text, "\n");
+			$pendingToken = [$text, $ignorePos, $token->line + $ignoreLine, $line];
 		}
 
 		if ($pendingToken !== null) {