PhpPropertyReflection - accept Type object as native type instead of AST node

Author: ondrejmirtes

src/Reflection/Php/PhpClassReflectionExtension.php

@@ -222,7 +222,7 @@ private function createProperty(
 
 				$phpDocType = TypeCombinator::union(...$types);
 
-				return new PhpPropertyReflection($declaringClassReflection, null, null, $phpDocType, $phpDocType, $classReflection->getNativeReflection()->getProperty($propertyName), null, null, null, false, false, false, false, [], false, true, false, false, true);
+				return new PhpPropertyReflection($declaringClassReflection, null, new MixedType(), $phpDocType, $phpDocType, $classReflection->getNativeReflection()->getProperty($propertyName), null, null, null, false, false, false, false, [], false, true, false, false, true);
 			}
 		}
 
@@ -331,10 +331,7 @@ private function createProperty(
 			);
 		}
 
-		$nativeType = null;
-		if ($propertyReflection->getType() !== null) {
-			$nativeType = $propertyReflection->getType();
-		}
+		$nativeType = TypehintHelper::decideTypeFromReflection($propertyReflection->getType(), selfClass: $declaringClassReflection);
 
 		$declaringTrait = null;
 		$reflectionProvider = $this->reflectionProviderProvider->getReflectionProvider();

src/Reflection/Php/PhpPropertyReflection.php

@@ -2,10 +2,7 @@
 
 namespace PHPStan\Reflection\Php;
 
-use PHPStan\BetterReflection\Reflection\Adapter\ReflectionIntersectionType;
-use PHPStan\BetterReflection\Reflection\Adapter\ReflectionNamedType;
 use PHPStan\BetterReflection\Reflection\Adapter\ReflectionProperty;
-use PHPStan\BetterReflection\Reflection\Adapter\ReflectionUnionType;
 use PHPStan\Reflection\AttributeReflection;
 use PHPStan\Reflection\ClassReflection;
 use PHPStan\Reflection\ExtendedMethodReflection;
@@ -24,8 +21,6 @@
 final class PhpPropertyReflection implements ExtendedPropertyReflection
 {
 
-	private ?Type $finalNativeType = null;
-
 	private ?Type $readableType = null;
 
 	private ?Type $writableType = null;
@@ -36,7 +31,7 @@ final class PhpPropertyReflection implements ExtendedPropertyReflection
 	public function __construct(
 		private ClassReflection $declaringClass,
 		private ?ClassReflection $declaringTrait,
-		private ReflectionUnionType|ReflectionNamedType|ReflectionIntersectionType|null $nativeType,
+		private Type $nativeType,
 		private ?Type $readablePhpDocType,
 		private ?Type $writablePhpDocType,
 		private ReflectionProperty $reflection,
@@ -109,10 +104,9 @@ public function isReadOnlyByPhpDoc(): bool
 
 	public function getReadableType(): Type
 	{
-		return $this->readableType ??= TypehintHelper::decideTypeFromReflection(
+		return $this->readableType ??= TypehintHelper::decideType(
 			$this->nativeType,
 			$this->readablePhpDocType,
-			$this->declaringClass,
 		);
 	}
 
@@ -131,10 +125,9 @@ public function getWritableType(): Type
 		}
 
 		if ($this->writablePhpDocType === null || $this->writablePhpDocType instanceof NeverType) {
-			return $this->writableType = TypehintHelper::decideTypeFromReflection(
+			return $this->writableType = TypehintHelper::decideType(
 				$this->nativeType,
 				$this->readablePhpDocType,
-				$this->declaringClass,
 			);
 		}
 
@@ -145,10 +138,9 @@ public function getWritableType(): Type
 			return $this->writableType = $this->writablePhpDocType;
 		}
 
-		return $this->writableType = TypehintHelper::decideTypeFromReflection(
+		return $this->writableType = TypehintHelper::decideType(
 			$this->nativeType,
 			$this->writablePhpDocType,
-			$this->declaringClass,
 		);
 	}
 
@@ -194,15 +186,12 @@ public function getPhpDocType(): Type
 
 	public function hasNativeType(): bool
 	{
-		return $this->nativeType !== null;
+		return !$this->nativeType instanceof MixedType || $this->nativeType->isExplicitMixed();
 	}
 
 	public function getNativeType(): Type
 	{
-		return $this->finalNativeType ??= TypehintHelper::decideTypeFromReflection(
-			$this->nativeType,
-			selfClass: $this->declaringClass,
-		);
+		return $this->nativeType;
 	}
 
 	public function isReadable(): bool

tests/PHPStan/Analyser/nsrt/integer-range-types.php

@@ -190,8 +190,8 @@ public function supportsPhpdocIntegerRange() {
 		assertType('int<min, 100>', $this->min);
 		assertType('int<0, max>', $this->max);
 
-		assertType('*ERROR*', $this->error1);
-		assertType('*ERROR*', $this->error2);
+		assertType('mixed', $this->error1);
+		assertType('mixed', $this->error2);
 		assertType('int', $this->int);
 	}