static property fetch

Author: staabm

src/Analyser/NodeScopeResolver.php

@@ -5713,10 +5713,27 @@ static function (): void {
 				$assignedExprType = $scope->getType($assignedExpr);
 				$nodeCallback(new PropertyAssignNode($var, $assignedExpr, $isAssignOp), $scope);
 				if ($propertyReflection !== null && $propertyReflection->canChangeTypeAfterAssignment()) {
-					if ($propertyReflection->hasNativeType() && $scope->isDeclareStrictTypes()) {
+					if ($propertyReflection->hasNativeType()) {
+						$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));
+						$assignedTypeIsCompatible = false;
+						foreach (TypeUtils::flattenTypes($propertyNativeType) as $type) {
+							if ($type->isSuperTypeOf($assignedNativeType)->yes()) {
+								$assignedTypeIsCompatible = true;
+								break;
+							}
+						}
+
+						if ($assignedTypeIsCompatible) {
+							$scope = $scope->assignExpression($var, $assignedExprType, $assignedNativeType);
+						} elseif ($scope->isDeclareStrictTypes()) {
+							$scope = $scope->assignExpression(
+								$var,
+								TypeCombinator::intersect($assignedExprType->toCoercedArgumentType(true), $propertyNativeType),
+								TypeCombinator::intersect($assignedNativeType->toCoercedArgumentType(true), $propertyNativeType),
+							);
+						}
 					} else {
 						$scope = $scope->assignExpression($var, $assignedExprType, $scope->getNativeType($assignedExpr));
 					}

tests/PHPStan/Analyser/nsrt/bug-12902.php

@@ -66,12 +66,12 @@ class NarrowsStaticNativeUnion {
 	public function __construct()
 	{
 		self::$i = getInt();
-		assertType('float|int', self::$i); // could be int
-		assertNativeType('float|int', self::$i); // could be int
+		assertType('int', self::$i);
+		assertNativeType('int', self::$i);
 
 		$this->impureCall();
-		assertType('float|int', self::$i);
-		assertNativeType('float|int', self::$i);
+		assertType('int', self::$i); // should be float|int
+		assertNativeType('int', self::$i); // should be float|int
 	}
 
 	public function doFoo(): void {