Abstract trait method check - do not check visibility

Author: ondrejmirtes

src/Rules/Methods/OverridingMethodRule.php

@@ -49,8 +49,8 @@ public function getNodeType(): string
 public function processNode(Node $node, Scope $scope): array
 {
 $method = $node->getMethodReflection();
-$prototype = $this->findPrototype($node->getClassReflection(), $method->getName());
-if ($prototype === null) {
+$prototypeData = $this->findPrototype($node->getClassReflection(), $method->getName());
+if ($prototypeData === null) {
 if (strtolower($method->getName()) === '__construct') {
 $parent = $method->getDeclaringClass()->getParentClass();
 if ($parent !== null && $parent->hasConstructor()) {
@@ -93,6 +93,8 @@ public function processNode(Node $node, Scope $scope): array
 return [];
 }
 
+[$prototype, $checkVisibility] = $prototypeData;
+
 $messages = [];
 if ($prototype->isFinalByKeyword()->yes()) {
 $messages[] = RuleErrorBuilder::message(sprintf(
@@ -132,19 +134,19 @@ public function processNode(Node $node, Scope $scope): array
 ))->nonIgnorable()->build();
 }
 
-if ($prototype->isPublic()) {
-if (!$method->isPublic()) {
-$messages[] = RuleErrorBuilder::message(sprintf(
-'%s method %s::%s() overriding public method %s::%s() should also be public.',
-$method->isPrivate() ? 'Private' : 'Protected',
-$method->getDeclaringClass()->getDisplayName(),
-$method->getName(),
-$prototype->getDeclaringClass()->getDisplayName($this->genericPrototypeMessage),
-$prototype->getName(),
-))->nonIgnorable()->build();
-}
-} elseif ($method->isPrivate()) {
-if (!$prototype->isPrivate()) {
+if ($checkVisibility) {
+if ($prototype->isPublic()) {
+if (!$method->isPublic()) {
+$messages[] = RuleErrorBuilder::message(sprintf(
+'%s method %s::%s() overriding public method %s::%s() should also be public.',
+$method->isPrivate() ? 'Private' : 'Protected',
+$method->getDeclaringClass()->getDisplayName(),
+$method->getName(),
+$prototype->getDeclaringClass()->getDisplayName($this->genericPrototypeMessage),
+$prototype->getName(),
+))->nonIgnorable()->build();
+}
+} elseif ($method->isPrivate()) {
 $messages[] = RuleErrorBuilder::message(sprintf(
 'Private method %s::%s() overriding protected method %s::%s() should be protected or public.',
 $method->getDeclaringClass()->getDisplayName(),
@@ -293,11 +295,14 @@ private function hasOverrideAttribute(Node\Stmt\ClassMethod $method): bool
 return false;
 }
 
-private function findPrototype(ClassReflection $classReflection, string $methodName): ?ExtendedMethodReflection
+/**
+ * @return array{ExtendedMethodReflection, bool}|null
+ */
+private function findPrototype(ClassReflection $classReflection, string $methodName): ?array
 {
 foreach ($classReflection->getImmediateInterfaces() as $immediateInterface) {
 if ($immediateInterface->hasNativeMethod($methodName)) {
-return $immediateInterface->getNativeMethod($methodName);
+return [$immediateInterface->getNativeMethod($methodName), true];
 }
 }
 
@@ -311,10 +316,10 @@ private function findPrototype(ClassReflection $classReflection, string $methodN
 $isAbstract = $method->isAbstract();
 if (is_bool($isAbstract)) {
 if ($isAbstract) {
-return $method;
+return [$method, false];
 }
 } elseif ($isAbstract->yes()) {
-return $method;
+return [$method, false];
 }
 }
 }
@@ -350,7 +355,7 @@ private function findPrototype(ClassReflection $classReflection, string $methodN
 }
 }
 
-return $method;
+return [$method, true];
 }
 
 }

tests/PHPStan/Rules/Methods/OverridingMethodRuleTest.php

@@ -722,6 +722,14 @@ public function testTraits(): void
 'Parameter #1 $i (int) of method OverridingTraitMethods\Baz::doBar() is not contravariant with parameter #1 $i (string) of method OverridingTraitMethods\FooPrivate::doBar().',
 45,
 ],
+[
+'Static method OverridingTraitMethods\Ipsum::doBar() overrides non-static method OverridingTraitMethods\Foo::doBar().',
+65,
+],
+[
+'Non-static method OverridingTraitMethods\Dolor::doBar() overrides static method OverridingTraitMethods\FooStatic::doBar().',
+80,
+],
 ];
 }
 $this->phpVersionId = PHP_VERSION_ID;

tests/PHPStan/Rules/Methods/data/overriding-trait-methods.php

@@ -47,3 +47,38 @@ private function doBar(int $i): int
 
 }
 }
+
+class Lorem
+{
+use Foo;
+
+protected function doBar(string $i): int
+{
+
+}
+}
+
+class Ipsum
+{
+use Foo;
+
+public static function doBar(string $i): int
+{
+
+}
+}
+
+trait FooStatic
+{
+abstract public static function doBar(string $i): int;
+}
+
+class Dolor
+{
+use FooStatic;
+
+public function doBar(string $i): int
+{
+
+}
+}