Address review comments

- Remove bug-14129.php (already covered by set-constant-union-offset-on-constant-array.php)
- Move bug-7978.php from NSRT to CallMethodsRuleTest
- Add de-duplication for overlapping integer ranges in resolveFiniteScalarKeyTypes()
- Add test for overlapping ranges (int<0,3>|int<2,4>)

Co-authored-by: Markus Staab <staabm@users.noreply.github.com>

Author: phpstan-bot

src/Type/Constant/ConstantArrayType.php

@@ -777,13 +777,18 @@ private function resolveFiniteScalarKeyTypes(Type $offsetType): ?array
 		$integerRanges = TypeUtils::getIntegerRanges($offsetType);
 		if (count($integerRanges) > 0) {
 			$finiteScalarTypes = [];
+			$seen = [];
 			foreach ($integerRanges as $integerRange) {
 				$finiteTypes = $integerRange->getFiniteTypes();
 				if ($finiteTypes === []) {
 					return null;
 				}
 
 				foreach ($finiteTypes as $finiteType) {
+					if (isset($seen[$finiteType->getValue()])) {
+						continue;
+					}
+					$seen[$finiteType->getValue()] = true;
 					$finiteScalarTypes[] = $finiteType;
 				}
 			}

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

@@ -47,6 +47,16 @@ public function doUnionOfRanges(array $a, $intRange): void
 		assertType('non-empty-array<\'foo\'|int<0, 5>|int<10, 15>, int>', $a);
 	}
 
+	/**
+	 * @param array{foo: int}  $a
+	 * @param int<0, 3>|int<2, 4> $intRange
+	 */
+	public function doOverlappingRanges(array $a, $intRange): void
+	{
+		$a[$intRange] = 256;
+		assertType('array{foo: int, 0: 256}|array{foo: int, 1: 256}|array{foo: int, 2: 256}|array{foo: int, 3: 256}|array{foo: int, 4: 256}', $a);
+	}
+
 	/**
 	 * @param array{0: 'a', 1: 'b'}  $a
 	 * @param int<0,1> $intRange

tests/PHPStan/Analyser/nsrt/set-constant-union-offset-on-constant-array.php

@@ -3853,4 +3853,12 @@ public function testBug13805(): void
 		$this->analyse([__DIR__ . '/data/bug-13805.php'], []);
 	}
 
+	public function testBug7978(): void
+	{
+		$this->checkThisOnly = false;
+		$this->checkNullables = true;
+		$this->checkUnionTypes = true;
+		$this->analyse([__DIR__ . '/data/bug-7978.php'], []);
+	}
+
 }

tests/PHPStan/Rules/Methods/CallMethodsRuleTest.php

@@ -2,23 +2,28 @@
 
 namespace Bug7978;
 
-use function PHPStan\Testing\assertType;
-
 class Test {
 
 	const FIELD_SETS = [
 		'basic'   => ['username', 'password'],
 		'headers' => ['app_id', 'app_key'],
 	];
 
+	/**
+	 * @param array<string, string> $credentials
+	 */
+	public function acceptCredentials(array $credentials): void
+	{
+	}
+
 	public function doSomething(): void
 	{
 		foreach (self::FIELD_SETS as $type => $fields) {
 			$credentials = [];
 			foreach ($fields as $field) {
 				$credentials[$field] = 'fake';
 			}
-			assertType("array{app_id?: 'fake', app_key?: 'fake', password?: 'fake', username?: 'fake'}", $credentials);
+			$this->acceptCredentials($credentials);
 		}
 	}
 }