Update phpdoc-parser to 2.0.x

ondrejmirtes · ondrejmirtes · commit 7928a2a1ea77 · 2024-09-07T23:42:12.000+02:00
diff --git a/composer.json b/composer.json
@@ -26,7 +26,7 @@
 		"ondram/ci-detector": "^3.4.0",
 		"ondrejmirtes/better-reflection": "6.42.0.7",
 		"phpstan/php-8-stubs": "0.3.102",
-		"phpstan/phpdoc-parser": "1.30.0",
+		"phpstan/phpdoc-parser": "^2.0",
 		"psr/http-message": "^1.1",
 		"react/async": "^3",
 		"react/child-process": "^0.7",
diff --git a/composer.lock b/composer.lock
diff --git a/conf/bleedingEdge.neon b/conf/bleedingEdge.neon
@@ -16,8 +16,6 @@ parameters:
 		consistentConstructor: true
 		checkUnresolvableParameterTypes: true
 		readOnlyByPhpDoc: true
-		phpDocParserRequireWhitespaceBeforeDescription: true
-		phpDocParserIncludeLines: true
 		enableIgnoreErrorsWithinPhpDocs: true
 		runtimeReflectionRules: true
 		notAnalysedTrait: true
diff --git a/conf/config.neon b/conf/config.neon
@@ -51,8 +51,6 @@ parameters:
 		consistentConstructor: false
 		checkUnresolvableParameterTypes: false
 		readOnlyByPhpDoc: false
-		phpDocParserRequireWhitespaceBeforeDescription: false
-		phpDocParserIncludeLines: false
 		enableIgnoreErrorsWithinPhpDocs: false
 		runtimeReflectionRules: false
 		notAnalysedTrait: false
@@ -416,30 +414,23 @@ services:
 			versionId: %phpVersion%
 			composerAutoloaderProjectPaths: %composerAutoloaderProjectPaths%
 
+	-
+		class: PHPStan\PhpDocParser\ParserConfig
+		arguments:
+			usedAttributes:
+				lines: true
+
 	-
 		class: PHPStan\PhpDocParser\Lexer\Lexer
 
 	-
 		class: PHPStan\PhpDocParser\Parser\TypeParser
-		arguments:
-			quoteAwareConstExprString: %featureToggles.unescapeStrings%
 
 	-
 		class: PHPStan\PhpDocParser\Parser\ConstExprParser
-		factory: @PHPStan\PhpDoc\ConstExprParserFactory::create()
 
 	-
 		class: PHPStan\PhpDocParser\Parser\PhpDocParser
-		arguments:
-			requireWhitespaceBeforeDescription: %featureToggles.phpDocParserRequireWhitespaceBeforeDescription%
-			preserveTypeAliasesWithInvalidTypes: true
-			usedAttributes:
-				lines: %featureToggles.phpDocParserIncludeLines%
-
-	-
-		class: PHPStan\PhpDoc\ConstExprParserFactory
-		arguments:
-			unescapeStrings: %featureToggles.unescapeStrings%
 
 	-
 		class: PHPStan\PhpDoc\PhpDocInheritanceResolver
diff --git a/conf/parametersSchema.neon b/conf/parametersSchema.neon
@@ -46,8 +46,6 @@ parametersSchema:
 		consistentConstructor: bool()
 		checkUnresolvableParameterTypes: bool()
 		readOnlyByPhpDoc: bool()
-		phpDocParserRequireWhitespaceBeforeDescription: bool()
-		phpDocParserIncludeLines: bool()
 		enableIgnoreErrorsWithinPhpDocs: bool()
 		runtimeReflectionRules: bool()
 		notAnalysedTrait: bool()
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -194,21 +194,6 @@ parameters:
 			count: 1
 			path: src/PhpDoc/PhpDocNodeResolver.php
 
-		-
-			message: "#^Property PHPStan\\\\PhpDocParser\\\\Ast\\\\PhpDoc\\\\AssertTagMethodValueNode\\:\\:\\$isEquality \\(bool\\) on left side of \\?\\? is not nullable\\.$#"
-			count: 1
-			path: src/PhpDoc/PhpDocNodeResolver.php
-
-		-
-			message: "#^Property PHPStan\\\\PhpDocParser\\\\Ast\\\\PhpDoc\\\\AssertTagPropertyValueNode\\:\\:\\$isEquality \\(bool\\) on left side of \\?\\? is not nullable\\.$#"
-			count: 1
-			path: src/PhpDoc/PhpDocNodeResolver.php
-
-		-
-			message: "#^Property PHPStan\\\\PhpDocParser\\\\Ast\\\\PhpDoc\\\\AssertTagValueNode\\:\\:\\$isEquality \\(bool\\) on left side of \\?\\? is not nullable\\.$#"
-			count: 1
-			path: src/PhpDoc/PhpDocNodeResolver.php
-
 		-
 			message: "#^Method PHPStan\\\\PhpDoc\\\\ResolvedPhpDocBlock\\:\\:getNameScope\\(\\) should return PHPStan\\\\Analyser\\\\NameScope but returns PHPStan\\\\Analyser\\\\NameScope\\|null\\.$#"
 			count: 1
