implement feedback

Author: staabm

src/Analyser/NodeScopeResolver.php

@@ -5625,18 +5625,27 @@ static function (): void {
 				$assignedExprType = $scope->getType($assignedExpr);
 				$nodeCallback(new PropertyAssignNode($var, $assignedExpr, $isAssignOp), $scope);
 				if ($propertyReflection->canChangeTypeAfterAssignment()) {
-					if ($propertyReflection->hasNativeType() && $scope->isDeclareStrictTypes()) {
+					if ($propertyReflection->hasNativeType()) {
 						$assignedNativeType = $scope->getNativeType($assignedExpr);
 						$propertyNativeType = $propertyReflection->getNativeType();
 
-						$newAssignedType = TypeCombinator::intersect($assignedExprType, $propertyNativeType);
-						$newAssignedNativeType = TypeCombinator::intersect($assignedNativeType, $propertyNativeType);
-						if ($newAssignedType instanceof NeverType || $newAssignedNativeType instanceof NeverType) {
-							$newAssignedType = TypeCombinator::intersect($assignedExprType->toCoercedArgumentType(true), $propertyNativeType);
-							$newAssignedNativeType = TypeCombinator::intersect($assignedNativeType->toCoercedArgumentType(true), $propertyNativeType);
+						$assignedTypeIsCompatible = false;
+						foreach(TypeUtils::flattenTypes($propertyNativeType) as $type) {
+							if ($type->isSuperTypeOf($assignedNativeType)->yes()) {
+								$assignedTypeIsCompatible = true;
+								break;
+							}
 						}
 
-						$scope = $scope->assignExpression($var, $newAssignedType, $newAssignedNativeType);
+						if (!$assignedTypeIsCompatible && $scope->isDeclareStrictTypes()) {
+							$scope = $scope->assignExpression(
+								$var,
+								TypeCombinator::intersect($assignedExprType->toCoercedArgumentType(true), $propertyNativeType),
+								TypeCombinator::intersect($assignedNativeType->toCoercedArgumentType(true), $propertyNativeType)
+							);
+						} else {
+							$scope = $scope->assignExpression($var, $assignedExprType, $assignedNativeType);
+						}
 					} else {
 						$scope = $scope->assignExpression($var, $assignedExprType, $scope->getNativeType($assignedExpr));
 					}

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

@@ -5,6 +5,28 @@
 use function PHPStan\Testing\assertNativeType;
 use function PHPStan\Testing\assertType;
 
+class NarrowsNativeConstantValue
+{
+	private readonly int|float $i;
+
+	public function __construct()
+	{
+		$this->i = 1;
+	}
+
+	public function doFoo(): void
+	{
+		assertType('1', $this->i);
+		assertNativeType('1', $this->i);
+	}
+}
+
+function getInt(): int
+{
+	return 1;
+}
+
+
 class NarrowsNativeReadonlyUnion {
 	private readonly int|float $i;