Skip to content

Commit b76fecc

Browse files
staabmstaabm
authored
isset() narrows string-key in int-keyed-array to numeric-string
1 parent 31362eb commit b76fecc

File tree

3 files changed

+89
-46
lines changed

3 files changed

+89
-46
lines changed

‎src/Analyser/TypeSpecifier.php

+3-41
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
use PHPStan\Reflection\ParametersAcceptorWithPhpDocs;
2929
use PHPStan\Reflection\ReflectionProvider;
3030
use PHPStan\Reflection\ResolvedFunctionVariant;
31+
use PHPStan\Rules\Arrays\AllowedArrayKeysTypes;
3132
use PHPStan\ShouldNotHappenException;
3233
use PHPStan\TrinaryLogic;
3334
use PHPStan\Type\Accessory\AccessoryArrayListType;
@@ -820,47 +821,8 @@ public function specifyTypesInCondition(
820821
);
821822
} else {
822823
$varType = $scope->getType($var->var);
823-
if ($varType->isArray()->yes() && !$varType->isIterableAtLeastOnce()->no()) {
824-
$varIterableKeyType = $varType->getIterableKeyType();
825-
826-
if ($varIterableKeyType->isConstantScalarValue()->yes()) {
827-
$narrowedKey = TypeCombinator::union(
828-
$varIterableKeyType,
829-
TypeCombinator::remove($varIterableKeyType->toString(), new ConstantStringType('')),
830-
);
831-
832-
if (!$varType->hasOffsetValueType(new ConstantIntegerType(0))->no()) {
833-
$narrowedKey = TypeCombinator::union(
834-
$narrowedKey,
835-
new ConstantBooleanType(false),
836-
);
837-
}
838-
839-
if (!$varType->hasOffsetValueType(new ConstantIntegerType(1))->no()) {
840-
$narrowedKey = TypeCombinator::union(
841-
$narrowedKey,
842-
new ConstantBooleanType(true),
843-
);
844-
}
845-
846-
if (!$varType->hasOffsetValueType(new ConstantStringType(''))->no()) {
847-
$narrowedKey = TypeCombinator::addNull($narrowedKey);
848-
}
849-
850-
if (!$varIterableKeyType->isNumericString()->no() || !$varIterableKeyType->isInteger()->no()) {
851-
$narrowedKey = TypeCombinator::union($narrowedKey, new FloatType());
852-
}
853-
} else {
854-
$narrowedKey = new MixedType(
855-
false,
856-
new UnionType([
857-
new ArrayType(new MixedType(), new MixedType()),
858-
new ObjectWithoutClassType(),
859-
new ResourceType(),
860-
]),
861-
);
862-
}
863-
824+
$narrowedKey = AllowedArrayKeysTypes::narrowOffsetKeyType($varType, $dimType);
825+
if ($narrowedKey !== null) {
864826
$types = $types->unionWith(
865827
$this->create(
866828
$var->dim,

‎src/Rules/Arrays/AllowedArrayKeysTypes.php

+59
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,20 @@
22

33
namespace PHPStan\Rules\Arrays;
44

5+
use PHPStan\Type\ArrayType;
56
use PHPStan\Type\BooleanType;
7+
use PHPStan\Type\Constant\ConstantBooleanType;
8+
use PHPStan\Type\Constant\ConstantIntegerType;
9+
use PHPStan\Type\Constant\ConstantStringType;
610
use PHPStan\Type\FloatType;
711
use PHPStan\Type\IntegerType;
12+
use PHPStan\Type\MixedType;
813
use PHPStan\Type\NullType;
14+
use PHPStan\Type\ObjectWithoutClassType;
15+
use PHPStan\Type\ResourceType;
916
use PHPStan\Type\StringType;
1017
use PHPStan\Type\Type;
18+
use PHPStan\Type\TypeCombinator;
1119
use PHPStan\Type\UnionType;
1220

1321
final class AllowedArrayKeysTypes
@@ -24,4 +32,55 @@ public static function getType(): Type
2432
]);
2533
}
2634

35+
public static function narrowOffsetKeyType(Type $varType, Type $keyType): ?Type
36+
{
37+
if (!$varType->isArray()->yes() || $varType->isIterableAtLeastOnce()->no()) {
38+
return null;
39+
}
40+
41+
$varIterableKeyType = $varType->getIterableKeyType();
42+
43+
if ($varIterableKeyType->isConstantScalarValue()->yes()) {
44+
$narrowedKey = TypeCombinator::union(
45+
$varIterableKeyType,
46+
TypeCombinator::remove($varIterableKeyType->toString(), new ConstantStringType('')),
47+
);
48+
49+
if (!$varType->hasOffsetValueType(new ConstantIntegerType(0))->no()) {
50+
$narrowedKey = TypeCombinator::union(
51+
$narrowedKey,
52+
new ConstantBooleanType(false),
53+
);
54+
}
55+
56+
if (!$varType->hasOffsetValueType(new ConstantIntegerType(1))->no()) {
57+
$narrowedKey = TypeCombinator::union(
58+
$narrowedKey,
59+
new ConstantBooleanType(true),
60+
);
61+
}
62+
63+
if (!$varType->hasOffsetValueType(new ConstantStringType(''))->no()) {
64+
$narrowedKey = TypeCombinator::addNull($narrowedKey);
65+
}
66+
67+
if (!$varIterableKeyType->isNumericString()->no() || !$varIterableKeyType->isInteger()->no()) {
68+
$narrowedKey = TypeCombinator::union($narrowedKey, new FloatType());
69+
}
70+
71+
return $narrowedKey;
72+
} elseif ($varIterableKeyType->isInteger()->yes() && $keyType->isString()->yes()) {
73+
return TypeCombinator::intersect($varIterableKeyType->toString(), $keyType);
74+
}
75+
76+
return new MixedType(
77+
false,
78+
new UnionType([
79+
new ArrayType(new MixedType(), new MixedType()),
80+
new ObjectWithoutClassType(),
81+
new ResourceType(),
82+
]),
83+
);
84+
}
85+
2786
}

‎tests/PHPStan/Analyser/nsrt/bug-11716.php

+27-5
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,10 @@ public function parse(string $glue): string
3535
}
3636

