Rename isFinal to isFinalByKeyword and isFinalByPhpDoc to isFinal

lpd-au · lpd-au · commit c0d56bc043ed · 2025-05-14T22:07:57.000+10:00
diff --git a/src/Analyser/NodeScopeResolver.php b/src/Analyser/NodeScopeResolver.php
@@ -4373,7 +4373,7 @@ private function getThrowPointsFromPropertyHook(
 		if (!$propertyReflection->hasHook($hookName)) {
 			if (
 				$propertyReflection->isPrivate()
-				|| $propertyReflection->isFinal()->yes()
+				|| $propertyReflection->isFinalByKeyword()->yes()
 				|| $declaringClass->isFinal()
 			) {
 				return [];
diff --git a/src/Reflection/Annotations/AnnotationPropertyReflection.php b/src/Reflection/Annotations/AnnotationPropertyReflection.php
@@ -119,7 +119,7 @@ public function isAbstract(): TrinaryLogic
 		return TrinaryLogic::createNo();
 	}
 
-	public function isFinal(): TrinaryLogic
+	public function isFinalByKeyword(): TrinaryLogic
 	{
 		return TrinaryLogic::createNo();
 	}
diff --git a/src/Reflection/Dummy/ChangedTypePropertyReflection.php b/src/Reflection/Dummy/ChangedTypePropertyReflection.php
@@ -116,9 +116,9 @@ public function isAbstract(): TrinaryLogic
 		return $this->reflection->isAbstract();
 	}
 
-	public function isFinal(): TrinaryLogic
+	public function isFinalByKeyword(): TrinaryLogic
 	{
-		return $this->reflection->isFinal();
+		return $this->reflection->isFinalByKeyword();
 	}
 
 	public function isVirtual(): TrinaryLogic
diff --git a/src/Reflection/Dummy/DummyPropertyReflection.php b/src/Reflection/Dummy/DummyPropertyReflection.php
@@ -116,7 +116,7 @@ public function isAbstract(): TrinaryLogic
 		return TrinaryLogic::createNo();
 	}
 
-	public function isFinal(): TrinaryLogic
+	public function isFinalByKeyword(): TrinaryLogic
 	{
 		return TrinaryLogic::createNo();
 	}
diff --git a/src/Reflection/ExtendedPropertyReflection.php b/src/Reflection/ExtendedPropertyReflection.php
@@ -38,7 +38,7 @@ public function getNativeType(): Type;
 
 	public function isAbstract(): TrinaryLogic;
 
-	public function isFinal(): TrinaryLogic;
+	public function isFinalByKeyword(): TrinaryLogic;
 
 	public function isVirtual(): TrinaryLogic;
 
diff --git a/src/Reflection/Php/EnumPropertyReflection.php b/src/Reflection/Php/EnumPropertyReflection.php
@@ -112,7 +112,7 @@ public function isAbstract(): TrinaryLogic
 		return TrinaryLogic::createNo();
 	}
 
-	public function isFinal(): TrinaryLogic
+	public function isFinalByKeyword(): TrinaryLogic
 	{
 		return TrinaryLogic::createNo();
 	}
diff --git a/src/Reflection/Php/PhpClassReflectionExtension.php b/src/Reflection/Php/PhpClassReflectionExtension.php
@@ -227,7 +227,7 @@ private function createProperty(
 		$isDeprecated = $deprecation !== null;
 		$isInternal = false;
 		$isReadOnlyByPhpDoc = $classReflection->isImmutable();
-		$isFinalByPhpDoc = $classReflection->isFinal();
+		$isFinal = $classReflection->isFinal() || $propertyReflection->isFinal();
 		$isAllowedPrivateMutation = false;
 
 		if (
@@ -309,7 +309,7 @@ private function createProperty(
 			}
 			$isInternal = $resolvedPhpDoc->isInternal();
 			$isReadOnlyByPhpDoc = $isReadOnlyByPhpDoc || $resolvedPhpDoc->isReadOnly();
-			$isFinalByPhpDoc = $isFinalByPhpDoc || $resolvedPhpDoc->isFinal();
+			$isFinal = $isFinal || $resolvedPhpDoc->isFinal();
 			$isAllowedPrivateMutation = $resolvedPhpDoc->isAllowedPrivateMutation();
 		}
 
@@ -437,7 +437,7 @@ private function createProperty(
 			$isReadOnlyByPhpDoc,
 			$isAllowedPrivateMutation,
 			$this->attributeReflectionFactory->fromNativeReflection($propertyReflection->getAttributes(), InitializerExprContext::fromClass($declaringClassReflection->getName(), $declaringClassReflection->getFileName())),
-			$isFinalByPhpDoc,
+			$isFinal,
 		);
 	}
 
