Update ClassReflection::getConstant() return type

ondrejmirtes · ondrejmirtes · commit 8d4ea60a5710 · 2024-01-22T13:52:10.000+01:00
diff --git a/src/Reflection/ClassReflection.php b/src/Reflection/ClassReflection.php
@@ -79,7 +79,7 @@ class ClassReflection
 	/** @var PropertyReflection[] */
 	private array $properties = [];
 
-	/** @var ConstantReflection[] */
+	/** @var ClassConstantReflection[] */
 	private array $constants = [];
 
 	/** @var int[]|null */
@@ -1005,7 +1005,7 @@ public function hasConstant(string $name): bool
 		return $this->reflectionProvider->hasClass($reflectionConstant->getDeclaringClass()->getName());
 	}
 
-	public function getConstant(string $name): ConstantReflection
+	public function getConstant(string $name): ClassConstantReflection
 	{
 		if (!isset($this->constants[$name])) {
 			$reflectionConstant = $this->getNativeReflection()->getReflectionConstant($name);
diff --git a/src/Reflection/InitializerExprTypeResolver.php b/src/Reflection/InitializerExprTypeResolver.php
@@ -1906,28 +1906,21 @@ function (Type $type, callable $traverse): Type {
 
 			$constantReflection = $constantClassReflection->getConstant($constantName);
 			if (
-				$constantReflection instanceof ClassConstantReflection
-				&& !$constantClassReflection->isFinal()
+				!$constantClassReflection->isFinal()
 				&& !$constantReflection->hasPhpDocType()
 				&& !$constantReflection->hasNativeType()
 			) {
 				unset($this->currentlyResolvingClassConstant[$resolvingName]);
 				return new MixedType();
 			}
 
-			if (
-				!$constantReflection instanceof ClassConstantReflection
-				|| !$constantClassReflection->isFinal()
-			) {
+			if (!$constantClassReflection->isFinal()) {
 				$constantType = $constantReflection->getValueType();
 			} else {
 				$constantType = $this->getType($constantReflection->getValueExpr(), InitializerExprContext::fromClassReflection($constantReflection->getDeclaringClass()));
 			}
 
-			$nativeType = null;
-			if ($constantReflection instanceof ClassConstantReflection) {
-				$nativeType = $constantReflection->getNativeType();
-			}
+			$nativeType = $constantReflection->getNativeType();
 			$constantType = $this->constantResolver->resolveClassConstantType(
 				$constantClassReflection->getName(),
 				$constantName,
diff --git a/src/Rules/Constants/OverridingConstantRule.php b/src/Rules/Constants/OverridingConstantRule.php
@@ -58,10 +58,6 @@ private function processSingleConstant(ClassReflection $classReflection, string
 		}
 
 		$constantReflection = $classReflection->getConstant($constantName);
-		if (!$constantReflection instanceof ClassConstantReflection) {
-			return [];
-		}
-
 		$errors = [];
 		if ($prototype->isFinal()) {
 			$errors[] = RuleErrorBuilder::message(sprintf(
diff --git a/src/Rules/Constants/ValueAssignedToClassConstantRule.php b/src/Rules/Constants/ValueAssignedToClassConstantRule.php
@@ -4,7 +4,6 @@
 
 use PhpParser\Node;
 use PHPStan\Analyser\Scope;
-use PHPStan\Reflection\ClassConstantReflection;
 use PHPStan\Reflection\ClassReflection;
 use PHPStan\Rules\Rule;
 use PHPStan\Rules\RuleError;
@@ -58,10 +57,6 @@ public function processNode(Node $node, Scope $scope): array
 	private function processSingleConstant(ClassReflection $classReflection, string $constantName, Type $valueExprType, ?Type $nativeType): array
 	{
 		$constantReflection = $classReflection->getConstant($constantName);
-		if (!$constantReflection instanceof ClassConstantReflection) {
-			return [];
-		}
-
 		$phpDocType = $constantReflection->getPhpDocType();
 		if ($phpDocType === null) {
 			if ($nativeType === null) {
diff --git a/src/Rules/PhpDoc/IncompatibleClassConstantPhpDocTypeRule.php b/src/Rules/PhpDoc/IncompatibleClassConstantPhpDocTypeRule.php
@@ -5,7 +5,6 @@
 use PhpParser\Node;
 use PHPStan\Analyser\Scope;
 use PHPStan\Internal\SprintfHelper;
-use PHPStan\Reflection\ClassConstantReflection;
 use PHPStan\Reflection\ClassReflection;
 use PHPStan\Rules\Generics\GenericObjectTypeCheck;
 use PHPStan\Rules\Rule;
@@ -62,10 +61,6 @@ public function processNode(Node $node, Scope $scope): array
 	private function processSingleConstant(ClassReflection $classReflection, ?Type $nativeType, string $constantName): array
 	{
 		$constantReflection = $classReflection->getConstant($constantName);
-		if (!$constantReflection instanceof ClassConstantReflection) {
-			return [];
-		}
-
 		$phpDocType = $constantReflection->getPhpDocType();
 		if ($phpDocType === null) {
 			return [];

Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ class ClassReflection`
`79`	`79`	`/** @var PropertyReflection[] */`
`80`	`80`	`private array $properties = [];`
`81`	`81`
`82`		`- /** @var ConstantReflection[] */`
	`82`	`+ /** @var ClassConstantReflection[] */`
`83`	`83`	`private array $constants = [];`
`84`	`84`
`85`	`85`	`/** @var int[]\|null */`
`@@ -1005,7 +1005,7 @@ public function hasConstant(string $name): bool`
`1005`	`1005`	`return $this->reflectionProvider->hasClass($reflectionConstant->getDeclaringClass()->getName());`
`1006`	`1006`	`}`
`1007`	`1007`
`1008`		`- public function getConstant(string $name): ConstantReflection`
	`1008`	`+ public function getConstant(string $name): ClassConstantReflection`
`1009`	`1009`	`{`
`1010`	`1010`	`if (!isset($this->constants[$name])) {`
`1011`	`1011`	`$reflectionConstant = $this->getNativeReflection()->getReflectionConstant($name);`