Fix logic

Author: ondrejmirtes

src/Rules/Properties/PropertyInClassRule.php

@@ -64,17 +64,17 @@ public function processNode(Node $node, Scope $scope): array
 							->build(),
 					];
 				}
+
+				return [];
 			}
 
-			if (!$node->isAbstract()) {
-				if ($node->hasHooks()) {
-					return [
-						RuleErrorBuilder::message('Abstract classes cannot include non-abstract hooked properties without bodies.')
-							->nonIgnorable()
-							->identifier('property.nonAbstractWithAbstractHook')
-							->build(),
-					];
-				}
+			if (!$this->doAllHooksHaveBody($node)) {
+				return [
+					RuleErrorBuilder::message('Non-abstract properties cannot include hooks without bodies.')
+						->nonIgnorable()
+						->identifier('property.hookWithoutBody')
+						->build(),
+				];
 			}
 
 			return [];

tests/PHPStan/Rules/Properties/PropertyInClassRuleTest.php

@@ -97,13 +97,17 @@ public function testPhp84AndNonAbstractHookedPropertiesInAbstractClass(): void
 
 		$this->analyse([__DIR__ . '/data/non-abstract-hooked-properties-in-abstract-class.php'], [
 			[
-				'Abstract classes cannot include non-abstract hooked properties without bodies.',
+				'Non-abstract properties cannot include hooks without bodies.',
 				7,
 			],
 			[
-				'Abstract classes cannot include non-abstract hooked properties without bodies.',
+				'Non-abstract properties cannot include hooks without bodies.',
 				9,
 			],
+			[
+				'Non-abstract properties cannot include hooks without bodies.',
+				25,
+			],
 		]);
 	}
 

tests/PHPStan/Rules/Properties/data/non-abstract-hooked-properties-in-abstract-class.php

@@ -8,3 +8,28 @@ abstract class AbstractPerson
 
 	public string $lastName { get; set; }
 }
+
+abstract class Foo
+{
+
+	public string $name {
+		get {
+
+		}
+
+		set {
+
+		}
+	}
+
+	public string $name2 {
+		get;
+
+		set {
+
+		}
+	}
+
+	public string $name3;
+
+}