Remove more bleeding edge toggles about phpdoc-parser

Author: ondrejmirtes

conf/bleedingEdge.neon

@@ -16,7 +16,6 @@ parameters:
 		consistentConstructor: true
 		checkUnresolvableParameterTypes: true
 		readOnlyByPhpDoc: true
-		enableIgnoreErrorsWithinPhpDocs: true
 		runtimeReflectionRules: true
 		notAnalysedTrait: true
 		curlSetOptTypes: true
@@ -41,7 +40,6 @@ parameters:
 		propertyVariance: true
 		genericPrototypeMessage: true
 		stricterFunctionMap: true
-		invalidPhpDocTagLine: true
 		detectDeadTypeInMultiCatch: true
 		zeroFiles: true
 		projectServicesNotInAnalysedPaths: true

conf/config.level2.neon

@@ -145,8 +145,6 @@ services:
 		class: PHPStan\Rules\Methods\IllegalConstructorStaticCallRule
 	-
 		class: PHPStan\Rules\PhpDoc\InvalidPhpDocTagValueRule
-		arguments:
-			invalidPhpDocTagLine: %featureToggles.invalidPhpDocTagLine%
 		tags:
 			- phpstan.rules.rule
 	-

conf/config.neon

@@ -51,7 +51,6 @@ parameters:
 		consistentConstructor: false
 		checkUnresolvableParameterTypes: false
 		readOnlyByPhpDoc: false
-		enableIgnoreErrorsWithinPhpDocs: false
 		runtimeReflectionRules: false
 		notAnalysedTrait: false
 		curlSetOptTypes: false
@@ -77,7 +76,6 @@ parameters:
 		propertyVariance: false
 		genericPrototypeMessage: false
 		stricterFunctionMap: false
-		invalidPhpDocTagLine: false
 		detectDeadTypeInMultiCatch: false
 		zeroFiles: false
 		projectServicesNotInAnalysedPaths: false
@@ -2018,7 +2016,6 @@ services:
 		class: PHPStan\Parser\RichParser
 		arguments:
 			parser: @currentPhpVersionPhpParser
-			enableIgnoreErrorsWithinPhpDocs: %featureToggles.enableIgnoreErrorsWithinPhpDocs%
 		autowired: no
 
 	currentPhpVersionSimpleParser:

conf/parametersSchema.neon

@@ -46,7 +46,6 @@ parametersSchema:
 		consistentConstructor: bool()
 		checkUnresolvableParameterTypes: bool()
 		readOnlyByPhpDoc: bool()
-		enableIgnoreErrorsWithinPhpDocs: bool()
 		runtimeReflectionRules: bool()
 		notAnalysedTrait: bool()
 		curlSetOptTypes: bool()
@@ -71,7 +70,6 @@ parametersSchema:
 		propertyVariance: bool()
 		genericPrototypeMessage: bool()
 		stricterFunctionMap: bool()
-		invalidPhpDocTagLine: bool()
 		detectDeadTypeInMultiCatch: bool()
 		zeroFiles: bool()
 		projectServicesNotInAnalysedPaths: bool()

src/Parser/RichParser.php

@@ -44,7 +44,6 @@ public function __construct(
 		private NameResolver $nameResolver,
 		private Container $container,
 		private IgnoreLexer $ignoreLexer,
-		private bool $enableIgnoreErrorsWithinPhpDocs = false,
 	)
 	{
 	}
@@ -152,7 +151,7 @@ private function getLinesToIgnore(array $tokens): array
 			$isNextLine = str_contains($text, '@phpstan-ignore-next-line');
 			$isCurrentLine = str_contains($text, '@phpstan-ignore-line');
 