diff --git a/src/Reflection/Php/PhpPropertyReflection.php b/src/Reflection/Php/PhpPropertyReflection.php
@@ -44,7 +44,7 @@ public function __construct(
 		private bool $isReadOnlyByPhpDoc,
 		private bool $isAllowedPrivateMutation,
 		private array $attributes,
-		private bool $isFinalByPhpDoc,
+		private bool $isFinal,
 	)
 	{
 	}
@@ -99,9 +99,9 @@ public function isReadOnlyByPhpDoc(): bool
 		return $this->isReadOnlyByPhpDoc;
 	}
 
-	public function isFinalByPhpDoc(): bool
+	public function isFinal(): bool
 	{
-		return $this->isFinalByPhpDoc;
+		return $this->isFinal;
 	}
 
 	public function getReadableType(): Type
@@ -248,7 +248,7 @@ public function isAbstract(): TrinaryLogic
 		return TrinaryLogic::createFromBoolean($this->reflection->isAbstract());
 	}
 
-	public function isFinal(): TrinaryLogic
+	public function isFinalByKeyword(): TrinaryLogic
 	{
 		return TrinaryLogic::createFromBoolean($this->reflection->isFinal());
 	}
diff --git a/src/Reflection/Php/SimpleXMLElementProperty.php b/src/Reflection/Php/SimpleXMLElementProperty.php
@@ -127,7 +127,7 @@ public function isAbstract(): TrinaryLogic
 		return TrinaryLogic::createNo();
 	}
 
-	public function isFinal(): TrinaryLogic
+	public function isFinalByKeyword(): TrinaryLogic
 	{
 		return TrinaryLogic::createNo();
 	}
diff --git a/src/Reflection/Php/UniversalObjectCrateProperty.php b/src/Reflection/Php/UniversalObjectCrateProperty.php
@@ -117,7 +117,7 @@ public function isAbstract(): TrinaryLogic
 		return TrinaryLogic::createNo();
 	}
 
-	public function isFinal(): TrinaryLogic
+	public function isFinalByKeyword(): TrinaryLogic
 	{
 		return TrinaryLogic::createNo();
 	}
diff --git a/src/Reflection/ResolvedPropertyReflection.php b/src/Reflection/ResolvedPropertyReflection.php
@@ -174,9 +174,9 @@ public function isAbstract(): TrinaryLogic
 		return $this->reflection->isAbstract();
 	}
 
-	public function isFinal(): TrinaryLogic
+	public function isFinalByKeyword(): TrinaryLogic
 	{
-		return $this->reflection->isFinal();
+		return $this->reflection->isFinalByKeyword();
 	}
 
 	public function isVirtual(): TrinaryLogic
diff --git a/src/Reflection/Type/IntersectionTypePropertyReflection.php b/src/Reflection/Type/IntersectionTypePropertyReflection.php
@@ -148,9 +148,9 @@ public function isAbstract(): TrinaryLogic
 		return TrinaryLogic::lazyMaxMin($this->properties, static fn (ExtendedPropertyReflection $propertyReflection): TrinaryLogic => $propertyReflection->isAbstract());
 	}
 
-	public function isFinal(): TrinaryLogic
+	public function isFinalByKeyword(): TrinaryLogic
 	{
-		return TrinaryLogic::lazyMaxMin($this->properties, static fn (ExtendedPropertyReflection $propertyReflection): TrinaryLogic => $propertyReflection->isFinal());
+		return TrinaryLogic::lazyMaxMin($this->properties, static fn (ExtendedPropertyReflection $propertyReflection): TrinaryLogic => $propertyReflection->isFinalByKeyword());
 	}
 
 	public function isVirtual(): TrinaryLogic
