Merge branch refs/heads/1.12.x into 2.1.x

Author: phpstan-bot

src/Type/TypeCombinator.php

@@ -858,6 +858,10 @@ private static function optimizeConstantArrays(array $types): array
 							return TypeCombinator::intersect($type, new OversizedArrayType());
 						}
 
+						if ($type instanceof ConstantScalarType) {
+							return $type->generalize(GeneralizePrecision::moreSpecific());
+						}
+
 						return $traverse($type);
 					});
 					$valueTypes[$generalizedValueType->describe(VerbosityLevel::precise())] = $generalizedValueType;

tests/PHPStan/Analyser/AnalyserIntegrationTest.php

@@ -923,6 +923,12 @@ public function testBug7637(): void
 		$this->assertSame(57, $errors[2]->getLine());
 	}
 
+	public function testBug12671(): void
+	{
+		$errors = $this->runAnalyse(__DIR__ . '/data/bug-12671.php');
+		$this->assertNoErrors($errors);
+	}
+
 	public function testBug7737(): void
 	{
 		$errors = $this->runAnalyse(__DIR__ . '/data/bug-7737.php');