Fix issues about assigning typed properties

ondrejmirtes · ondrejmirtes · commit bed30a79f4ed · 2025-01-21T14:46:56.000+01:00
diff --git a/src/Analyser/NodeScopeResolver.php b/src/Analyser/NodeScopeResolver.php
@@ -5556,15 +5556,10 @@ static function (): void {
 				$assignedExprType = $scope->getType($assignedExpr);
 				$nodeCallback(new PropertyAssignNode($var, $assignedExpr, $isAssignOp), $scope);
 				if ($propertyReflection->canChangeTypeAfterAssignment()) {
-					if ($propertyReflection->hasNativeType()) {
+					if ($propertyReflection->hasNativeType() && $scope->isDeclareStrictTypes()) {
 						$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);
-						}
+
+						$scope = $scope->assignExpression($var, TypeCombinator::intersect($assignedExprType->toCoercedArgumentType(true), $propertyNativeType), TypeCombinator::intersect($scope->getNativeType($assignedExpr)->toCoercedArgumentType(true), $propertyNativeType));
 					} else {
 						$scope = $scope->assignExpression($var, $assignedExprType, $scope->getNativeType($assignedExpr));
 					}
@@ -5632,15 +5627,10 @@ static function (): void {
 				$assignedExprType = $scope->getType($assignedExpr);
 				$nodeCallback(new PropertyAssignNode($var, $assignedExpr, $isAssignOp), $scope);
 				if ($propertyReflection !== null && $propertyReflection->canChangeTypeAfterAssignment()) {
-					if ($propertyReflection->hasNativeType()) {
+					if ($propertyReflection->hasNativeType() && $scope->isDeclareStrictTypes()) {
 						$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);
-						}
+
+						$scope = $scope->assignExpression($var, TypeCombinator::intersect($assignedExprType->toCoercedArgumentType(true), $propertyNativeType), TypeCombinator::intersect($scope->getNativeType($assignedExpr)->toCoercedArgumentType(true), $propertyNativeType));
 					} else {
 						$scope = $scope->assignExpression($var, $assignedExprType, $scope->getNativeType($assignedExpr));
 					}
diff --git a/src/Type/Accessory/AccessoryArrayListType.php b/src/Type/Accessory/AccessoryArrayListType.php
@@ -469,6 +469,11 @@ public function toArrayKey(): Type
 		return new ErrorType();
 	}
 
+	public function toCoercedArgumentType(bool $strictTypes): Type
+	{
+		return $this;
+	}
+
 	public function traverse(callable $cb): Type
 	{
 		return $this;
diff --git a/src/Type/Accessory/AccessoryLiteralStringType.php b/src/Type/Accessory/AccessoryLiteralStringType.php
@@ -213,6 +213,11 @@ public function toArrayKey(): Type
 		return $this;
 	}
 
+	public function toCoercedArgumentType(bool $strictTypes): Type
+	{
+		return $this;
+	}
+
 	public function isNull(): TrinaryLogic
 	{
 		return TrinaryLogic::createNo();
diff --git a/src/Type/Accessory/AccessoryLowercaseStringType.php b/src/Type/Accessory/AccessoryLowercaseStringType.php
@@ -210,6 +210,11 @@ public function toArrayKey(): Type
 		return $this;
 	}
 
+	public function toCoercedArgumentType(bool $strictTypes): Type
+	{
+		return $this;
+	}
+
 	public function isNull(): TrinaryLogic
 	{
 		return TrinaryLogic::createNo();
diff --git a/src/Type/Accessory/AccessoryNonEmptyStringType.php b/src/Type/Accessory/AccessoryNonEmptyStringType.php
@@ -211,6 +211,11 @@ public function toArrayKey(): Type
 		return $this;
 	}
 
+	public function toCoercedArgumentType(bool $strictTypes): Type
+	{
+		return $this;
+	}
+
 	public function isNull(): TrinaryLogic
 	{
 		return TrinaryLogic::createNo();
diff --git a/src/Type/Accessory/AccessoryNonFalsyStringType.php b/src/Type/Accessory/AccessoryNonFalsyStringType.php
@@ -212,6 +212,11 @@ public function toArrayKey(): Type
 		return $this;
 	}
 
+	public function toCoercedArgumentType(bool $strictTypes): Type
+	{
+		return $this;
+	}
+
 	public function isNull(): TrinaryLogic
 	{
 		return TrinaryLogic::createNo();
diff --git a/src/Type/Accessory/AccessoryNumericStringType.php b/src/Type/Accessory/AccessoryNumericStringType.php
@@ -213,6 +213,11 @@ public function toArrayKey(): Type
 		return new IntegerType();
 	}
 
+	public function toCoercedArgumentType(bool $strictTypes): Type
+	{
+		return $this;
+	}
+
 	public function isNull(): TrinaryLogic
 	{
 		return TrinaryLogic::createNo();
diff --git a/src/Type/Accessory/AccessoryUppercaseStringType.php b/src/Type/Accessory/AccessoryUppercaseStringType.php
@@ -210,6 +210,11 @@ public function toArrayKey(): Type
 		return $this;
 	}
 
+	public function toCoercedArgumentType(bool $strictTypes): Type
+	{
+		return $this;
+	}
+
 	public function isNull(): TrinaryLogic
 	{
 		return TrinaryLogic::createNo();
diff --git a/src/Type/Accessory/HasOffsetType.php b/src/Type/Accessory/HasOffsetType.php
@@ -388,6 +388,11 @@ public function toArrayKey(): Type
 		return new ErrorType();
 	}
 
+	public function toCoercedArgumentType(bool $strictTypes): Type
+	{
+		return $this;
+	}
+
 	public function getEnumCases(): array
 	{
 		return [];
diff --git a/src/Type/Accessory/HasOffsetValueType.php b/src/Type/Accessory/HasOffsetValueType.php
@@ -438,6 +438,11 @@ public function toArrayKey(): Type
 		return new ErrorType();
 	}
 
+	public function toCoercedArgumentType(bool $strictTypes): Type
+	{
+		return $this;
+	}
+
 	public function getEnumCases(): array
 	{
 		return [];
diff --git a/src/Type/Accessory/NonEmptyArrayType.php b/src/Type/Accessory/NonEmptyArrayType.php
@@ -445,6 +445,11 @@ public function toArrayKey(): Type
 		return new ErrorType();
 	}
 
+	public function toCoercedArgumentType(bool $strictTypes): Type
+	{
+		return $this;
+	}
+
 	public function traverse(callable $cb): Type
 	{
 		return $this;
diff --git a/src/Type/Accessory/OversizedArrayType.php b/src/Type/Accessory/OversizedArrayType.php
@@ -429,6 +429,11 @@ public function toArrayKey(): Type
 		return new ErrorType();
 	}
 
+	public function toCoercedArgumentType(bool $strictTypes): Type
+	{
+		return $this;
+	}
+
 	public function traverse(callable $cb): Type
 	{
 		return $this;
diff --git a/src/Type/BooleanType.php b/src/Type/BooleanType.php
@@ -111,6 +111,11 @@ public function toArrayKey(): Type
 		return new UnionType([new ConstantIntegerType(0), new ConstantIntegerType(1)]);
 	}
 
+	public function toCoercedArgumentType(bool $strictTypes): Type
+	{
+		return $this;
+	}
+
 	public function isOffsetAccessLegal(): TrinaryLogic
 	{
 		return TrinaryLogic::createYes();
diff --git a/src/Type/CallableType.php b/src/Type/CallableType.php
@@ -2,6 +2,7 @@
 
 namespace PHPStan\Type;
 
+use Closure;
 use PHPStan\Analyser\OutOfClassScope;
 use PHPStan\Php\PhpVersion;
 use PHPStan\PhpDoc\Tag\TemplateTag;
@@ -321,6 +322,11 @@ public function toArrayKey(): Type
 		return new ErrorType();
 	}
 
+	public function toCoercedArgumentType(bool $strictTypes): Type
+	{
+		return TypeCombinator::union($this, new StringType(), new ArrayType(new MixedType(true), new MixedType(true)), new ObjectType(Closure::class));
+	}
+
 	public function isOffsetAccessLegal(): TrinaryLogic
 	{
 		return TrinaryLogic::createMaybe();
diff --git a/src/Type/ClosureType.php b/src/Type/ClosureType.php
@@ -462,6 +462,11 @@ public function toArrayKey(): Type
 		return new ErrorType();
 	}
 
+	public function toCoercedArgumentType(bool $strictTypes): Type
+	{
+		return TypeCombinator::union($this, new CallableType());
+	}
+
 	public function getTemplateTypeMap(): TemplateTypeMap
 	{
 		return $this->templateTypeMap;
diff --git a/src/Type/Constant/ConstantBooleanType.php b/src/Type/Constant/ConstantBooleanType.php
@@ -107,6 +107,11 @@ public function toArrayKey(): Type
 		return new ConstantIntegerType((int) $this->value);
 	}
 
+	public function toCoercedArgumentType(bool $strictTypes): Type
+	{
+		return $this;
+	}
+
 	public function isTrue(): TrinaryLogic
 	{
 		return TrinaryLogic::createFromBoolean($this->value === true);
diff --git a/src/Type/FloatType.php b/src/Type/FloatType.php
@@ -143,6 +143,11 @@ public function toArrayKey(): Type
 		return new IntegerType();
 	}
 
+	public function toCoercedArgumentType(bool $strictTypes): Type
+	{
+		return $this;
+	}
+
 	public function isOffsetAccessLegal(): TrinaryLogic
 	{
 		return TrinaryLogic::createYes();
diff --git a/src/Type/Generic/TemplateTypeTrait.php b/src/Type/Generic/TemplateTypeTrait.php
@@ -250,6 +250,11 @@ public function toArrayKey(): Type
 		return $this;
 	}
 
+	public function toCoercedArgumentType(bool $strictTypes): Type
+	{
+		return $this;
+	}
+
 	public function inferTemplateTypes(Type $receivedType): TemplateTypeMap
 	{
 		if (
diff --git a/src/Type/IntegerType.php b/src/Type/IntegerType.php
@@ -98,6 +98,11 @@ public function toArrayKey(): Type
 		return $this;
 	}
 
+	public function toCoercedArgumentType(bool $strictTypes): Type
+	{
+		return TypeCombinator::union($this, $this->toFloat());
+	}
+
 	public function isOffsetAccessLegal(): TrinaryLogic
 	{
 		return TrinaryLogic::createYes();
diff --git a/src/Type/IntersectionType.php b/src/Type/IntersectionType.php
@@ -1062,6 +1062,11 @@ public function toArrayKey(): Type
 		return $this->intersectTypes(static fn (Type $type): Type => $type->toArrayKey());
 	}
 
+	public function toCoercedArgumentType(bool $strictTypes): Type
+	{
+		return $this->intersectTypes(static fn (Type $type): Type => $type->toCoercedArgumentType($strictTypes));
+	}
+
 	public function inferTemplateTypes(Type $receivedType): TemplateTypeMap
 	{
 		$types = TemplateTypeMap::createEmpty();
diff --git a/src/Type/IterableType.php b/src/Type/IterableType.php
@@ -234,6 +234,11 @@ public function toArrayKey(): Type
 		return new ErrorType();
 	}
 
+	public function toCoercedArgumentType(bool $strictTypes): Type
+	{
+		return TypeCombinator::union($this, new ArrayType(new MixedType(true), new MixedType(true)), new ObjectType(Traversable::class));
+	}
+
 	public function isOffsetAccessLegal(): TrinaryLogic
 	{
 		return TrinaryLogic::createMaybe();
diff --git a/src/Type/MixedType.php b/src/Type/MixedType.php
@@ -580,6 +580,11 @@ public function toArrayKey(): Type
 		return new BenevolentUnionType([new IntegerType(), new StringType()]);
 	}
 
+	public function toCoercedArgumentType(bool $strictTypes): Type
+	{
+		return $this;
+	}
+
 	public function isIterable(): TrinaryLogic
 	{
 		if ($this->subtractedType !== null) {
diff --git a/src/Type/NeverType.php b/src/Type/NeverType.php
@@ -383,6 +383,11 @@ public function toArrayKey(): Type
 		return $this;
 	}
 
+	public function toCoercedArgumentType(bool $strictTypes): Type
+	{
+		return $this;
+	}
+
 	public function traverse(callable $cb): Type
 	{
 		return $this;
diff --git a/src/Type/NonexistentParentClassType.php b/src/Type/NonexistentParentClassType.php
@@ -157,6 +157,11 @@ public function toArrayKey(): Type
 		return new ErrorType();
 	}
 
+	public function toCoercedArgumentType(bool $strictTypes): Type
+	{
+		return new ErrorType();
+	}
+
 	public function isOffsetAccessLegal(): TrinaryLogic
 	{
 		return TrinaryLogic::createNo();
diff --git a/src/Type/NullType.php b/src/Type/NullType.php
@@ -166,6 +166,11 @@ public function toArrayKey(): Type
 		return new ConstantStringType('');
 	}
 
+	public function toCoercedArgumentType(bool $strictTypes): Type
+	{
+		return $this;
+	}
+
 	public function isOffsetAccessible(): TrinaryLogic
 	{
 		return TrinaryLogic::createYes();
diff --git a/src/Type/ObjectType.php b/src/Type/ObjectType.php
@@ -671,6 +671,11 @@ public function toArrayKey(): Type
 		return $this->toString();
 	}
 
+	public function toCoercedArgumentType(bool $strictTypes): Type
+	{
+		return $this;
+	}
+
 	public function toBoolean(): BooleanType
 	{
 		if ($this->isInstanceOf('SimpleXMLElement')->yes()) {
diff --git a/src/Type/ResourceType.php b/src/Type/ResourceType.php
@@ -91,6 +91,11 @@ public function toArrayKey(): Type
 		return new ErrorType();
 	}
 
+	public function toCoercedArgumentType(bool $strictTypes): Type
+	{
+		return $this;
+	}
+
 	public function isOffsetAccessLegal(): TrinaryLogic
 	{
 		return TrinaryLogic::createYes();
diff --git a/src/Type/StaticType.php b/src/Type/StaticType.php
@@ -646,6 +646,11 @@ public function toArrayKey(): Type
 		return $this->getStaticObjectType()->toArrayKey();
 	}
 
+	public function toCoercedArgumentType(bool $strictTypes): Type
+	{
+		return $this->getStaticObjectType()->toCoercedArgumentType($strictTypes);
+	}
+
 	public function toBoolean(): BooleanType
 	{
 		return $this->getStaticObjectType()->toBoolean();
diff --git a/src/Type/StrictMixedType.php b/src/Type/StrictMixedType.php
@@ -395,6 +395,11 @@ public function toArrayKey(): Type
 		return new ErrorType();
 	}
 
+	public function toCoercedArgumentType(bool $strictTypes): Type
+	{
+		return $this;
+	}
+
 	public function inferTemplateTypes(Type $receivedType): TemplateTypeMap
 	{
 		return TemplateTypeMap::createEmpty();
diff --git a/src/Type/StringType.php b/src/Type/StringType.php
@@ -181,6 +181,11 @@ public function toArrayKey(): Type
 		return $this;
 	}
 
+	public function toCoercedArgumentType(bool $strictTypes): Type
+	{
+		return $this;
+	}
+
 	public function isNull(): TrinaryLogic
 	{
 		return TrinaryLogic::createNo();
diff --git a/src/Type/Traits/ArrayTypeTrait.php b/src/Type/Traits/ArrayTypeTrait.php
diff --git a/src/Type/Traits/LateResolvableTypeTrait.php b/src/Type/Traits/LateResolvableTypeTrait.php
diff --git a/src/Type/Traits/ObjectTypeTrait.php b/src/Type/Traits/ObjectTypeTrait.php
diff --git a/src/Type/Type.php b/src/Type/Type.php
diff --git a/src/Type/UnionType.php b/src/Type/UnionType.php
diff --git a/src/Type/VoidType.php b/src/Type/VoidType.php
diff --git a/tests/PHPStan/Analyser/nsrt/bug-12393.php b/tests/PHPStan/Analyser/nsrt/bug-12393.php

Original file line number	Diff line number	Diff line change
`@@ -469,6 +469,11 @@ public function toArrayKey(): Type`
`469`	`469`	`return new ErrorType();`
`470`	`470`	`}`
`471`	`471`
	`472`	`+ public function toCoercedArgumentType(bool $strictTypes): Type`
	`473`	`+ {`
	`474`	`+ return $this;`
	`475`	`+ }`
	`476`	`+`
`472`	`477`	`public function traverse(callable $cb): Type`
`473`	`478`	`{`
`474`	`479`	`return $this;`
Original file line number	Diff line number	Diff line change
`@@ -213,6 +213,11 @@ public function toArrayKey(): Type`
`213`	`213`	`return $this;`
`214`	`214`	`}`
`215`	`215`
	`216`	`+ public function toCoercedArgumentType(bool $strictTypes): Type`
	`217`	`+ {`
	`218`	`+ return $this;`
	`219`	`+ }`
	`220`	`+`
`216`	`221`	`public function isNull(): TrinaryLogic`
`217`	`222`	`{`
`218`	`223`	`return TrinaryLogic::createNo();`
Original file line number	Diff line number	Diff line change
`@@ -210,6 +210,11 @@ public function toArrayKey(): Type`
`210`	`210`	`return $this;`
`211`	`211`	`}`
`212`	`212`
	`213`	`+ public function toCoercedArgumentType(bool $strictTypes): Type`
	`214`	`+ {`
	`215`	`+ return $this;`
	`216`	`+ }`
	`217`	`+`
`213`	`218`	`public function isNull(): TrinaryLogic`
`214`	`219`	`{`
`215`	`220`	`return TrinaryLogic::createNo();`
Original file line number	Diff line number	Diff line change
`@@ -211,6 +211,11 @@ public function toArrayKey(): Type`
`211`	`211`	`return $this;`
`212`	`212`	`}`
`213`	`213`
	`214`	`+ public function toCoercedArgumentType(bool $strictTypes): Type`
	`215`	`+ {`
	`216`	`+ return $this;`
	`217`	`+ }`
	`218`	`+`
`214`	`219`	`public function isNull(): TrinaryLogic`
`215`	`220`	`{`
`216`	`221`	`return TrinaryLogic::createNo();`
Original file line number	Diff line number	Diff line change
`@@ -212,6 +212,11 @@ public function toArrayKey(): Type`
`212`	`212`	`return $this;`
`213`	`213`	`}`
`214`	`214`
	`215`	`+ public function toCoercedArgumentType(bool $strictTypes): Type`
	`216`	`+ {`
	`217`	`+ return $this;`
	`218`	`+ }`
	`219`	`+`
`215`	`220`	`public function isNull(): TrinaryLogic`
`216`	`221`	`{`
`217`	`222`	`return TrinaryLogic::createNo();`
Original file line number	Diff line number	Diff line change
`@@ -388,6 +388,11 @@ public function toArrayKey(): Type`
`388`	`388`	`return new ErrorType();`
`389`	`389`	`}`
`390`	`390`
	`391`	`+ public function toCoercedArgumentType(bool $strictTypes): Type`
	`392`	`+ {`
	`393`	`+ return $this;`
	`394`	`+ }`
	`395`	`+`
`391`	`396`	`public function getEnumCases(): array`
`392`	`397`	`{`
`393`	`398`	`return [];`
Original file line number	Diff line number	Diff line change
`@@ -438,6 +438,11 @@ public function toArrayKey(): Type`
`438`	`438`	`return new ErrorType();`
`439`	`439`	`}`
`440`	`440`
	`441`	`+ public function toCoercedArgumentType(bool $strictTypes): Type`
	`442`	`+ {`
	`443`	`+ return $this;`
	`444`	`+ }`
	`445`	`+`
`441`	`446`	`public function getEnumCases(): array`
`442`	`447`	`{`
`443`	`448`	`return [];`
Original file line number	Diff line number	Diff line change
`@@ -445,6 +445,11 @@ public function toArrayKey(): Type`
`445`	`445`	`return new ErrorType();`
`446`	`446`	`}`
`447`	`447`
	`448`	`+ public function toCoercedArgumentType(bool $strictTypes): Type`
	`449`	`+ {`
	`450`	`+ return $this;`
	`451`	`+ }`
	`452`	`+`
`448`	`453`	`public function traverse(callable $cb): Type`
`449`	`454`	`{`
`450`	`455`	`return $this;`
Original file line number	Diff line number	Diff line change
`@@ -429,6 +429,11 @@ public function toArrayKey(): Type`
`429`	`429`	`return new ErrorType();`
`430`	`430`	`}`
`431`	`431`
	`432`	`+ public function toCoercedArgumentType(bool $strictTypes): Type`
	`433`	`+ {`
	`434`	`+ return $this;`
	`435`	`+ }`
	`436`	`+`
`432`	`437`	`public function traverse(callable $cb): Type`
`433`	`438`	`{`
`434`	`439`	`return $this;`
Original file line number	Diff line number	Diff line change
`@@ -111,6 +111,11 @@ public function toArrayKey(): Type`
`111`	`111`	`return new UnionType([new ConstantIntegerType(0), new ConstantIntegerType(1)]);`
`112`	`112`	`}`
`113`	`113`
	`114`	`+ public function toCoercedArgumentType(bool $strictTypes): Type`
	`115`	`+ {`
	`116`	`+ return $this;`
	`117`	`+ }`
	`118`	`+`
`114`	`119`	`public function isOffsetAccessLegal(): TrinaryLogic`
`115`	`120`	`{`
`116`	`121`	`return TrinaryLogic::createYes();`