Fix InClassMethodNode startLine for all rules with attributes

Instead of fixing individual rules, adjust InClassMethodNode to use the
method name's start line when attributes shift the node's start line.
This fixes incorrect error line numbers for ALL rules processing
InClassMethodNode when methods have attributes (e.g. #[Override]).

The range check ensures trait-aliased methods (where the name identifier
points to the alias location) keep their original line number.

Also reverts MethodVisibilityComparisonHelper to its simpler signature
since the line fix is now handled at the node level.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Author: phpstan-bot

src/Node/InClassMethodNode.php

@@ -19,7 +19,12 @@ public function __construct(
 		private Node\Stmt\ClassMethod $originalNode,
 	)
 	{
-		parent::__construct($originalNode->getAttributes());
+		$attributes = $originalNode->getAttributes();
+		$nameStartLine = $originalNode->name->getStartLine();
+		if ($nameStartLine >= $originalNode->getStartLine() && $nameStartLine <= $originalNode->getEndLine()) {
+			$attributes['startLine'] = $nameStartLine;
+		}
+		parent::__construct($attributes);
 	}
 
 	public function getClassReflection(): ClassReflection

src/Rules/Methods/ConsistentConstructorRule.php

@@ -48,7 +48,7 @@ public function processNode(Node $node, Scope $scope): array
 
 		return array_merge(
 			$this->methodParameterComparisonHelper->compare($parentConstructor, $parentConstructor->getDeclaringClass(), $method, true),
-			$this->methodVisibilityComparisonHelper->compare($parentConstructor, $parentConstructor->getDeclaringClass(), $method, $node->getOriginalNode()->name),
+			$this->methodVisibilityComparisonHelper->compare($parentConstructor, $parentConstructor->getDeclaringClass(), $method),
 		);
 	}
 

src/Rules/Methods/MethodVisibilityComparisonHelper.php

@@ -2,7 +2,6 @@
 
 namespace PHPStan\Rules\Methods;
 
-use PhpParser\Node;
 use PHPStan\DependencyInjection\AutowiredService;
 use PHPStan\Reflection\ClassReflection;
 use PHPStan\Reflection\ExtendedMethodReflection;
@@ -16,7 +15,7 @@ final class MethodVisibilityComparisonHelper
 {
 
 	/** @return list<IdentifierRuleError> */
-	public function compare(ExtendedMethodReflection $prototype, ClassReflection $prototypeDeclaringClass, PhpMethodFromParserNodeReflection $method, Node $node): array
+	public function compare(ExtendedMethodReflection $prototype, ClassReflection $prototypeDeclaringClass, PhpMethodFromParserNodeReflection $method): array
 	{
 		/** @var list<IdentifierRuleError> $messages */
 		$messages = [];
@@ -33,7 +32,6 @@ public function compare(ExtendedMethodReflection $prototype, ClassReflection $pr
 				))
 					->nonIgnorable()
 					->identifier('method.visibility')
-					->line($node->getStartLine())
 					->build();
 			}
 		} elseif ($method->isPrivate()) {
@@ -46,7 +44,6 @@ public function compare(ExtendedMethodReflection $prototype, ClassReflection $pr
 			))
 				->nonIgnorable()
 				->identifier('method.visibility')
-				->line($node->getStartLine())
 				->build();
 		}
 

src/Rules/Methods/OverridingMethodRule.php

@@ -189,7 +189,7 @@ public function processNode(Node $node, Scope&NodeCallbackInvoker $scope): array
 		}
 
 		if ($checkVisibility) {
-			$messages = array_merge($messages, $this->methodVisibilityComparisonHelper->compare($prototype, $prototypeDeclaringClass, $method, $node->getOriginalNode()->name));
+			$messages = array_merge($messages, $this->methodVisibilityComparisonHelper->compare($prototype, $prototypeDeclaringClass, $method));
 		}
 
 		$prototypeVariants = $prototype->getVariants();

tests/PHPStan/Reflection/Annotations/DeprecatedAttributePhpFunctionFromParserReflectionRuleTest.php

@@ -99,15 +99,15 @@ public function testMethodRule(): void
 			],
 			[
 				'Deprecated',
-				15,
+				16,
 			],
 			[
 				'Deprecated: msg',
-				21,
+				22,
 			],
 			[
 				'Deprecated: msg2',
-				27,
+				28,
 			],
 		]);
 	}

tests/PHPStan/Reflection/AttributeReflectionFromNodeRuleTest.php

@@ -86,7 +86,7 @@ public function testRule(): void
 		$this->analyse([__DIR__ . '/data/attribute-reflection.php'], [
 			[
 				'#[AttributeReflectionTest\MyAttr(one: 7, two: 8)], $test: #[AttributeReflectionTest\MyAttr(one: 9, two: 10)]',
-				28,
+				29,
 			],
 			[
 				'#[AttributeReflectionTest\MyAttr()]',

tests/PHPStan/Rules/Methods/MethodSignatureRuleTest.php

@@ -221,15 +221,15 @@ public function testBug3997(): void
 		$this->analyse([__DIR__ . '/data/bug-3997.php'], [
 			[
 				'Return type (int) of method Bug3997\Baz::count() should be covariant with return type (int<0, max>) of method Countable::count()',
-				35,
+				36,
 			],
 			[
 				'Return type (int) of method Bug3997\Lorem::count() should be covariant with return type (int<0, max>) of method Countable::count()',
-				49,
+				50,
 			],
 			[
 				'Return type (string) of method Bug3997\Ipsum::count() should be compatible with return type (int<0, max>) of method Countable::count()',
-				63,
+				64,
 			],
 		]);
 	}

tests/PHPStan/Rules/Methods/OverridingMethodRuleTest.php

@@ -659,7 +659,7 @@ public function testBug10101(): void
 		$this->analyse([__DIR__ . '/data/bug-10101.php'], [
 			[
 				'Return type mixed of method Bug10101\B::next() is not covariant with return type void of method Bug10101\A::next().',
-				10,
+				11,
 			],
 		]);
 	}
@@ -690,7 +690,7 @@ public function testBug10149(): void
 		$errors = [
 			[
 				'Method Bug10149\StdSat::__get() has #[\Override] attribute but does not override any method.',
-				10,
+				11,
 			],
 		];
 		$this->analyse([__DIR__ . '/data/bug-10149.php'], $errors);
@@ -729,11 +729,11 @@ public function testOverrideAttribute(): void
 		$this->analyse([__DIR__ . '/data/override-attribute.php'], [
 			[
 				'Method OverrideAttribute\Bar::test2() has #[\Override] attribute but does not override any method.',
-				24,
+				25,
 			],
 			[
 				'Method OverrideAttribute\ChildOfParentWithConstructor::__construct() has #[\Override] attribute but does not override any method.',
-				42,
+				43,
 			],
 		]);
 	}