Detect non-abstract methods with no body

Author: paulbalandan

src/Rules/Methods/AbstractMethodInNonAbstractClassRule.php

@@ -27,17 +27,29 @@ public function processNode(Node $node, Scope $scope): array
 }
 
 $class = $scope->getClassReflection();
-if ($class->isAbstract()) {
-return [];
+
+if (!$class->isAbstract() && $node->isAbstract()) {
+return [
+RuleErrorBuilder::message(sprintf(
+'%s %s contains abstract method %s().',
+$class->isInterface() ? 'Interface' : 'Non-abstract class',
+$class->getDisplayName(),
+$node->name->toString(),
+))->nonIgnorable()->build(),
+];
 }
 
-if (!$node->isAbstract()) {
-return [];
+if (!$class->isAbstract() && !$class->isInterface() && $node->getStmts() === null) {
+return [
+RuleErrorBuilder::message(sprintf(
+'Non-abstract method %s::%s() must contain a body.',
+$class->getDisplayName(),
+$node->name->toString(),
+))->nonIgnorable()->build(),
+];
 }
 
-return [
-RuleErrorBuilder::message(sprintf('Non-abstract class %s contains abstract method %s().', $class->getDisplayName(), $node->name->toString()))->nonIgnorable()->build(),
-];
+return [];
 }
 
 }

tests/PHPStan/Rules/Methods/AbstractMethodInNonAbstractClassRuleTest.php

@@ -26,7 +26,7 @@ public function testRule(): void
 15,
 ],
 [
-'Non-abstract class AbstractMethod\Baz contains abstract method doBar().',
+'Interface AbstractMethod\Baz contains abstract method doBar().',
 22,
 ],
 ]);
@@ -60,4 +60,14 @@ public function testBug4214(): void
 $this->analyse([__DIR__ . '/data/bug-4214.php'], []);
 }
 
+public function testNonAbstractMethodWithNoBody(): void
+{
+$this->analyse([__DIR__ . '/data/bug-4244.php'], [
+[
+'Non-abstract method HelloWorld::sayHello() must contain a body.',
+5,
+],
+]);
+}
+
 }

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

@@ -0,0 +1,6 @@
+<?php declare(strict_types = 1);
+
+class HelloWorld
+{
+public function sayHello(): void;
+}