better fix

Author: staabm

src/Analyser/NodeScopeResolver.php

@@ -5647,12 +5647,8 @@ static function (): void {
 								TypeCombinator::intersect($assignedExprType->toCoercedArgumentType(true), $propertyNativeType),
 								TypeCombinator::intersect($assignedNativeType->toCoercedArgumentType(true), $propertyNativeType),
 							);
-						} elseif (!$propertyNativeType->isNull()->no() && $assignedNativeType->isNull()->no()) {
-							$scope = $scope->assignExpression(
-								$var,
-								TypeCombinator::removeNull($propertyReflection->hasPhpDocType() ? $propertyReflection->getPhpDocType() : $propertyNativeType),
-								TypeCombinator::removeNull($propertyNativeType),
-							);
+						} else {
+							$scope = $scope->assignExpression($var, $assignedExprType, $scope->getNativeType($assignedExpr));
 						}
 					} else {
 						$scope = $scope->assignExpression($var, $assignedExprType, $scope->getNativeType($assignedExpr));
@@ -5741,12 +5737,8 @@ static function (): void {
 								TypeCombinator::intersect($assignedExprType->toCoercedArgumentType(true), $propertyNativeType),
 								TypeCombinator::intersect($assignedNativeType->toCoercedArgumentType(true), $propertyNativeType),
 							);
-						} elseif (!$propertyNativeType->isNull()->no() && $assignedNativeType->isNull()->no()) {
-							$scope = $scope->assignExpression(
-								$var,
-								TypeCombinator::removeNull($propertyReflection->hasPhpDocType() ? $propertyReflection->getPhpDocType() : $propertyNativeType),
-								TypeCombinator::removeNull($propertyNativeType),
-							);
+						} else {
+							$scope = $scope->assignExpression($var, $assignedExprType, $scope->getNativeType($assignedExpr));
 						}
 					} else {
 						$scope = $scope->assignExpression($var, $assignedExprType, $scope->getNativeType($assignedExpr));