Revert "Overwrite property expression type only if it's subtype of th…

…e native type" This reverts commit eb0e0bc.
phpstan · Jan 19, 2025 · bf923ad · bf923ad
1 parent 69770e5
commit bf923ad
Show file tree

Hide file tree

Showing 18 changed files with 21 additions and 393 deletions.
diff --git a/src/Analyser/MutatingScope.php b/src/Analyser/MutatingScope.php
@@ -2119,12 +2119,10 @@ static function (Node $node, Scope $scope) use ($arrowScope, &$arrowFunctionImpu
 				if ($propertyReflection === null) {
 					return new ErrorType();
 				}
-
-				if (!$propertyReflection->hasNativeType()) {
-					return new MixedType();
-				}
-
 				$nativeType = $propertyReflection->getNativeType();
+				if ($nativeType === null) {
+					return new ErrorType();
+				}
 
 				return $this->getNullsafeShortCircuitingType($node->var, $nativeType);
 			}
@@ -2169,11 +2167,10 @@ static function (Node $node, Scope $scope) use ($arrowScope, &$arrowFunctionImpu
 				if ($propertyReflection === null) {
 					return new ErrorType();
 				}
-				if (!$propertyReflection->hasNativeType()) {
-					return new MixedType();
-				}
-
 				$nativeType = $propertyReflection->getNativeType();
+				if ($nativeType === null) {
+					return new ErrorType();
+				}
 
 				if ($node->class instanceof Expr) {
 					return $this->getNullsafeShortCircuitingType($node->class, $nativeType);

diff --git a/src/Analyser/NodeScopeResolver.php b/src/Analyser/NodeScopeResolver.php
@@ -5556,18 +5556,7 @@ static function (): void {
 				$assignedExprType = $scope->getType($assignedExpr);
 				$nodeCallback(new PropertyAssignNode($var, $assignedExpr, $isAssignOp), $scope);
 				if ($propertyReflection->canChangeTypeAfterAssignment()) {
-					if ($propertyReflection->hasNativeType()) {
-						$propertyNativeType = $propertyReflection->getNativeType();
-						if ($propertyNativeType->isSuperTypeOf($assignedExprType)->yes()) {
-							$assignedExprNativeType = $scope->getNativeType($assignedExpr);
-							if (!$propertyNativeType->isSuperTypeOf($assignedExprNativeType)->yes()) {
-								$assignedExprNativeType = $propertyNativeType;
-							}
-							$scope = $scope->assignExpression($var, $assignedExprType, $assignedExprNativeType);
-						}
-					} else {
-						$scope = $scope->assignExpression($var, $assignedExprType, $scope->getNativeType($assignedExpr));
-					}
+					$scope = $scope->assignExpression($var, $assignedExprType, $scope->getNativeType($assignedExpr));
 				}
 				$declaringClass = $propertyReflection->getDeclaringClass();
 				if ($declaringClass->hasNativeProperty($propertyName)) {
@@ -5632,18 +5621,7 @@ static function (): void {
 				$assignedExprType = $scope->getType($assignedExpr);
 				$nodeCallback(new PropertyAssignNode($var, $assignedExpr, $isAssignOp), $scope);
 				if ($propertyReflection !== null && $propertyReflection->canChangeTypeAfterAssignment()) {
-					if ($propertyReflection->hasNativeType()) {
-						$propertyNativeType = $propertyReflection->getNativeType();
-						if ($propertyNativeType->isSuperTypeOf($assignedExprType)->yes()) {
-							$assignedExprNativeType = $scope->getNativeType($assignedExpr);
-							if (!$propertyNativeType->isSuperTypeOf($assignedExprNativeType)->yes()) {
-								$assignedExprNativeType = $propertyNativeType;
-							}
-							$scope = $scope->assignExpression($var, $assignedExprType, $assignedExprNativeType);
-						}
-					} else {
-						$scope = $scope->assignExpression($var, $assignedExprType, $scope->getNativeType($assignedExpr));
-					}
+					$scope = $scope->assignExpression($var, $assignedExprType, $scope->getNativeType($assignedExpr));
 				}
 			} else {
 				// fallback

diff --git a/src/Reflection/Annotations/AnnotationPropertyReflection.php b/src/Reflection/Annotations/AnnotationPropertyReflection.php
@@ -7,7 +7,6 @@
 use PHPStan\Reflection\ExtendedPropertyReflection;
 use PHPStan\ShouldNotHappenException;
 use PHPStan\TrinaryLogic;
-use PHPStan\Type\MixedType;
 use PHPStan\Type\Type;
 
 final class AnnotationPropertyReflection implements ExtendedPropertyReflection
@@ -43,26 +42,6 @@ public function isPublic(): bool
 		return true;
 	}
 
-	public function hasPhpDocType(): bool
-	{
-		return true;
-	}
-
-	public function getPhpDocType(): Type
-	{
-		return $this->readableType;
-	}
-
-	public function hasNativeType(): bool
-	{
-		return false;
-	}
-
-	public function getNativeType(): Type
-	{
-		return new MixedType();
-	}
-
 	public function getReadableType(): Type
 	{
 		return $this->readableType;

diff --git a/src/Reflection/Dummy/ChangedTypePropertyReflection.php b/src/Reflection/Dummy/ChangedTypePropertyReflection.php
@@ -12,7 +12,7 @@
 final class ChangedTypePropertyReflection implements WrapperPropertyReflection
 {
 
-	public function __construct(private ClassReflection $declaringClass, private ExtendedPropertyReflection $reflection, private Type $readableType, private Type $writableType, private Type $phpDocType, private Type $nativeType)
+	public function __construct(private ClassReflection $declaringClass, private ExtendedPropertyReflection $reflection, private Type $readableType, private Type $writableType)
 	{
 	}
 
@@ -41,26 +41,6 @@ public function getDocComment(): ?string
 		return $this->reflection->getDocComment();
 	}
 
-	public function hasPhpDocType(): bool
-	{
-		return $this->reflection->hasPhpDocType();
-	}
-
-	public function getPhpDocType(): Type
-	{
-		return $this->phpDocType;
-	}
-
-	public function hasNativeType(): bool
-	{
-		return $this->reflection->hasNativeType();
-	}
-
-	public function getNativeType(): Type
-	{
-		return $this->nativeType;
-	}
-
 	public function getReadableType(): Type
 	{
 		return $this->readableType;

diff --git a/src/Reflection/Dummy/DummyPropertyReflection.php b/src/Reflection/Dummy/DummyPropertyReflection.php
@@ -37,26 +37,6 @@ public function isPublic(): bool
 		return true;
 	}
 
-	public function hasPhpDocType(): bool
-	{
-		return false;
-	}
-
-	public function getPhpDocType(): Type
-	{
-		return new MixedType();
-	}
-
-	public function hasNativeType(): bool
-	{
-		return false;
-	}
-
-	public function getNativeType(): Type
-	{
-		return new MixedType();
-	}
-
 	public function getReadableType(): Type
 	{
 		return new MixedType();

diff --git a/src/Reflection/ExtendedPropertyReflection.php b/src/Reflection/ExtendedPropertyReflection.php
@@ -3,7 +3,6 @@
 namespace PHPStan\Reflection;
 
 use PHPStan\TrinaryLogic;
-use PHPStan\Type\Type;
 
 /**
  * The purpose of this interface is to be able to
@@ -26,14 +25,6 @@ interface ExtendedPropertyReflection extends PropertyReflection
 
 	public const HOOK_SET = 'set';
 
-	public function hasPhpDocType(): bool;
-
-	public function getPhpDocType(): Type;
-
-	public function hasNativeType(): bool;
-
-	public function getNativeType(): Type;
-
 	public function isAbstract(): TrinaryLogic;
 
 	public function isFinal(): TrinaryLogic;

diff --git a/src/Reflection/Php/EnumPropertyReflection.php b/src/Reflection/Php/EnumPropertyReflection.php
@@ -7,7 +7,6 @@
 use PHPStan\Reflection\ExtendedPropertyReflection;
 use PHPStan\ShouldNotHappenException;
 use PHPStan\TrinaryLogic;
-use PHPStan\Type\MixedType;
 use PHPStan\Type\Type;
 
 final class EnumPropertyReflection implements ExtendedPropertyReflection
@@ -42,26 +41,6 @@ public function getDocComment(): ?string
 		return null;
 	}
 
-	public function hasPhpDocType(): bool
-	{
-		return false;
-	}
-
-	public function getPhpDocType(): Type
-	{
-		return new MixedType();
-	}
-
-	public function hasNativeType(): bool
-	{
-		return false;
-	}
-
-	public function getNativeType(): Type
-	{
-		return new MixedType();
-	}
-
 	public function getReadableType(): Type
 	{
 		return $this->type;

diff --git a/src/Reflection/Php/SimpleXMLElementProperty.php b/src/Reflection/Php/SimpleXMLElementProperty.php
@@ -10,7 +10,6 @@
 use PHPStan\Type\BooleanType;
 use PHPStan\Type\FloatType;
 use PHPStan\Type\IntegerType;
-use PHPStan\Type\MixedType;
 use PHPStan\Type\StringType;
 use PHPStan\Type\Type;
 use PHPStan\Type\TypeCombinator;
@@ -45,26 +44,6 @@ public function isPublic(): bool
 		return true;
 	}
 
-	public function hasPhpDocType(): bool
-	{
-		return false;
-	}
-
-	public function getPhpDocType(): Type
-	{
-		return new MixedType();
-	}
-
-	public function hasNativeType(): bool
-	{
-		return false;
-	}
-
-	public function getNativeType(): Type
-	{
-		return new MixedType();
-	}
-
 	public function getReadableType(): Type
 	{
 		return $this->type;

diff --git a/src/Reflection/Php/UniversalObjectCrateProperty.php b/src/Reflection/Php/UniversalObjectCrateProperty.php
@@ -7,7 +7,6 @@
 use PHPStan\Reflection\ExtendedPropertyReflection;
 use PHPStan\ShouldNotHappenException;
 use PHPStan\TrinaryLogic;
-use PHPStan\Type\MixedType;
 use PHPStan\Type\Type;
 
 final class UniversalObjectCrateProperty implements ExtendedPropertyReflection
@@ -41,26 +40,6 @@ public function isPublic(): bool
 		return true;
 	}
 
-	public function hasPhpDocType(): bool
-	{
-		return false;
-	}
-
-	public function getPhpDocType(): Type
-	{
-		return new MixedType();
-	}
-
-	public function hasNativeType(): bool
-	{
-		return false;
-	}
-
-	public function getNativeType(): Type
-	{
-		return new MixedType();
-	}
-
 	public function getReadableType(): Type
 	{
 		return $this->readableType;

diff --git a/src/Reflection/ResolvedPropertyReflection.php b/src/Reflection/ResolvedPropertyReflection.php
@@ -59,26 +59,6 @@ public function isPublic(): bool
 		return $this->reflection->isPublic();
 	}
 
-	public function hasPhpDocType(): bool
-	{
-		return $this->reflection->hasPhpDocType();
-	}
-
-	public function getPhpDocType(): Type
-	{
-		return $this->reflection->getPhpDocType();
-	}
-
-	public function hasNativeType(): bool
-	{
-		return $this->reflection->hasNativeType();
-	}
-
-	public function getNativeType(): Type
-	{
-		return $this->reflection->getNativeType();
-	}
-
 	public function getReadableType(): Type
 	{
 		$type = $this->readableType;

diff --git a/src/Reflection/Type/CallbackUnresolvedPropertyPrototypeReflection.php b/src/Reflection/Type/CallbackUnresolvedPropertyPrototypeReflection.php
@@ -79,10 +79,8 @@ private function transformPropertyWithStaticType(ClassReflection $declaringClass
 	{
 		$readableType = $this->transformStaticType($property->getReadableType());
 		$writableType = $this->transformStaticType($property->getWritableType());
-		$phpDocType = $this->transformStaticType($property->getPhpDocType());
-		$nativeType = $this->transformStaticType($property->getNativeType());
 
-		return new ChangedTypePropertyReflection($declaringClass, $property, $readableType, $writableType, $phpDocType, $nativeType);
+		return new ChangedTypePropertyReflection($declaringClass, $property, $readableType, $writableType);
 	}
 
 	private function transformStaticType(Type $type): Type

diff --git a/src/Reflection/Type/CalledOnTypeUnresolvedPropertyPrototypeReflection.php b/src/Reflection/Type/CalledOnTypeUnresolvedPropertyPrototypeReflection.php
@@ -74,10 +74,8 @@ private function transformPropertyWithStaticType(ClassReflection $declaringClass
 	{
 		$readableType = $this->transformStaticType($property->getReadableType());
 		$writableType = $this->transformStaticType($property->getWritableType());
-		$phpDocType = $this->transformStaticType($property->getPhpDocType());
-		$nativeType = $this->transformStaticType($property->getNativeType());
 
-		return new ChangedTypePropertyReflection($declaringClass, $property, $readableType, $writableType, $phpDocType, $nativeType);
+		return new ChangedTypePropertyReflection($declaringClass, $property, $readableType, $writableType);
 	}
 
 	private function transformStaticType(Type $type): Type

diff --git a/src/Reflection/Type/IntersectionTypePropertyReflection.php b/src/Reflection/Type/IntersectionTypePropertyReflection.php
@@ -80,26 +80,6 @@ public function getDocComment(): ?string
 		return null;
 	}
 
-	public function hasPhpDocType(): bool
-	{
-		return $this->computeResult(static fn (ExtendedPropertyReflection $property) => $property->hasPhpDocType());
-	}
-
-	public function getPhpDocType(): Type
-	{
-		return TypeCombinator::intersect(...array_map(static fn (ExtendedPropertyReflection $property): Type => $property->getPhpDocType(), $this->properties));
-	}
-
-	public function hasNativeType(): bool
-	{
-		return $this->computeResult(static fn (ExtendedPropertyReflection $property) => $property->hasNativeType());
-	}
-
-	public function getNativeType(): Type
-	{
-		return TypeCombinator::intersect(...array_map(static fn (ExtendedPropertyReflection $property): Type => $property->getNativeType(), $this->properties));
-	}
-
 	public function getReadableType(): Type
 	{
 		return TypeCombinator::intersect(...array_map(static fn (ExtendedPropertyReflection $property): Type => $property->getReadableType(), $this->properties));