Fix phpstan/phpstan#14398: Incorrect line number for method visibility errors

- Added optional $line parameter to MethodVisibilityComparisonHelper::compare()
- Pass method name start line from OverridingMethodRule and ConsistentConstructorRule
- This ensures visibility errors point to the function declaration line, not the first attribute line
- New regression test in tests/PHPStan/Rules/Methods/data/bug-14398.php

Author: VincentLanglet

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),
+			$this->methodVisibilityComparisonHelper->compare($parentConstructor, $parentConstructor->getDeclaringClass(), $method, $node->getOriginalNode()->name->getStartLine()),
 		);
 	}
 

src/Rules/Methods/MethodVisibilityComparisonHelper.php

@@ -15,14 +15,14 @@ final class MethodVisibilityComparisonHelper
 {
 
 	/** @return list<IdentifierRuleError> */
-	public function compare(ExtendedMethodReflection $prototype, ClassReflection $prototypeDeclaringClass, PhpMethodFromParserNodeReflection $method): array
+	public function compare(ExtendedMethodReflection $prototype, ClassReflection $prototypeDeclaringClass, PhpMethodFromParserNodeReflection $method, ?int $line = null): array
 	{
 		/** @var list<IdentifierRuleError> $messages */
 		$messages = [];
 
 		if ($prototype->isPublic()) {
 			if (!$method->isPublic()) {
-				$messages[] = RuleErrorBuilder::message(sprintf(
+				$errorBuilder = RuleErrorBuilder::message(sprintf(
 					'%s method %s::%s() overriding public method %s::%s() should also be public.',
 					$method->isPrivate() ? 'Private' : 'Protected',
 					$method->getDeclaringClass()->getDisplayName(),
@@ -31,20 +31,26 @@ public function compare(ExtendedMethodReflection $prototype, ClassReflection $pr
 					$prototype->getName(),
 				))
 					->nonIgnorable()
-					->identifier('method.visibility')
-					->build();
+					->identifier('method.visibility');
+				if ($line !== null) {
+					$errorBuilder->line($line);
+				}
+				$messages[] = $errorBuilder->build();
 			}
 		} elseif ($method->isPrivate()) {
-			$messages[] = RuleErrorBuilder::message(sprintf(
+			$errorBuilder = RuleErrorBuilder::message(sprintf(
 				'Private method %s::%s() overriding protected method %s::%s() should be protected or public.',
 				$method->getDeclaringClass()->getDisplayName(),
 				$method->getName(),
 				$prototypeDeclaringClass->getDisplayName(true),
 				$prototype->getName(),
 			))
 				->nonIgnorable()
-				->identifier('method.visibility')
-				->build();
+				->identifier('method.visibility');
+			if ($line !== null) {
+				$errorBuilder->line($line);
+			}
+			$messages[] = $errorBuilder->build();
 		}
 
 		return $messages;

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));
+			$messages = array_merge($messages, $this->methodVisibilityComparisonHelper->compare($prototype, $prototypeDeclaringClass, $method, $node->getOriginalNode()->name->getStartLine()));
 		}
 
 		$prototypeVariants = $prototype->getVariants();

tests/PHPStan/Rules/Methods/OverridingMethodRuleTest.php

@@ -853,4 +853,16 @@ public function testFixWithTabs(): void
 		$this->fix(__DIR__ . '/data/fix-with-tabs.php', __DIR__ . '/data/fix-with-tabs.php.fixed');
 	}
 
+	#[RequiresPhp('>= 8.0')]
+	public function testBug14398(): void
+	{
+		$this->phpVersionId = PHP_VERSION_ID;
+		$this->analyse([__DIR__ . '/data/bug-14398.php'], [
+			[
+				'Private method Bug14398\ChildPrivateOverridesProtected::calculate() overriding protected method Bug14398\BaseProtectedMethod::calculate() should be protected or public.',
+				17,
+			],
+		]);
+	}
+
 }

tests/PHPStan/Rules/Methods/data/bug-14398.php

@@ -0,0 +1,21 @@
+<?php // lint >= 8.0
+
+namespace Bug14398;
+
+class BaseProtectedMethod
+{
+    protected function calculate(): int
+    {
+        return 42;
+    }
+}
+
+class ChildPrivateOverridesProtected extends BaseProtectedMethod
+{
+    // PHPStan: Private method … overriding protected method … should be protected or public.
+    #[Override]
+    private function calculate(): int
+    {
+        return 99;
+    }
+}