-			if ($this->enableIgnoreErrorsWithinPhpDocs && $type === T_DOC_COMMENT) {
+			if ($type === T_DOC_COMMENT) {
 				$lines += $this->getLinesToIgnoreForTokenByIgnoreComment($text, $line, '@phpstan-ignore-line');
 				if ($isNextLine) {
 					$pattern = sprintf('~%s~si', implode('|', [self::PHPDOC_TAG_REGEX, self::PHPDOC_DOCTRINE_TAG_REGEX]));

src/PhpDoc/StubValidator.php

@@ -217,7 +217,6 @@ private function getRuleRegistry(Container $container): RuleRegistry
 			new InvalidPhpDocTagValueRule(
 				$container->getByType(Lexer::class),
 				$container->getByType(PhpDocParser::class),
-				$container->getParameter('featureToggles')['invalidPhpDocTagLine'],
 			),
 			new IncompatibleParamImmediatelyInvokedCallableRule($fileTypeMapper),
 			new IncompatibleSelfOutTypeRule($unresolvableTypeHelper, $genericObjectTypeCheck),

src/Rules/PhpDoc/InvalidPhpDocTagValueRule.php

@@ -2,7 +2,6 @@
 
 namespace PHPStan\Rules\PhpDoc;
 
-use Nette\Utils\Strings;
 use PhpParser\Node;
 use PHPStan\Analyser\Scope;
 use PHPStan\Node\VirtualNode;
@@ -26,7 +25,6 @@ final class InvalidPhpDocTagValueRule implements Rule
 	public function __construct(
 		private Lexer $phpDocLexer,
 		private PhpDocParser $phpDocParser,
-		private bool $invalidPhpDocTagLine,
 	)
 	{
 	}
@@ -72,7 +70,7 @@ public function processNode(Node $node, Scope $scope): array
 					'PHPDoc tag %s %s has invalid value: %s',
 					$phpDocTag->name,
 					$phpDocTag->value->alias,
-					$this->trimExceptionMessage($phpDocTag->value->type->getException()->getMessage()),
+					$phpDocTag->value->type->getException()->getMessage(),
 				))
 					->line(PhpDocLineHelper::detectLine($node, $phpDocTag))
 					->identifier('phpDoc.parseError')->build();
@@ -86,7 +84,7 @@ public function processNode(Node $node, Scope $scope): array
 				'PHPDoc tag %s has invalid value (%s): %s',
 				$phpDocTag->name,
 				$phpDocTag->value->value,
-				$this->trimExceptionMessage($phpDocTag->value->exception->getMessage()),
+				$phpDocTag->value->exception->getMessage(),
 			))
 				->line(PhpDocLineHelper::detectLine($node, $phpDocTag))
 				->identifier('phpDoc.parseError')->build();
@@ -95,13 +93,4 @@ public function processNode(Node $node, Scope $scope): array
 		return $errors;
 	}
 
-	private function trimExceptionMessage(string $message): string
-	{
-		if ($this->invalidPhpDocTagLine) {
-			return $message;
-		}
-
-		return Strings::replace($message, '~( on line \d+)$~', '');
-	}
-
 }

tests/PHPStan/Analyser/AnalyserTest.php

@@ -555,18 +555,6 @@ public function testIgnoreNextLineUnmatched(): void
 		}
 	}
 
-	public function testIgnoreNextLineLegacyBehaviour(): void
-	{
-		$result = $this->runAnalyser([], false, [__DIR__ . '/data/ignore-next-line-legacy.php'], true, false);
-
-		foreach ([10, 32, 36] as $i => $line) {
-			$this->assertArrayHasKey($i, $result);
-			$this->assertInstanceOf(Error::class, $result[$i]);
-			$this->assertSame('Fail.', $result[$i]->getMessage());
-			$this->assertSame($line, $result[$i]->getLine());
-		}
-	}
-
 	/**
 	 * @dataProvider dataTrueAndFalse
 	 */
@@ -653,10 +641,9 @@ private function runAnalyser(
 		bool $reportUnmatchedIgnoredErrors,
 		$filePaths,
 		bool $onlyFiles,
-		bool $enableIgnoreErrorsWithinPhpDocs = true,
 	): array
 	{
-		$analyser = $this->createAnalyser($enableIgnoreErrorsWithinPhpDocs);
+		$analyser = $this->createAnalyser();
 
 		if (is_string($filePaths)) {
 			$filePaths = [$filePaths];
@@ -701,7 +688,7 @@ private function runAnalyser(
 		);
 	}
 
-	private function createAnalyser(bool $enableIgnoreErrorsWithinPhpDocs): Analyser
+	private function createAnalyser(): Analyser
 	{
 		$ruleRegistry = new DirectRuleRegistry([
 			new AlwaysFailRule(),
@@ -755,7 +742,6 @@ private function createAnalyser(bool $enableIgnoreErrorsWithinPhpDocs): Analyser
 				new NameResolver(),
 				self::getContainer(),
 				new IgnoreLexer(),
-				$enableIgnoreErrorsWithinPhpDocs,
 			),
 			new DependencyResolver($fileHelper, $reflectionProvider, new ExportedNodeResolver($fileTypeMapper, new ExprPrinter(new Printer())), $fileTypeMapper),
 			new RuleErrorTransformer(),

tests/PHPStan/Analyser/data/ignore-next-line-legacy.php

@@ -18,7 +18,6 @@ protected function getRule(): Rule
 		return new InvalidPhpDocTagValueRule(
 			self::getContainer()->getByType(Lexer::class),
 			self::getContainer()->getByType(PhpDocParser::class),
-			true,
 		);
 	}