3737
/**
38-
* @param array<int, string> $arr
38+
* @param array<int, string> $intKeyedArr
39+
* @param array<string, string> $stringKeyedArr
3940
*/
40-
function narrowKey($mixed, string $s, int $i, array $generalArr, array $arr): void {
41+
function narrowKey($mixed, string $s, int $i, array $generalArr, array $intKeyedArr, array $stringKeyedArr): void {
4142
if (isset($generalArr[$mixed])) {
4243
assertType('mixed~(array|object|resource)', $mixed);
4344
} else {
@@ -59,21 +60,42 @@ function narrowKey($mixed, string $s, int $i, array $generalArr, array $arr): vo
5960
}
6061
assertType('string', $s);
6162

62-
if (isset($arr[$mixed])) {
63+
if (isset($intKeyedArr[$mixed])) {
6364
assertType('mixed~(array|object|resource)', $mixed);
6465
} else {
6566
assertType('mixed', $mixed);
6667
}
6768
assertType('mixed', $mixed);
6869

69-
if (isset($arr[$i])) {
70+
if (isset($intKeyedArr[$i])) {
7071
assertType('int', $i);
7172
} else {
7273
assertType('int', $i);
7374
}
7475
assertType('int', $i);
7576

76-
if (isset($arr[$s])) {
77+
if (isset($intKeyedArr[$s])) {
78+
assertType("numeric-string", $s);
79+
} else {
80+
assertType('string', $s);
81+
}
82+
assertType('string', $s);
83+
84+
if (isset($stringKeyedArr[$mixed])) {
85+
assertType('mixed~(array|object|resource)', $mixed);
86+
} else {
87+
assertType('mixed', $mixed);
88+
}
89+
assertType('mixed', $mixed);
90+
91+
if (isset($stringKeyedArr[$i])) {
92+
assertType('int', $i);
93+
} else {
94+
assertType('int', $i);
95+
}
96+
assertType('int', $i);
97+
98+
if (isset($stringKeyedArr[$s])) {
7799
assertType('string', $s);
78100
} else {
79101
assertType('string', $s);

0 commit comments

Comments
 (0)