diff --git a/src/Reflection/Type/UnionTypePropertyReflection.php b/src/Reflection/Type/UnionTypePropertyReflection.php
@@ -148,9 +148,9 @@ public function isAbstract(): TrinaryLogic
 		return TrinaryLogic::lazyExtremeIdentity($this->properties, static fn (ExtendedPropertyReflection $propertyReflection): TrinaryLogic => $propertyReflection->isAbstract());
 	}
 
-	public function isFinal(): TrinaryLogic
+	public function isFinalByKeyword(): TrinaryLogic
 	{
-		return TrinaryLogic::lazyExtremeIdentity($this->properties, static fn (ExtendedPropertyReflection $propertyReflection): TrinaryLogic => $propertyReflection->isFinal());
+		return TrinaryLogic::lazyExtremeIdentity($this->properties, static fn (ExtendedPropertyReflection $propertyReflection): TrinaryLogic => $propertyReflection->isFinalByKeyword());
 	}
 
 	public function isVirtual(): TrinaryLogic
diff --git a/src/Reflection/WrappedExtendedPropertyReflection.php b/src/Reflection/WrappedExtendedPropertyReflection.php
@@ -109,7 +109,7 @@ public function isAbstract(): TrinaryLogic
 		return TrinaryLogic::createNo();
 	}
 
-	public function isFinal(): TrinaryLogic
+	public function isFinalByKeyword(): TrinaryLogic
 	{
 		return TrinaryLogic::createNo();
 	}
diff --git a/src/Rules/Properties/FoundPropertyReflection.php b/src/Rules/Properties/FoundPropertyReflection.php
@@ -143,9 +143,9 @@ public function isAbstract(): TrinaryLogic
 		return $this->originalPropertyReflection->isAbstract();
 	}
 
-	public function isFinal(): TrinaryLogic
+	public function isFinalByKeyword(): TrinaryLogic
 	{
-		return $this->originalPropertyReflection->isFinal();
+		return $this->originalPropertyReflection->isFinalByKeyword();
 	}
 
 	public function isVirtual(): TrinaryLogic
diff --git a/src/Rules/Properties/OverridingPropertyRule.php b/src/Rules/Properties/OverridingPropertyRule.php
@@ -135,7 +135,7 @@ public function processNode(Node $node, Scope $scope): array
 			))->identifier('property.visibility')->nonIgnorable()->build();
 		}
 
