simplify

Author: staabm

src/Php/PhpVersion.php

@@ -357,7 +357,7 @@ public function supportsPropertyHooks(): bool
 		return $this->versionId >= 80400;
 	}
 
-	public function supportsNonPrivateFinalProperties(): bool
+	public function supportsFinalProperties(): bool
 	{
 		return $this->versionId >= 80400;
 	}

src/Rules/Properties/PropertyInClassRule.php

@@ -83,11 +83,10 @@ public function processNode(Node $node, Scope $scope): array
 
 		if (
 			$node->isFinal()
-			&& !$node->hasHooks()
-			&& (!$this->phpVersion->supportsNonPrivateFinalProperties() || $node->isPrivate())
+			&& !$this->phpVersion->supportsFinalProperties()
 		) {
 			return [
-				RuleErrorBuilder::message('Properties cannot be final.')
+				RuleErrorBuilder::message('Property cannot be final.')
 					->nonIgnorable()
 					->identifier('property.final')
 					->build(),
@@ -97,7 +96,7 @@ public function processNode(Node $node, Scope $scope): array
 		if ($node->isPrivate()) {
 			if ($node->isFinal()) {
 				return [
-					RuleErrorBuilder::message('Properties cannot be both final and private.')
+					RuleErrorBuilder::message('Property cannot be both final and private.')
 						->nonIgnorable()
 						->identifier('property.finalPrivate')
 						->build(),
@@ -110,7 +109,7 @@ public function processNode(Node $node, Scope $scope): array
 				}
 
 				return [
-					RuleErrorBuilder::message('Properties cannot be both final and private.')
+					RuleErrorBuilder::message('Property cannot be both final and private.')
 						->nonIgnorable()
 						->identifier('property.finalPrivate')
 						->build(),

tests/PHPStan/Rules/Properties/PropertyInClassRuleTest.php

@@ -221,11 +221,11 @@ public function testPhp84AndPrivateFinalHookedProperties(): void
 
 		$this->analyse([__DIR__ . '/data/private-final-property-hooks.php'], [
 			[
-				'Properties cannot be both final and private.',
+				'Property cannot be both final and private.',
 				7,
 			],
 			[
-				'Properties cannot be both final and private.',
+				'Property cannot be both final and private.',
 				11,
 			],
 		]);
@@ -239,7 +239,7 @@ public function testPhp84FinalProperties(): void
 
 		$this->analyse([__DIR__ . '/data/final-properties.php'], [
 			[
-				'Properties cannot be final.',
+				'Property cannot be both final and private.',
 				7,
 			],
 		]);
@@ -252,15 +252,15 @@ public function testBeforePhp84FinalProperties(): void
 
 		$this->analyse([__DIR__ . '/data/final-properties.php'], [
 			[
-				'Properties cannot be final.',
+				'Property cannot be final.',
 				7,
 			],
 			[
-				'Properties cannot be final.',
+				'Property cannot be final.',
 				8,
 			],
 			[
-				'Properties cannot be final.',
+				'Property cannot be final.',
 				9,
 			],
 		]);