Fix "Parameter X of array_values is already a list, call has no effect"-false positive (phpstan#5271)

Author: staabm

src/Type/IntersectionType.php

@@ -981,7 +981,12 @@ public function setOffsetValueType(?Type $offsetType, Type $valueType, bool $uni
 			}
 		}
 
-		if ($this->isList()->yes() && $this->getIterableValueType()->isArray()->yes()) {
+		if (
+			$this->isList()->yes()
+			&& $offsetType !== null
+			&& $offsetType->toArrayKey()->isInteger()->yes()
+			&& $this->getIterableValueType()->isArray()->yes()
+		) {
 			$result = TypeCombinator::intersect($result, new AccessoryArrayListType());
 		}
 

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

@@ -11,8 +11,10 @@ class Test
 	protected function create_matrix(int $size): array
 	{
 		$size = min(8, $size);
+		assertType('int<min, 8>', $size);
 		$matrix = [];
 		for ($i = 0; $i < $size; $i++) {
+			assertType('int<0, 7>', $i);
 			$matrix[] = array_fill(0, $size, 0);
 		}
 

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

@@ -0,0 +1,38 @@
+<?php declare(strict_types = 1);
+
+namespace Bug13629;
+
+use function PHPStan\Testing\assertType;
+
+/**
+ * @param array<string, list<array{xmlNamespace: string, namespace: string, name: string}>> $xsdFiles
+ * @param array<string, list<array{xmlNamespace: string, namespace: string, name: string}>> $groupedByNamespace
+ * @param array<string, list<string>> $extraNamespaces
+ */
+function test(array $xsdFiles, array $groupedByNamespace, array $extraNamespaces): void {
+	foreach ($extraNamespaces as $mergedNamespace) {
+		if (count($mergedNamespace) < 2) {
+			continue;
+		}
+
+		$targetNamespace = end($mergedNamespace);
+		if (!isset($groupedByNamespace[$targetNamespace])) {
+			continue;
+		}
+		$xmlNamespace = $groupedByNamespace[$targetNamespace][0]['xmlNamespace'];
+
+		assertType('string', $xmlNamespace);
+		assertType('non-empty-list<string>&hasOffsetValue(1, string)', $mergedNamespace);
+
+		$xsdFiles[$xmlNamespace] = [];
+		foreach ($mergedNamespace as $namespace) {
+			foreach ($groupedByNamespace[$namespace] ?? [] as $viewHelper) {
+				assertType('string', $viewHelper['name']);
+				$xsdFiles[$xmlNamespace][$viewHelper['name']] = $viewHelper;
+			}
+		}
+		// After assigning with string keys ($viewHelper['name']), $xsdFiles[$xmlNamespace] should NOT be a list
+		assertType('array<int<0, max>|string, array{xmlNamespace: string, namespace: string, name: string}>', $xsdFiles[$xmlNamespace]);
+		$xsdFiles[$xmlNamespace] = array_values($xsdFiles[$xmlNamespace]);
+	}
+}