Fix nextAutoIndexes in array coming from ArrayCombineFunctionReturnTy…

…peExtension
phpstan · Oct 7, 2024 · c4ba434 · c4ba434
1 parent 0df14b1
commit c4ba434
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 5 deletions.
diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml
@@ -308,6 +308,9 @@ jobs:
               cd e2e/discussion-11362
               composer install
               ../../bin/phpstan
+          - script: |
+              cd e2e/bug-11819
+              ../../bin/phpstan
 
     steps:
       - name: "Checkout"

diff --git a/e2e/bug-11819/phpstan.neon b/e2e/bug-11819/phpstan.neon
@@ -0,0 +1,4 @@
+parameters:
+	level: 5
+	paths:
+		- test.php
diff --git a/e2e/bug-11819/test.php b/e2e/bug-11819/test.php
@@ -0,0 +1,11 @@
+<?php declare(strict_types = 1);
+
+const TYPES = [1, 2, 3];
+
+$types = array_combine(TYPES, array_fill(0, \count(TYPES), false));
+
+$test = rand(1, 4);
+
+if (isset($types[$test])) {
+	$types[$test] = true;
+}
diff --git a/src/Type/Php/ArrayCombineFunctionReturnTypeExtension.php b/src/Type/Php/ArrayCombineFunctionReturnTypeExtension.php
@@ -10,6 +10,7 @@
 use PHPStan\Type\Accessory\NonEmptyArrayType;
 use PHPStan\Type\ArrayType;
 use PHPStan\Type\Constant\ConstantArrayType;
+use PHPStan\Type\Constant\ConstantArrayTypeBuilder;
 use PHPStan\Type\Constant\ConstantBooleanType;
 use PHPStan\Type\Constant\ConstantIntegerType;
 use PHPStan\Type\Constant\ConstantStringType;
@@ -62,11 +63,13 @@ public function getTypeFromFunctionCall(FunctionReflection $functionReflection,
 
 			$keyTypes = $this->sanitizeConstantArrayKeyTypes($keyTypes);
 			if ($keyTypes !== null) {
-				return new ConstantArrayType(
-					$keyTypes,
-					$valueTypes,
-					$keysParamType->getNextAutoIndexes(),
-				);
+				$builder = ConstantArrayTypeBuilder::createEmpty();
+				foreach ($keyTypes as $i => $keyType) {
+					$valueType = $valueTypes[$i];
+					$builder->setOffsetValueType($keyType, $valueType);
+				}
+
+				return $builder->getArray();
 			}
 		}
 

diff --git a/tests/PHPStan/Analyser/nsrt/array-combine-php8.php b/tests/PHPStan/Analyser/nsrt/array-combine-php8.php
@@ -83,3 +83,11 @@ function withDifferentNumberOfElements(): void
 {
 	assertType('*NEVER*', array_combine(['foo'], ['bar', 'baz']));
 }
+
+function bug11819(): void
+{
+	$keys = [1, 2, 3];
+	$types = array_combine($keys, array_fill(0, \count($keys), false));
+	$types[] = 'foo';
+	assertType('array{1: false, 2: false, 3: false, 4: \'foo\'}', $types);
+}