Fix assigning properties

Author: ondrejmirtes

src/Analyser/NodeScopeResolver.php

@@ -5628,25 +5628,28 @@ static function (): void {
 				$nodeCallback(new PropertyAssignNode($var, $assignedExpr, $isAssignOp), $scope);
 				if ($propertyReflection->canChangeTypeAfterAssignment()) {
 					if ($propertyReflection->hasNativeType()) {
-						$assignedNativeType = $scope->getNativeType($assignedExpr);
 						$propertyNativeType = $propertyReflection->getNativeType();
 
-						$assignedTypeIsCompatible = false;
-						foreach (TypeUtils::flattenTypes($propertyNativeType) as $type) {
-							if ($type->isSuperTypeOf($assignedNativeType)->yes()) {
-								$assignedTypeIsCompatible = true;
-								break;
+						$assignedTypeIsCompatible = $propertyNativeType->isSuperTypeOf($assignedExprType)->yes();
+						if (!$assignedTypeIsCompatible) {
+							foreach (TypeUtils::flattenTypes($propertyNativeType) as $type) {
+								if ($type->isSuperTypeOf($assignedExprType)->yes()) {
+									$assignedTypeIsCompatible = true;
+									break;
+								}
 							}
 						}
 
 						if ($assignedTypeIsCompatible) {
-							$scope = $scope->assignExpression($var, $assignedExprType, $assignedNativeType);
+							$scope = $scope->assignExpression($var, $assignedExprType, $scope->getNativeType($assignedExpr));
 						} elseif ($scope->isDeclareStrictTypes()) {
 							$scope = $scope->assignExpression(
 								$var,
 								TypeCombinator::intersect($assignedExprType->toCoercedArgumentType(true), $propertyNativeType),
-								TypeCombinator::intersect($assignedNativeType->toCoercedArgumentType(true), $propertyNativeType),
+								TypeCombinator::intersect($scope->getNativeType($assignedExpr)->toCoercedArgumentType(true), $propertyNativeType),
 							);
+						} else {
+							$scope = $scope->assignExpression($var, $assignedExprType, $scope->getNativeType($assignedExpr));
 						}
 					} else {
 						$scope = $scope->assignExpression($var, $assignedExprType, $scope->getNativeType($assignedExpr));
@@ -5716,25 +5719,28 @@ static function (): void {
 				$nodeCallback(new PropertyAssignNode($var, $assignedExpr, $isAssignOp), $scope);
 				if ($propertyReflection !== null && $propertyReflection->canChangeTypeAfterAssignment()) {
 					if ($propertyReflection->hasNativeType()) {
-						$assignedNativeType = $scope->getNativeType($assignedExpr);
 						$propertyNativeType = $propertyReflection->getNativeType();
+						$assignedTypeIsCompatible = $propertyNativeType->isSuperTypeOf($assignedExprType)->yes();
 
-						$assignedTypeIsCompatible = false;
-						foreach (TypeUtils::flattenTypes($propertyNativeType) as $type) {
-							if ($type->isSuperTypeOf($assignedNativeType)->yes()) {
-								$assignedTypeIsCompatible = true;
-								break;
+						if (!$assignedTypeIsCompatible) {
+							foreach (TypeUtils::flattenTypes($propertyNativeType) as $type) {
+								if ($type->isSuperTypeOf($assignedExprType)->yes()) {
+									$assignedTypeIsCompatible = true;
+									break;
+								}
 							}
 						}
 
 						if ($assignedTypeIsCompatible) {
-							$scope = $scope->assignExpression($var, $assignedExprType, $assignedNativeType);
+							$scope = $scope->assignExpression($var, $assignedExprType, $scope->getNativeType($assignedExpr));
 						} elseif ($scope->isDeclareStrictTypes()) {
 							$scope = $scope->assignExpression(
 								$var,
 								TypeCombinator::intersect($assignedExprType->toCoercedArgumentType(true), $propertyNativeType),
-								TypeCombinator::intersect($assignedNativeType->toCoercedArgumentType(true), $propertyNativeType),
+								TypeCombinator::intersect($scope->getNativeType($assignedExpr)->toCoercedArgumentType(true), $propertyNativeType),
 							);
+						} else {
+							$scope = $scope->assignExpression($var, $assignedExprType, $scope->getNativeType($assignedExpr));
 						}
 					} else {
 						$scope = $scope->assignExpression($var, $assignedExprType, $scope->getNativeType($assignedExpr));

tests/PHPStan/Analyser/nsrt/bug-12393b.php

@@ -53,7 +53,7 @@ public function doLorem(): void
 
 	public function doFloatTricky(){
 		$this->float = 1;
-		assertType('1.0', $this->float);
+		assertType('float', $this->float);
 	}
 }