Skip to content

Commit 9251436

Browse files
phpstan-botclaude
andauthored
Normalize array keys through toArrayKey() in array_fill_keys and array_combine return types (#6078)
Co-authored-by: Claude Opus 5 <noreply@anthropic.com>
1 parent 77bb303 commit 9251436

9 files changed

Lines changed: 130 additions & 13 deletions

File tree

‎src/Type/ArrayType.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -502,10 +502,10 @@ public function fillKeysArray(Type $valueType): Type
502502
return $stringKeyType;
503503
}
504504

505-
return new ArrayType($stringKeyType, $valueType);
505+
return new ArrayType($stringKeyType->toArrayKey(), $valueType);
506506
}
507507

508-
return new ArrayType($itemType, $valueType);
508+
return new ArrayType($itemType->toArrayKey(), $valueType);
509509
}
510510

511511
public function flipArray(): Type

‎src/Type/MixedType.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ public function fillKeysArray(Type $valueType): Type
223223
return new ErrorType();
224224
}
225225

226-
return new ArrayType($this->getIterableValueType(), $valueType);
226+
return new ArrayType($this->getIterableValueType()->toArrayKey(), $valueType);
227227
}
228228

229229
public function flipArray(): Type

‎src/Type/Php/ArrayCombineHelper.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,9 +98,9 @@ public function getReturnAndThrowType(Expr $firstArg, Expr $secondArg, Scope $sc
9898
return [new NeverType(), TrinaryLogic::createNo()];
9999
}
100100

101-
$keyType = $itemType->toString();
101+
$keyType = $itemType->toString()->toArrayKey();
102102
} else {
103-
$keyType = $itemType;
103+
$keyType = $itemType->toArrayKey();
104104
}
105105
} else {
106106
$keyType = new MixedType();

‎tests/PHPStan/Analyser/nsrt/array-combine-php8.php‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ function withUnionConstArraysDifferentArraysCount(): void
110110
}
111111
}
112112

113-
assertType("non-empty-array<1|'2'|'3', 'apple'|'avocado'|'banana'|'pear'>", array_combine($a, $b));
113+
assertType("non-empty-array<1|2|3, 'apple'|'avocado'|'banana'|'pear'>", array_combine($a, $b));
114114
}
115115

116116
function withUnionConstArraysAndDifferentFiniteKeysCount(bool $bool): void
@@ -123,7 +123,7 @@ function withUnionConstArraysAndDifferentFiniteKeysCount(bool $bool): void
123123
$b = ['apple', 'banana'];
124124
}
125125

126-
assertType("non-empty-array<''|'1'|'2', 'apple'|'avocado'|'banana'>", array_combine($a, $b));
126+
assertType("non-empty-array<1|2|'', 'apple'|'avocado'|'banana'>", array_combine($a, $b));
127127
}
128128

129129
/**
@@ -186,3 +186,13 @@ function onlyKeysUnsealed(array $keys)
186186
// exist. Result stays sealed.
187187
assertType('array{a: 1, b: 2}', array_combine($keys, [1, 2]));
188188
}
189+
190+
/**
191+
* @param list<'1'|'2'> $constantIntStrings
192+
* @param array{0: '1', 1: '2'} $sealedIntStrings
193+
*/
194+
function withConstantIntStringKeys(array $constantIntStrings, array $sealedIntStrings): void
195+
{
196+
assertType("array<1|2, '1'|'2'>", array_combine($constantIntStrings, $constantIntStrings));
197+
assertType("array{1: '1', 2: '2'}", array_combine($sealedIntStrings, $sealedIntStrings));
198+
}