@@ -242,11 +227,6 @@ parameters:
 			count: 2
 			path: src/PhpDoc/TypeNodeResolver.php
 
-		-
-			message: "#^Property PHPStan\\\\PhpDocParser\\\\Ast\\\\Type\\\\CallableTypeNode\\:\\:\\$templateTypes \\(array\\<PHPStan\\\\PhpDocParser\\\\Ast\\\\PhpDoc\\\\TemplateTagValueNode\\>\\) on left side of \\?\\? is not nullable\\.$#"
-			count: 1
-			path: src/PhpDoc/TypeNodeResolver.php
-
 		-
 			message: "#^Dead catch \\- PHPStan\\\\BetterReflection\\\\Identifier\\\\Exception\\\\InvalidIdentifierName is never thrown in the try block\\.$#"
 			count: 3
diff --git a/src/DependencyInjection/ValidateIgnoredErrorsExtension.php b/src/DependencyInjection/ValidateIgnoredErrorsExtension.php
@@ -20,6 +20,7 @@
 use PHPStan\PhpDocParser\Lexer\Lexer;
 use PHPStan\PhpDocParser\Parser\ConstExprParser;
 use PHPStan\PhpDocParser\Parser\TypeParser;
+use PHPStan\PhpDocParser\ParserConfig;
 use PHPStan\Reflection\InitializerExprTypeResolver;
 use PHPStan\Reflection\PhpVersionStaticAccessor;
 use PHPStan\Reflection\ReflectionProvider\DirectReflectionProviderProvider;
@@ -67,11 +68,13 @@ public function loadConfiguration(): void
 		ReflectionProviderStaticAccessor::registerInstance($reflectionProvider);
 		PhpVersionStaticAccessor::registerInstance(new PhpVersion(PHP_VERSION_ID));
 		$constantResolver = new ConstantResolver($reflectionProviderProvider, []);