-		if ($prototype->isFinal()->yes()) {
+		if ($prototype->isFinalByKeyword()->yes()) {
 			$errors[] = RuleErrorBuilder::message(sprintf(
 				'Property %s::$%s overrides final property %s::$%s.',
 				$classReflection->getDisplayName(),
diff --git a/src/Rules/Variables/UnsetRule.php b/src/Rules/Variables/UnsetRule.php
@@ -81,8 +81,7 @@ public function processNode(Node $node, Scope $scope): array
 				} elseif ($this->phpVersion->supportsPropertyHooks()) {
 					if (
 						!$propertyReflection->isPrivate()
-						&& !$propertyReflection->isFinal()->yes()
-						&& !$propertyReflection->isFinalByPhpDoc()
+						&& !$propertyReflection->isFinal()
 						&& !$propertyReflection->getDeclaringClass()->isFinal()
 					) {
 						$errors[] = RuleErrorBuilder::message(
diff --git a/src/Type/ObjectShapePropertyReflection.php b/src/Type/ObjectShapePropertyReflection.php
@@ -114,7 +114,7 @@ public function isAbstract(): TrinaryLogic
 		return TrinaryLogic::createNo();
 	}
 
-	public function isFinal(): TrinaryLogic
+	public function isFinalByKeyword(): TrinaryLogic
 	{
 		return TrinaryLogic::createNo();
 	}

Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,7 @@ public function isAbstract(): TrinaryLogic`
`119`	`119`	`return TrinaryLogic::createNo();`
`120`	`120`	`}`
`121`	`121`
`122`		`- public function isFinal(): TrinaryLogic`
	`122`	`+ public function isFinalByKeyword(): TrinaryLogic`
`123`	`123`	`{`
`124`	`124`	`return TrinaryLogic::createNo();`
`125`	`125`	`}`
Original file line number	Diff line number	Diff line change
`@@ -116,9 +116,9 @@ public function isAbstract(): TrinaryLogic`
`116`	`116`	`return $this->reflection->isAbstract();`
`117`	`117`	`}`
`118`	`118`
`119`		`- public function isFinal(): TrinaryLogic`
	`119`	`+ public function isFinalByKeyword(): TrinaryLogic`
`120`	`120`	`{`
`121`		`- return $this->reflection->isFinal();`
	`121`	`+ return $this->reflection->isFinalByKeyword();`
`122`	`122`	`}`
`123`	`123`
`124`	`124`	`public function isVirtual(): TrinaryLogic`
Original file line number	Diff line number	Diff line change
`@@ -116,7 +116,7 @@ public function isAbstract(): TrinaryLogic`
`116`	`116`	`return TrinaryLogic::createNo();`
`117`	`117`	`}`
`118`	`118`
`119`		`- public function isFinal(): TrinaryLogic`
	`119`	`+ public function isFinalByKeyword(): TrinaryLogic`
`120`	`120`	`{`
`121`	`121`	`return TrinaryLogic::createNo();`
`122`	`122`	`}`
Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,7 @@ public function isAbstract(): TrinaryLogic`
`112`	`112`	`return TrinaryLogic::createNo();`
`113`	`113`	`}`
`114`	`114`
`115`		`- public function isFinal(): TrinaryLogic`
	`115`	`+ public function isFinalByKeyword(): TrinaryLogic`
`116`	`116`	`{`
`117`	`117`	`return TrinaryLogic::createNo();`
`118`	`118`	`}`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ public function __construct(`
`44`	`44`	`private bool $isReadOnlyByPhpDoc,`
`45`	`45`	`private bool $isAllowedPrivateMutation,`
`46`	`46`	`private array $attributes,`
`47`		`- private bool $isFinalByPhpDoc,`
	`47`	`+ private bool $isFinal,`
`48`	`48`	`)`
`49`	`49`	`{`
`50`	`50`	`}`
`@@ -99,9 +99,9 @@ public function isReadOnlyByPhpDoc(): bool`
`99`	`99`	`return $this->isReadOnlyByPhpDoc;`
`100`	`100`	`}`
`101`	`101`
`102`		`- public function isFinalByPhpDoc(): bool`
	`102`	`+ public function isFinal(): bool`
`103`	`103`	`{`
`104`		`- return $this->isFinalByPhpDoc;`
	`104`	`+ return $this->isFinal;`
`105`	`105`	`}`
`106`	`106`
`107`	`107`	`public function getReadableType(): Type`
`@@ -248,7 +248,7 @@ public function isAbstract(): TrinaryLogic`
`248`	`248`	`return TrinaryLogic::createFromBoolean($this->reflection->isAbstract());`
`249`	`249`	`}`
`250`	`250`
`251`		`- public function isFinal(): TrinaryLogic`
	`251`	`+ public function isFinalByKeyword(): TrinaryLogic`
`252`	`252`	`{`
`253`	`253`	`return TrinaryLogic::createFromBoolean($this->reflection->isFinal());`
`254`	`254`	`}`
Original file line number	Diff line number	Diff line change
`@@ -127,7 +127,7 @@ public function isAbstract(): TrinaryLogic`
`127`	`127`	`return TrinaryLogic::createNo();`
`128`	`128`	`}`
`129`	`129`
`130`		`- public function isFinal(): TrinaryLogic`
	`130`	`+ public function isFinalByKeyword(): TrinaryLogic`
`131`	`131`	`{`
`132`	`132`	`return TrinaryLogic::createNo();`
`133`	`133`	`}`
Original file line number	Diff line number	Diff line change
`@@ -117,7 +117,7 @@ public function isAbstract(): TrinaryLogic`
`117`	`117`	`return TrinaryLogic::createNo();`
`118`	`118`	`}`
`119`	`119`
`120`		`- public function isFinal(): TrinaryLogic`
	`120`	`+ public function isFinalByKeyword(): TrinaryLogic`
`121`	`121`	`{`
`122`	`122`	`return TrinaryLogic::createNo();`
`123`	`123`	`}`