Skip to content

Commit 90e81f0

Browse files
committed
Support arrays in fast-path
1 parent 106ede1 commit 90e81f0

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

Diff for: src/Analyser/MutatingScope.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -4428,7 +4428,7 @@ public function addTypeToExpression(Expr $expr, Type $type): self
44284428

44294429
if ($originalExprType->equals($nativeType)) {
44304430
$newType = TypeCombinator::intersect($type, $originalExprType);
4431-
if ($newType->isConstantScalarValue()->yes() && $newType->equals($originalExprType)) {
4431+
if ($newType->isObject()->no() && $newType->equals($originalExprType)) {
44324432
// don't add the same type over and over again to improve performance
44334433
return $this;
44344434
}

Diff for: tests/PHPStan/Analyser/nsrt/conditional-vars.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ class HelloWorld
1010
public function conditionalVarInTernary(array $innerHits): void
1111
{
1212
if (array_key_exists('nearest_premise', $innerHits) || array_key_exists('matching_premises', $innerHits)) {
13-
assertType('array', $innerHits);
13+
assertType('array<mixed>', $innerHits);
1414
$x = array_key_exists('nearest_premise', $innerHits)
1515
? assertType("non-empty-array&hasOffset('nearest_premise')", $innerHits)
16-
: assertType('array', $innerHits);
16+
: assertType('array<mixed>', $innerHits);
1717

1818
assertType('array', $innerHits);
1919
}
@@ -23,11 +23,11 @@ public function conditionalVarInTernary(array $innerHits): void
2323
public function conditionalVarInIf(array $innerHits): void
2424
{
2525
if (array_key_exists('nearest_premise', $innerHits) || array_key_exists('matching_premises', $innerHits)) {
26-
assertType('array', $innerHits);
26+
assertType('array<mixed>', $innerHits);
2727
if (array_key_exists('nearest_premise', $innerHits)) {
2828
assertType("non-empty-array&hasOffset('nearest_premise')", $innerHits);
2929
} else {
30-
assertType('array', $innerHits);
30+
assertType('array<mixed>', $innerHits);
3131
}
3232

3333
assertType('array', $innerHits);

0 commit comments

Comments
 (0)