+
+		$phpDocParserConfig = new ParserConfig([]);
 		$ignoredRegexValidator = new IgnoredRegexValidator(
 			$parser,
 			new TypeStringResolver(
-				new Lexer(),
-				new TypeParser(new ConstExprParser($builder->parameters['featureToggles']['unescapeStrings'])),
+				new Lexer($phpDocParserConfig),
+				new TypeParser($phpDocParserConfig, new ConstExprParser($phpDocParserConfig)),
 				new TypeNodeResolver(
 					new DirectTypeNodeResolverExtensionRegistryProvider(
 						new class implements TypeNodeResolverExtensionRegistry {
diff --git a/src/PhpDoc/ConstExprParserFactory.php b/src/PhpDoc/ConstExprParserFactory.php
diff --git a/src/PhpDoc/PhpDocNodeResolver.php b/src/PhpDoc/PhpDocNodeResolver.php
@@ -587,19 +587,19 @@ private function resolveAssertTagsFor(PhpDocNode $phpDocNode, NameScope $nameSco
 		foreach ($phpDocNode->getAssertTagValues($tagName) as $assertTagValue) {
 			$type = $this->typeNodeResolver->resolve($assertTagValue->type, $nameScope);
 			$parameter = new AssertTagParameter($assertTagValue->parameter, null, null);
-			$resolved[] = new AssertTag($if, $type, $parameter, $assertTagValue->isNegated, $assertTagValue->isEquality ?? false, true);
+			$resolved[] = new AssertTag($if, $type, $parameter, $assertTagValue->isNegated, $assertTagValue->isEquality, true);
 		}
 
 		foreach ($phpDocNode->getAssertPropertyTagValues($tagName) as $assertTagValue) {
 			$type = $this->typeNodeResolver->resolve($assertTagValue->type, $nameScope);
 			$parameter = new AssertTagParameter($assertTagValue->parameter, $assertTagValue->property, null);
-			$resolved[] = new AssertTag($if, $type, $parameter, $assertTagValue->isNegated, $assertTagValue->isEquality ?? false, true);
+			$resolved[] = new AssertTag($if, $type, $parameter, $assertTagValue->isNegated, $assertTagValue->isEquality, true);
 		}
 
 		foreach ($phpDocNode->getAssertMethodTagValues($tagName) as $assertTagValue) {
 			$type = $this->typeNodeResolver->resolve($assertTagValue->type, $nameScope);
 			$parameter = new AssertTagParameter($assertTagValue->parameter, null, $assertTagValue->method);
-			$resolved[] = new AssertTag($if, $type, $parameter, $assertTagValue->isNegated, $assertTagValue->isEquality ?? false, true);
+			$resolved[] = new AssertTag($if, $type, $parameter, $assertTagValue->isNegated, $assertTagValue->isEquality, true);
 		}
 
 		return $resolved;
diff --git a/src/PhpDoc/TypeNodeResolver.php b/src/PhpDoc/TypeNodeResolver.php
@@ -894,7 +894,7 @@ private function resolveCallableTypeNode(CallableTypeNode $typeNode, NameScope $
 	{
 		$templateTags = [];
 
-		if (count($typeNode->templateTypes ?? []) > 0) {
+		if (count($typeNode->templateTypes) > 0) {
 			foreach ($typeNode->templateTypes as $templateType) {
 				$templateTags[$templateType->name] = new TemplateTag(
 					$templateType->name,
diff --git a/src/Type/Constant/ConstantStringType.php b/src/Type/Constant/ConstantStringType.php
@@ -7,7 +7,7 @@
 use PhpParser\Node\Name;
 use PHPStan\Analyser\OutOfClassScope;
 use PHPStan\DependencyInjection\BleedingEdgeToggle;
-use PHPStan\PhpDocParser\Ast\ConstExpr\QuoteAwareConstExprStringNode;
+use PHPStan\PhpDocParser\Ast\ConstExpr\ConstExprStringNode;
 use PHPStan\PhpDocParser\Ast\Type\ConstTypeNode;
 use PHPStan\PhpDocParser\Ast\Type\TypeNode;
 use PHPStan\Reflection\Callables\FunctionCallableVariant;
@@ -528,7 +528,7 @@ public function toPhpDocNode(): TypeNode
 			return $this->generalize(GeneralizePrecision::moreSpecific())->toPhpDocNode();
 		}
 
-		return new ConstTypeNode(new QuoteAwareConstExprStringNode($this->value, QuoteAwareConstExprStringNode::SINGLE_QUOTED));
+		return new ConstTypeNode(new ConstExprStringNode($this->value, ConstExprStringNode::SINGLE_QUOTED));
 	}
 
 	/**
diff --git a/src/Type/Helper/GetTemplateTypeType.php b/src/Type/Helper/GetTemplateTypeType.php
@@ -2,7 +2,7 @@
 
 namespace PHPStan\Type\Helper;
 
-use PHPStan\PhpDocParser\Ast\ConstExpr\QuoteAwareConstExprStringNode;
+use PHPStan\PhpDocParser\Ast\ConstExpr\ConstExprStringNode;
 use PHPStan\PhpDocParser\Ast\Type\ConstTypeNode;
 use PHPStan\PhpDocParser\Ast\Type\GenericTypeNode;
 use PHPStan\PhpDocParser\Ast\Type\IdentifierTypeNode;
@@ -98,7 +98,7 @@ public function toPhpDocNode(): TypeNode
 			[
 				$this->type->toPhpDocNode(),
 				new IdentifierTypeNode($this->ancestorClassName),
-				new ConstTypeNode(new QuoteAwareConstExprStringNode($this->templateTypeName, QuoteAwareConstExprStringNode::SINGLE_QUOTED)),
+				new ConstTypeNode(new ConstExprStringNode($this->templateTypeName, ConstExprStringNode::SINGLE_QUOTED)),
 			],
 		);
 	}

Original file line number	Diff line number	Diff line change
`@@ -894,7 +894,7 @@ private function resolveCallableTypeNode(CallableTypeNode $typeNode, NameScope $`
`894`	`894`	`{`
`895`	`895`	`$templateTags = [];`
`896`	`896`
`897`		`- if (count($typeNode->templateTypes ?? []) > 0) {`
	`897`	`+ if (count($typeNode->templateTypes) > 0) {`
`898`	`898`	`foreach ($typeNode->templateTypes as $templateType) {`
`899`	`899`	`$templateTags[$templateType->name] = new TemplateTag(`
`900`	`900`	`$templateType->name,`