Vendor: support Nikic\PhpParser v5

forrest79 · Mar 12, 2024 · de95319 · de95319
1 parent 1027d72
commit de95319
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/composer.json b/composer.json
@@ -13,7 +13,7 @@
 	"require": {
 		"php": "^8.1",
 		"phpstan/phpstan": "^1.10",
-		"nikic/php-parser": "^4.17"
+		"nikic/php-parser": "^5.0"
  	},
 	"require-dev": {
 		"forrest79/phpcs": "^1.5",
@@ -33,7 +33,7 @@
 	},
 	"scripts": {
 		"phpcs": "vendor/bin/phpcs --bootstrap=vendor/forrest79/phpcs-ignores/src/bootstrap.php -s src tests",
-		"phpstan": "vendor/bin/phpstan analyse src tests",
+		"phpstan": "vendor/bin/phpstan analyse src tests -v",
 		"tests": "php tests/run-tests.php"
 	},
 	"config": {

diff --git a/phpstan.neon b/phpstan.neon
@@ -7,6 +7,9 @@ includes:
 
 parameters:
 	level: max
+	excludePaths:
+		analyse:
+			- %rootDir%/../../../tests/Tests.php # temporary PHPStan Nikic\PhpParser version mismatch
 	ignoreErrors:
 		-
 			message: '#^Call to static method Forrest79\\NarrowTypes::isType\(\) with mixed and string will always evaluate to true\.$#'

diff --git a/src/NarrowTypes/FullyQualifiedClassNameResolver.php b/src/NarrowTypes/FullyQualifiedClassNameResolver.php
@@ -34,7 +34,7 @@ private static function createNameContext(string|NULL $filename): PhpParser\Name
 			return NULL;
 		}
 
-		$parser = (new PhpParser\ParserFactory())->create(PhpParser\ParserFactory::PREFER_PHP7);
+		$parser = (new PhpParser\ParserFactory())->createForVersion(PhpParser\PhpVersion::fromComponents(8, 1));
 		$traverser = new PhpParser\NodeTraverser();
 		$nameResolver = new PhpParser\NodeVisitor\NameResolver();
 		$traverser->addVisitor($nameResolver);