remember list offset-values with constant union keys

Author: staabm

phpstan-baseline.neon

@@ -33,7 +33,7 @@ parameters:
 		-
 			message: '#^Doing instanceof PHPStan\\Type\\Constant\\ConstantStringType is error\-prone and deprecated\. Use Type\:\:getConstantStrings\(\) instead\.$#'
 			identifier: phpstanApi.instanceofType
-			count: 3
+			count: 2
 			path: src/Analyser/MutatingScope.php
 
 		-
@@ -48,12 +48,6 @@ parameters:
 			count: 2
 			path: src/Analyser/NodeScopeResolver.php
 
-		-
-			message: '#^Doing instanceof PHPStan\\Type\\Constant\\ConstantStringType is error\-prone and deprecated\. Use Type\:\:getConstantStrings\(\) instead\.$#'
-			identifier: phpstanApi.instanceofType
-			count: 1
-			path: src/Analyser/NodeScopeResolver.php
-
 		-
 			message: '#^Parameter \#2 \$node of method PHPStan\\BetterReflection\\SourceLocator\\Ast\\Strategy\\NodeToReflection\:\:__invoke\(\) expects PhpParser\\Node\\Expr\\ArrowFunction\|PhpParser\\Node\\Expr\\Closure\|PhpParser\\Node\\Expr\\FuncCall\|PhpParser\\Node\\Stmt\\Class_\|PhpParser\\Node\\Stmt\\Const_\|PhpParser\\Node\\Stmt\\Enum_\|PhpParser\\Node\\Stmt\\Function_\|PhpParser\\Node\\Stmt\\Interface_\|PhpParser\\Node\\Stmt\\Trait_, PhpParser\\Node\\Stmt\\ClassLike given\.$#'
 			identifier: argument.type

src/Analyser/MutatingScope.php

@@ -4236,12 +4236,14 @@ public function specifyExpressionType(Expr $expr, Type $type, Type $nativeType,
 				if (!$exprVarType instanceof MixedType && !$exprVarType->isArray()->no()) {
 					$hasOffsets = [];
 					$containsInteger = false;
-					foreach($dimTypes as $dimType) {
+					foreach ($dimTypes as $dimType) {
 						$hasOffsets[] = new HasOffsetValueType($dimType, $type);
 
-						if ($dimType instanceof ConstantIntegerType) {
-							$containsInteger = true;
+						if (!($dimType instanceof ConstantIntegerType)) {
+							continue;
 						}
+
+						$containsInteger = true;
 					}
 
 					$types = [

src/Analyser/NodeScopeResolver.php

@@ -171,7 +171,6 @@
 use PHPStan\Type\Constant\ConstantArrayTypeBuilder;
 use PHPStan\Type\Constant\ConstantBooleanType;
 use PHPStan\Type\Constant\ConstantIntegerType;
-use PHPStan\Type\Constant\ConstantStringType;
 use PHPStan\Type\ErrorType;
 use PHPStan\Type\FileTypeMapper;
 use PHPStan\Type\GeneralizePrecision;
@@ -6053,15 +6052,19 @@ private function produceArrayDimFetchAssignValueToWrite(array $dimFetchStack, ar
 				&& $scope->hasExpressionType($arrayDimFetch)->yes()
 			) {
 				$hasOffsetType = null;
-				if ($offsetType instanceof ConstantStringType || $offsetType instanceof ConstantIntegerType) {
-					$hasOffsetType = new HasOffsetValueType($offsetType, $valueToWrite);
+				$offsetConstantArrayKeys = $offsetType->getConstantArrayKeys();
+				if ($offsetConstantArrayKeys !== []) {
+					$hasOffsetType = [];
+					foreach ($offsetConstantArrayKeys as $constantArrayKey) {
+						$hasOffsetType[] = new HasOffsetValueType($constantArrayKey, $valueToWrite);
+					}
 				}
 				$valueToWrite = $offsetValueType->setExistingOffsetValueType($offsetType, $valueToWrite);
 
 				if ($hasOffsetType !== null) {
 					$valueToWrite = TypeCombinator::intersect(
 						$valueToWrite,
-						$hasOffsetType,
+						...$hasOffsetType,
 					);
 				} elseif ($valueToWrite->isArray()->yes()) {
 					$valueToWrite = TypeCombinator::intersect(

tests/PHPStan/Rules/Methods/data/bug-12927.php

@@ -60,4 +60,19 @@ public function sayFooBar(array $list): void
 		}
 		assertType('array<string, string>', $list[$k]);
 	}
+
+	/**
+	 * @param list<array<string, string>> $list
+	 * @param 'ab'|'cd' $constUnion
+	 */
+	public function sayUnionFoo2(array $list, $constUnion): void
+	{
+		foreach($list as $k => $v) {
+			$list[$k][$constUnion] = 'world';
+			assertType("non-empty-list<non-empty-array<string, string>&hasOffsetValue('ab', 'world')&hasOffsetValue('cd', 'world')>", $list);
+			assertType("non-empty-array<string, string>&hasOffsetValue('ab', 'world')&hasOffsetValue('cd', 'world')", $list[$k]);
+		}
+		assertType("list<non-empty-array<string, string>&hasOffsetValue('ab', 'world')&hasOffsetValue('cd', 'world')>", $list);
+	}
+
 }