‎tests/PHPStan/Analyser/nsrt/array-fill-keys-php7.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
function mixedAndSubtractedArray($mixed): void
88
{
99
if (is_array($mixed)) {
10-
assertType("array<mixed, 'b'>", array_fill_keys($mixed, 'b'));
10+
assertType("array<'b'>", array_fill_keys($mixed, 'b'));
1111
} else {
1212
assertType("null", array_fill_keys($mixed, 'b'));
1313
}

‎tests/PHPStan/Analyser/nsrt/array-fill-keys-php8.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
function mixedAndSubtractedArray($mixed): void
88
{
99
if (is_array($mixed)) {
10-
assertType("array<mixed, 'b'>", array_fill_keys($mixed, 'b'));
10+
assertType("array<'b'>", array_fill_keys($mixed, 'b'));
1111
} else {
1212
assertType("*NEVER*", array_fill_keys($mixed, 'b'));
1313
}

‎tests/PHPStan/Analyser/nsrt/array-fill-keys.php‎

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -91,17 +91,17 @@ function withNotConstantArray(array $foo, array $bar, array $baz, array $floats,
9191
assertType("array<string, null>", array_fill_keys($foo, null));
9292
assertType("array<int, null>", array_fill_keys($bar, null));
9393
assertType("array<'foo', null>", array_fill_keys($baz, null));
94-
assertType("array<numeric-string&uppercase-string, null>", array_fill_keys($floats, null));
95-
assertType("array<bool|int|string, null>", array_fill_keys($mixed, null));
94+
assertType("array<int|(numeric-string&uppercase-string), null>", array_fill_keys($floats, null));
95+
assertType("array<int|string, null>", array_fill_keys($mixed, null));
9696
assertType('array<string, null>', array_fill_keys($list, null));
9797
assertType('*ERROR*', array_fill_keys($objectsWithoutToString, null));
9898

9999
if (array_key_exists(17, $mixed)) {
100-
assertType('non-empty-array<bool|int|string, null>', array_fill_keys($mixed, null));
100+
assertType('non-empty-array<int|string, null>', array_fill_keys($mixed, null));
101101
}
102102

103103
if (array_key_exists(17, $mixed) && $mixed[17] === 'foo') {
104-
assertType('non-empty-array<bool|int|string, null>', array_fill_keys($mixed, null));
104+
assertType('non-empty-array<int|string, null>', array_fill_keys($mixed, null));
105105
}
106106
}
107107

@@ -114,3 +114,15 @@ function sealedArrayFillKeys(array $sealed, array $unsealed): void
114114
assertType("array{1: 'b', 2: 'b', 3: 'b'}", array_fill_keys($sealed, 'b'));
115115
assertType("array{1: 'b', 2: 'b', 3: 'b', 0?: 'b'}", array_fill_keys($unsealed, 'b'));
116116
}
117+
118+
/**
119+
* @param list<'1'|'2'> $constantIntStrings
120+
* @param array{0: '1', 1: '2'} $sealedIntStrings
121+
* @param array{0: '1', ...<int, numeric-string>} $unsealedIntStrings
122+
*/
123+
function intStringArrayFillKeys(array $constantIntStrings, array $sealedIntStrings, array $unsealedIntStrings): void
124+
{
125+
assertType("array<1|2, 'b'>", array_fill_keys($constantIntStrings, 'b'));
126+
assertType("array{1: 'b', 2: 'b'}", array_fill_keys($sealedIntStrings, 'b'));
127+
assertType("array{1: 'b', ...<int|numeric-string, 'b'>}", array_fill_keys($unsealedIntStrings, 'b'));
128+
}

‎tests/PHPStan/Analyser/nsrt/array-flip.php‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,3 +104,16 @@ function sealedArrayFlip(array $sealed, array $unsealed): void
104104
assertType('array{1: int, 2: 1, 3: 2, 0?: int}', array_flip($unsealed));
105105
assertType('int', array_flip($unsealed)[1]);
106106
}
107+
108+
/**
109+
* @param list<'1'|'2'> $constantIntStrings
110+
* @param list<numeric-string> $numericStrings
111+
* @param array{0: '1', 1: '2'} $sealedIntStrings
112+
*/
113+
function intStringArrayFlip(array $constantIntStrings, array $numericStrings, array $sealedIntStrings): void
114+
{
115+
assertType('array{1: 0, 2: 1}', array_flip(['1', '2']));
116+
assertType('array<1|2, int<0, max>>', array_flip($constantIntStrings));
117+
assertType('array<int|numeric-string, int<0, max>>', array_flip($numericStrings));
118+
assertType('array{1: 0, 2: 1}', array_flip($sealedIntStrings));
119+
}
Lines changed: 82 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,82 @@
1+
<?php // lint >= 8.0
2+
3+
declare(strict_types = 1);
4+
5+
namespace Bug14980;
6+
7+
use function PHPStan\Testing\assertType;
8+
9+
/**
10+
* @param list<int> $ints
11+
*/
12+
function decimalIntStringKeys(array $ints): void
13+
{
14+
$keys = [];
15+
foreach ($ints as $int) {
16+
$keys[] = $int;
17+
$keys[] = (string) $int;
18+
}
19+
20+
assertType('list<int|decimal-int-string>', $keys);
21+
assertType('array<int, true>', array_fill_keys($keys, true));
22+
}
23+
24+
/**
25+
* @param list<numeric-string> $keys
26+
*/
27+
function numericStringKeys(array $keys): void
28+
{
29+
assertType('array<int|numeric-string, true>', array_fill_keys($keys, true));
30+
}
31+
32+
function fillKeysMixedArray(mixed $m): void
33+
{
34+
if (is_array($m)) {
35+
assertType('array<true>', array_fill_keys($m, true));
36+
}
37+
}
38+
39+
/**
40+
* @param list<int> $ints
41+
*/
42+
function combineDecimalIntStringKeys(array $ints): void
43+
{
44+
$keys = [];
45+
foreach ($ints as $int) {
46+
$keys[] = $int;
47+
$keys[] = (string) $int;
48+
}
49+
50+
assertType('array<int, int|decimal-int-string>', array_combine($keys, $keys));
51+
}
52+
53+
/**
54+
* @param list<numeric-string> $keys
55+
* @param list<string> $values
56+
*/
57+
function combineNumericStringKeys(array $keys, array $values): void
58+
{
59+
assertType('array<int|numeric-string, string>', array_combine($keys, $values));
60+
}
61+
62+
class DecimalIntBug
63+
{
64+
65+
/** @var array<int, true> */
66+
private array $data = [];
67+
68+
/**
69+
* @param list<int> $ints
70+
*/
71+
public function set(array $ints): void
72+
{
73+
$keys = [];
74+
foreach ($ints as $int) {
75+
$keys[] = $int;
76+
$keys[] = (string) $int;
77+
}
78+
79+
$this->data = array_fill_keys($keys, true);
80+
}
81+
82+
}

0 commit comments

Comments
 (0)