Cleanup

Author: ondrejmirtes

src/Rules/Properties/PropertyInClassRule.php

@@ -45,59 +45,44 @@ public function processNode(Node $node, Scope $scope): array
 			return [];
 		}
 
-		if ($classReflection->isAbstract()) {
-			if ($node->isAbstract()) {
-				if (!$node->hasHooks()) {
-					return [
-						RuleErrorBuilder::message('Only hooked properties can be declared abstract.')
-							->nonIgnorable()
-							->identifier('property.abstractNonHooked')
-							->build(),
-					];
-				}
-
-				if (!$this->isAtLeastOneHookBodyEmpty($node)) {
-					return [
-						RuleErrorBuilder::message('Abstract properties must specify at least one abstract hook.')
-							->nonIgnorable()
-							->identifier('property.abstractWithoutAbstractHook')
-							->build(),
-					];
-				}
-
-				return [];
-			}
-
-			if (!$this->doAllHooksHaveBody($node)) {
+		if ($node->isAbstract()) {
+			if (!$node->hasHooks()) {
 				return [
-					RuleErrorBuilder::message('Non-abstract properties cannot include hooks without bodies.')
+					RuleErrorBuilder::message('Only hooked properties can be declared abstract.')
 						->nonIgnorable()
-						->identifier('property.hookWithoutBody')
+						->identifier('property.abstractNonHooked')
 						->build(),
 				];
 			}
 
-			return [];
-		}
-
-		if ($node->hasHooks()) {
-			if ($node->isAbstract()) {
+			if (!$this->isAtLeastOneHookBodyEmpty($node)) {
 				return [
-					RuleErrorBuilder::message('Non-abstract classes cannot include abstract properties.')
+					RuleErrorBuilder::message('Abstract properties must specify at least one abstract hook.')
 						->nonIgnorable()
-						->identifier('property.abstract')
+						->identifier('property.abstractWithoutAbstractHook')
 						->build(),
 				];
 			}
 
-			if (!$this->doAllHooksHaveBody($node)) {
+			if (!$classReflection->isAbstract()) {
 				return [
-					RuleErrorBuilder::message('Non-abstract properties cannot include hooks without bodies.')
+					RuleErrorBuilder::message('Non-abstract classes cannot include abstract properties.')
 						->nonIgnorable()
-						->identifier('property.hookWithoutBody')
+						->identifier('property.abstract')
 						->build(),
 				];
 			}
+
+			return [];
+		}
+
+		if (!$this->doAllHooksHaveBody($node)) {
+			return [
+				RuleErrorBuilder::message('Non-abstract properties cannot include hooks without bodies.')
+					->nonIgnorable()
+					->identifier('property.hookWithoutBody')
+					->build(),
+			];
 		}
 
 		return [];