Merge branch 2.1.x into 2.2.x

Author: phpstan-bot

src/Type/Accessory/AccessoryArrayListType.php

@@ -162,6 +162,10 @@ public function setOffsetValueType(?Type $offsetType, Type $valueType, bool $uni
 
 	public function setExistingOffsetValueType(Type $offsetType, Type $valueType): Type
 	{
+		if ($this->hasOffsetValueType($offsetType)->no()) {
+			return new ErrorType();
+		}
+
 		return $this;
 	}
 

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

@@ -0,0 +1,37 @@
+<?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) {
+				$xsdFiles[$xmlNamespace][$viewHelper['name']] = $viewHelper;
+			}
+		}
+		// After assigning with string keys ($viewHelper['name']), $xsdFiles[$xmlNamespace] should NOT be a list
+		assertType('array<int<0, max>, array{xmlNamespace: string, namespace: string, name: string}>', $xsdFiles[$xmlNamespace]);
+		$xsdFiles[$xmlNamespace] = array_values($xsdFiles[$xmlNamespace]);
+	}
+}

tests/PHPStan/Rules/Functions/ArrayValuesRuleTest.php

@@ -89,4 +89,9 @@ public function testFile(): void
 		$this->analyse([__DIR__ . '/data/array_values_list.php'], $expectedErrors);
 	}
 
+	public function testBug13629(): void
+	{
+		$this->analyse([__DIR__ . '/../../Analyser/nsrt/bug-13629.php'], []);
+	}
+
 }