[BE] Detect overriding @final method in OverridingMethodRule

Author: ondrejmirtes

changelog-2.0.md

@@ -62,7 +62,6 @@ Bleeding edge (TODO move to other sections)
 * More precise `stream_socket_client()` signature ([#2519](https://github.com/phpstan/phpstan-src/pull/2519)), thanks @staabm!
 * More precise `scandir()` signature ([#2518](https://github.com/phpstan/phpstan-src/pull/2518)), thanks @staabm!
 * More precise `extract()` signature ([#2517](https://github.com/phpstan/phpstan-src/pull/2517)), thanks @staabm!
-* Detect overriding `@final` method in OverridingMethodRule, #9135
 * MagicConstantContextRule ([#2741](https://github.com/phpstan/phpstan-src/pull/2741)), #10099, thanks @staabm!
 * More precise `RecursiveIteratorIterator::__construct()` parameter types ([#2835](https://github.com/phpstan/phpstan-src/pull/2835)), thanks @staabm!
 * TooWideMethodReturnTypehintRule - always report for final methods (https://github.com/phpstan/phpstan-src/commit/c30e9a484c8245b8126cd63444607ca74d2af761)
@@ -139,6 +138,7 @@ Improvements 🔧
 * Report dead types even in multi-exception catch ([#2399](https://github.com/phpstan/phpstan-src/pull/2399)), thanks @JanTvrdik!
 * MethodSignatureRule - look at abstract trait method (https://github.com/phpstan/phpstan-src/commit/5fd8cee591ce1b07daa5f98a1ddcdfc723f1b5eb)
 * OverridingMethodRule - include template types in prototype declaring class description (https://github.com/phpstan/phpstan-src/commit/ca2c66cc4dff59ba44d52b82cb9e0aa3256240f3)
+* Detect overriding `@final` method in OverridingMethodRule, #9135
 
 Bugfixes 🐛
 =====================

conf/bleedingEdge.neon

@@ -36,7 +36,6 @@ parameters:
 		zeroFiles: true
 		projectServicesNotInAnalysedPaths: true
 		callUserFunc: true
-		finalByPhpDoc: true
 		magicConstantOutOfContext: true
 		pure: true
 		checkParameterCastableToStringFunctions: true

conf/config.level0.neon

@@ -178,7 +178,6 @@ services:
 		class: PHPStan\Rules\Methods\OverridingMethodRule
 		arguments:
 			checkPhpDocMethodSignatures: %checkPhpDocMethodSignatures%
-			finalByPhpDoc: %featureToggles.finalByPhpDoc%
 			checkMissingOverrideMethodAttribute: %checkMissingOverrideMethodAttribute%
 		tags:
 			- phpstan.rules.rule

conf/config.neon

@@ -72,7 +72,6 @@ parameters:
 		zeroFiles: false
 		projectServicesNotInAnalysedPaths: false
 		callUserFunc: false
-		finalByPhpDoc: false
 		magicConstantOutOfContext: false
 		pure: false
 		checkParameterCastableToStringFunctions: false

conf/parametersSchema.neon

@@ -66,7 +66,6 @@ parametersSchema:
 		zeroFiles: bool()
 		projectServicesNotInAnalysedPaths: bool()
 		callUserFunc: bool()
-		finalByPhpDoc: bool()
 		magicConstantOutOfContext: bool()
 		pure: bool()
 		checkParameterCastableToStringFunctions: bool()

src/PhpDoc/StubValidator.php

@@ -196,7 +196,7 @@ private function getRuleRegistry(Container $container): RuleRegistry
 			new ExistingClassesInTypehintsRule($functionDefinitionCheck),
 			new \PHPStan\Rules\Functions\ExistingClassesInTypehintsRule($functionDefinitionCheck),
 			new ExistingClassesInPropertiesRule($reflectionProvider, $classNameCheck, $unresolvableTypeHelper, $phpVersion, true, false),
-			new OverridingMethodRule($phpVersion, new MethodSignatureRule($phpClassReflectionExtension, true, true), true, new MethodParameterComparisonHelper($phpVersion), $phpClassReflectionExtension, $container->getParameter('featureToggles')['finalByPhpDoc'], $container->getParameter('checkMissingOverrideMethodAttribute')),
+			new OverridingMethodRule($phpVersion, new MethodSignatureRule($phpClassReflectionExtension, true, true), true, new MethodParameterComparisonHelper($phpVersion), $phpClassReflectionExtension, $container->getParameter('checkMissingOverrideMethodAttribute')),
 			new DuplicateDeclarationRule(),
 			new LocalTypeAliasesRule($localTypeAliasesCheck),
 			new LocalTypeTraitAliasesRule($localTypeAliasesCheck, $reflectionProvider),

src/Rules/Methods/OverridingMethodRule.php

@@ -38,7 +38,6 @@ public function __construct(
 		private bool $checkPhpDocMethodSignatures,
 		private MethodParameterComparisonHelper $methodParameterComparisonHelper,
 		private PhpClassReflectionExtension $phpClassReflectionExtension,
-		private bool $finalByPhpDoc,
 		private bool $checkMissingOverrideMethodAttribute,
 	)
 	{
@@ -72,7 +71,7 @@ public function processNode(Node $node, Scope $scope): array
 								->build(),
 						], $node, $scope);
 					}
-					if ($parentConstructor->isFinal()->yes() && $this->finalByPhpDoc) {
+					if ($parentConstructor->isFinal()->yes()) {
 						return $this->addErrors([
 							RuleErrorBuilder::message(sprintf(
 								'Method %s::%s() overrides @final method %s::%s().',
@@ -130,7 +129,7 @@ public function processNode(Node $node, Scope $scope): array
 				->nonIgnorable()
 				->identifier('method.parentMethodFinal')
 				->build();
-		} elseif ($prototype->isFinal()->yes() && $this->finalByPhpDoc) {
+		} elseif ($prototype->isFinal()->yes()) {
 			$messages[] = RuleErrorBuilder::message(sprintf(
 				'Method %s::%s() overrides @final method %s::%s().',
 				$method->getDeclaringClass()->getDisplayName(),

tests/PHPStan/Rules/Methods/MethodSignatureRuleTest.php

@@ -30,7 +30,6 @@ protected function getRule(): Rule
 			true,
 			new MethodParameterComparisonHelper($phpVersion),
 			$phpClassReflectionExtension,
-			true,
 			false,
 		);
 	}

tests/PHPStan/Rules/Methods/OverridingMethodRuleTest.php

@@ -32,7 +32,6 @@ protected function getRule(): Rule
 			false,
 			new MethodParameterComparisonHelper($phpVersion),
 			$phpClassReflectionExtension,
-			true,
 			$this->checkMissingOverrideMethodAttribute,
 		);
 	}