[BE] MethodSignatureRule - look at abstract trait method

Author: ondrejmirtes

changelog-2.0.md

@@ -64,7 +64,6 @@ Bleeding edge (TODO move to other sections)
 * 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
-* MethodSignatureRule - look at abstract trait method (https://github.com/phpstan/phpstan-src/commit/5fd8cee591ce1b07daa5f98a1ddcdfc723f1b5eb)
 * 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 🔧
 * Run missing type check on `@param-out` (https://github.com/phpstan/phpstan-src/commit/56b20024386d983927c64dfa895ff026bed2798c)
 * Report "missing return" error closer to where the return is missing (https://github.com/phpstan/phpstan-src/commit/04f8636e6577cbcaefc944725eed74c0d7865ead)
 * 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)
 
 Bugfixes 🐛
 =====================

conf/bleedingEdge.neon

@@ -17,7 +17,6 @@ parameters:
 		runtimeReflectionRules: true
 		notAnalysedTrait: true
 		curlSetOptTypes: true
-		abstractTraitMethod: true
 		missingMagicSerializationRule: true
 		nullContextForVoidReturningFunctions: true
 		unescapeStrings: true

conf/config.neon

@@ -52,7 +52,6 @@ parameters:
 		runtimeReflectionRules: false
 		notAnalysedTrait: false
 		curlSetOptTypes: false
-		abstractTraitMethod: false
 		missingMagicSerializationRule: false
 		nullContextForVoidReturningFunctions: false
 		unescapeStrings: false
@@ -1046,7 +1045,6 @@ services:
 		arguments:
 			reportMaybes: %reportMaybesInMethodSignatures%
 			reportStatic: %reportStaticMethodSignatures%
-			abstractTraitMethod: %featureToggles.abstractTraitMethod%
 
 	-
 		class: PHPStan\Rules\Methods\MethodParameterComparisonHelper

conf/parametersSchema.neon

@@ -47,7 +47,6 @@ parametersSchema:
 		runtimeReflectionRules: bool()
 		notAnalysedTrait: bool()
 		curlSetOptTypes: bool()
-		abstractTraitMethod: bool()
 		missingMagicSerializationRule: bool()
 		nullContextForVoidReturningFunctions: bool()
 		unescapeStrings: 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, $container->getParameter('featureToggles')['abstractTraitMethod']), true, new MethodParameterComparisonHelper($phpVersion, $container->getParameter('featureToggles')['genericPrototypeMessage']), $phpClassReflectionExtension, $container->getParameter('featureToggles')['genericPrototypeMessage'], $container->getParameter('featureToggles')['finalByPhpDoc'], $container->getParameter('checkMissingOverrideMethodAttribute')),
+			new OverridingMethodRule($phpVersion, new MethodSignatureRule($phpClassReflectionExtension, true, true), true, new MethodParameterComparisonHelper($phpVersion, $container->getParameter('featureToggles')['genericPrototypeMessage']), $phpClassReflectionExtension, $container->getParameter('featureToggles')['genericPrototypeMessage'], $container->getParameter('featureToggles')['finalByPhpDoc'], $container->getParameter('checkMissingOverrideMethodAttribute')),
 			new DuplicateDeclarationRule(),
 			new LocalTypeAliasesRule($localTypeAliasesCheck),
 			new LocalTypeTraitAliasesRule($localTypeAliasesCheck, $reflectionProvider),

src/Rules/Methods/MethodSignatureRule.php

@@ -44,7 +44,6 @@ public function __construct(
 		private PhpClassReflectionExtension $phpClassReflectionExtension,
 		private bool $reportMaybes,
 		private bool $reportStatic,
-		private bool $abstractTraitMethod,
 	)
 	{
 	}
@@ -169,30 +168,28 @@ private function collectParentMethods(string $methodName, ClassReflection $class
 			$parentMethods[] = [$method, $method->getDeclaringClass()];
 		}
 
-		if ($this->abstractTraitMethod) {
-			foreach ($class->getTraits(true) as $trait) {
-				$nativeTraitReflection = $trait->getNativeReflection();
-				if (!$nativeTraitReflection->hasMethod($methodName)) {
-					continue;
-				}
-
-				$methodReflection = $nativeTraitReflection->getMethod($methodName);
-				$isAbstract = $methodReflection->isAbstract();
-				if (!$isAbstract) {
-					continue;
-				}
+		foreach ($class->getTraits(true) as $trait) {
+			$nativeTraitReflection = $trait->getNativeReflection();
+			if (!$nativeTraitReflection->hasMethod($methodName)) {
+				continue;
+			}
 
-				$declaringTrait = $trait->getNativeMethod($methodName)->getDeclaringClass();
-				$parentMethods[] = [
-					$this->phpClassReflectionExtension->createUserlandMethodReflection(
-						$trait,
-						$class,
-						new NativeBuiltinMethodReflection($methodReflection),
-						$declaringTrait->getName(),
-					),
-					$declaringTrait,
-				];
+			$methodReflection = $nativeTraitReflection->getMethod($methodName);
+			$isAbstract = $methodReflection->isAbstract();
+			if (!$isAbstract) {
+				continue;
 			}
+
+			$declaringTrait = $trait->getNativeMethod($methodName)->getDeclaringClass();
+			$parentMethods[] = [
+				$this->phpClassReflectionExtension->createUserlandMethodReflection(
+					$trait,
+					$class,
+					new NativeBuiltinMethodReflection($methodReflection),
+					$declaringTrait->getName(),
+				),
+				$declaringTrait,
+			];
 		}
 
 		return $parentMethods;

tests/PHPStan/Rules/Methods/MethodSignatureRuleTest.php

@@ -26,7 +26,7 @@ protected function getRule(): Rule
 
 		return new OverridingMethodRule(
 			$phpVersion,
-			new MethodSignatureRule($phpClassReflectionExtension, $this->reportMaybes, $this->reportStatic, true),
+			new MethodSignatureRule($phpClassReflectionExtension, $this->reportMaybes, $this->reportStatic),
 			true,
 			new MethodParameterComparisonHelper($phpVersion, true),
 			$phpClassReflectionExtension,

tests/PHPStan/Rules/Methods/OverridingMethodRuleTest.php

@@ -28,7 +28,7 @@ protected function getRule(): Rule
 
 		return new OverridingMethodRule(
 			$phpVersion,
-			new MethodSignatureRule($phpClassReflectionExtension, true, true, true),
+			new MethodSignatureRule($phpClassReflectionExtension, true, true),
 			false,
 			new MethodParameterComparisonHelper($phpVersion, true),
 			$phpClassReflectionExtension,