cleanup

Author: staabm

src/Analyser/NodeScopeResolver.php

@@ -5627,8 +5627,8 @@ static function (): void {
 				$assignedExprType = $scope->getType($assignedExpr);
 				$nodeCallback(new PropertyAssignNode($var, $assignedExpr, $isAssignOp), $scope);
 				if ($propertyReflection->canChangeTypeAfterAssignment()) {
+					$assignedNativeType = $scope->getNativeType($assignedExpr);
 					if ($propertyReflection->hasNativeType()) {
-						$assignedNativeType = $scope->getNativeType($assignedExpr);
 						$propertyNativeType = $propertyReflection->getNativeType();
 
 						$assignedTypeIsCompatible = false;
@@ -5648,10 +5648,14 @@ static function (): void {
 								TypeCombinator::intersect($assignedNativeType->toCoercedArgumentType(true), $propertyNativeType),
 							);
 						} else {
-							$scope = $scope->assignExpression($var, $assignedExprType, $scope->getNativeType($assignedExpr));
+							$scope = $scope->assignExpression(
+								$var,
+								TypeCombinator::intersect($assignedExprType, $propertyNativeType),
+								TypeCombinator::intersect($assignedNativeType, $propertyNativeType),
+							);
 						}
 					} else {
-						$scope = $scope->assignExpression($var, $assignedExprType, $scope->getNativeType($assignedExpr));
+						$scope = $scope->assignExpression($var, $assignedExprType, $assignedNativeType);
 					}
 				}
 				$declaringClass = $propertyReflection->getDeclaringClass();
@@ -5717,8 +5721,8 @@ static function (): void {
 				$assignedExprType = $scope->getType($assignedExpr);
 				$nodeCallback(new PropertyAssignNode($var, $assignedExpr, $isAssignOp), $scope);
 				if ($propertyReflection !== null && $propertyReflection->canChangeTypeAfterAssignment()) {
+					$assignedNativeType = $scope->getNativeType($assignedExpr);
 					if ($propertyReflection->hasNativeType()) {
-						$assignedNativeType = $scope->getNativeType($assignedExpr);
 						$propertyNativeType = $propertyReflection->getNativeType();
 
 						$assignedTypeIsCompatible = false;
@@ -5738,10 +5742,14 @@ static function (): void {
 								TypeCombinator::intersect($assignedNativeType->toCoercedArgumentType(true), $propertyNativeType),
 							);
 						} else {
-							$scope = $scope->assignExpression($var, $assignedExprType, $scope->getNativeType($assignedExpr));
+							$scope = $scope->assignExpression(
+								$var,
+								TypeCombinator::intersect($assignedExprType, $propertyNativeType),
+								TypeCombinator::intersect($assignedNativeType, $propertyNativeType),
+							);
 						}
 					} else {
-						$scope = $scope->assignExpression($var, $assignedExprType, $scope->getNativeType($assignedExpr));
+						$scope = $scope->assignExpression($var, $assignedExprType, $assignedNativeType);
 					}
 				}
 			} else {