Don't remember non-nullable properties as nullable

Author: staabm

src/Analyser/NodeScopeResolver.php

@@ -5625,12 +5625,15 @@ static function (): void {
 				$assignedExprType = $scope->getType($assignedExpr);
 				$nodeCallback(new PropertyAssignNode($var, $assignedExpr, $isAssignOp), $scope);
 				if ($propertyReflection->canChangeTypeAfterAssignment()) {
-					if ($propertyReflection->hasNativeType() && $scope->isDeclareStrictTypes()) {
-						$propertyNativeType = $propertyReflection->getNativeType();
+					$assignedNativeType = $scope->getNativeType($assignedExpr);
+					$propertyNativeType = $propertyReflection->getNativeType();
 
-						$scope = $scope->assignExpression($var, TypeCombinator::intersect($assignedExprType->toCoercedArgumentType(true), $propertyNativeType), TypeCombinator::intersect($scope->getNativeType($assignedExpr)->toCoercedArgumentType(true), $propertyNativeType));
+					if ($propertyReflection->hasNativeType() && $scope->isDeclareStrictTypes()) {
+						$scope = $scope->assignExpression($var, TypeCombinator::intersect($assignedExprType->toCoercedArgumentType(true), $propertyNativeType), TypeCombinator::intersect($assignedNativeType->toCoercedArgumentType(true), $propertyNativeType));
+					} elseif ($propertyNativeType->isNull()->no()) {
+						$scope = $scope->assignExpression($var, TypeCombinator::removeNull($assignedExprType), TypeCombinator::removeNull($assignedNativeType));
 					} else {
-						$scope = $scope->assignExpression($var, $assignedExprType, $scope->getNativeType($assignedExpr));
+						$scope = $scope->assignExpression($var, $assignedExprType, $assignedNativeType);
 					}
 				}
 				$declaringClass = $propertyReflection->getDeclaringClass();
@@ -5696,12 +5699,15 @@ static function (): void {
 				$assignedExprType = $scope->getType($assignedExpr);
 				$nodeCallback(new PropertyAssignNode($var, $assignedExpr, $isAssignOp), $scope);
 				if ($propertyReflection !== null && $propertyReflection->canChangeTypeAfterAssignment()) {
-					if ($propertyReflection->hasNativeType() && $scope->isDeclareStrictTypes()) {
-						$propertyNativeType = $propertyReflection->getNativeType();
+					$assignedNativeType = $scope->getNativeType($assignedExpr);
+					$propertyNativeType = $propertyReflection->getNativeType();
 
-						$scope = $scope->assignExpression($var, TypeCombinator::intersect($assignedExprType->toCoercedArgumentType(true), $propertyNativeType), TypeCombinator::intersect($scope->getNativeType($assignedExpr)->toCoercedArgumentType(true), $propertyNativeType));
+					if ($propertyReflection->hasNativeType() && $scope->isDeclareStrictTypes()) {
+						$scope = $scope->assignExpression($var, TypeCombinator::intersect($assignedExprType->toCoercedArgumentType(true), $propertyNativeType), TypeCombinator::intersect($assignedNativeType->toCoercedArgumentType(true), $propertyNativeType));
+					} elseif ($propertyNativeType->isNull()->no()) {
+						$scope = $scope->assignExpression($var, TypeCombinator::removeNull($assignedExprType), TypeCombinator::removeNull($assignedNativeType));
 					} else {
-						$scope = $scope->assignExpression($var, $assignedExprType, $scope->getNativeType($assignedExpr));
+						$scope = $scope->assignExpression($var, $assignedExprType, $assignedNativeType);
 					}
 				}
 			} else {

tests/PHPStan/Analyser/nsrt/property-null-after-assignment.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace PropertyNullAfterAssignment;
+
+use function PHPStan\Testing\assertNativeType;
+use function PHPStan\Testing\assertType;
+
+class HelloWorld {
+	private readonly int $i;
+
+	public function __construct()
+	{
+		$this->i = getIntOrNull();
+	}
+
+	public function doFoo(): void {
+		assertType('int', $this->i);
+		assertNativeType('int', $this->i);
+	}
+}
+
+function getIntOrNull(): ?int {
+	if (rand(0, 1) === 0) {
+		return null;
+	}
+	return 1;
+}