Fix phpstan/phpstan#14398: Incorrect line number for "Private method overriding public method should be public"

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),
 		);
 	}
 

src/Rules/Methods/MethodVisibilityComparisonHelper.php

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