Support arrays in fast-path

staabm · staabm · commit 90e81f0cc9ba · 2025-04-14T09:29:33.000+02:00
diff --git a/src/Analyser/MutatingScope.php b/src/Analyser/MutatingScope.php
@@ -4428,7 +4428,7 @@ public function addTypeToExpression(Expr $expr, Type $type): self
 
 		if ($originalExprType->equals($nativeType)) {
 			$newType = TypeCombinator::intersect($type, $originalExprType);
-			if ($newType->isConstantScalarValue()->yes() && $newType->equals($originalExprType)) {
+			if ($newType->isObject()->no() && $newType->equals($originalExprType)) {
 				// don't add the same type over and over again to improve performance
 				return $this;
 			}
diff --git a/tests/PHPStan/Analyser/nsrt/conditional-vars.php b/tests/PHPStan/Analyser/nsrt/conditional-vars.php
@@ -10,10 +10,10 @@ class HelloWorld
 	public function conditionalVarInTernary(array $innerHits): void
 	{
 		if (array_key_exists('nearest_premise', $innerHits) || array_key_exists('matching_premises', $innerHits)) {
-			assertType('array', $innerHits);
+			assertType('array<mixed>', $innerHits);
 			$x = array_key_exists('nearest_premise', $innerHits)
 				? assertType("non-empty-array&hasOffset('nearest_premise')", $innerHits)
-				: assertType('array', $innerHits);
+				: assertType('array<mixed>', $innerHits);
 
 			assertType('array', $innerHits);
 		}
@@ -23,11 +23,11 @@ public function conditionalVarInTernary(array $innerHits): void
 	public function conditionalVarInIf(array $innerHits): void
 	{
 		if (array_key_exists('nearest_premise', $innerHits) || array_key_exists('matching_premises', $innerHits)) {
-			assertType('array', $innerHits);
+			assertType('array<mixed>', $innerHits);
 			if (array_key_exists('nearest_premise', $innerHits)) {
 				assertType("non-empty-array&hasOffset('nearest_premise')", $innerHits);
 			} else {
-				assertType('array', $innerHits);
+				assertType('array<mixed>', $innerHits);
 			}
 
 			assertType('array', $innerHits);

Original file line number	Diff line number	Diff line change
`@@ -4428,7 +4428,7 @@ public function addTypeToExpression(Expr $expr, Type $type): self`
`4428`	`4428`
`4429`	`4429`	`if ($originalExprType->equals($nativeType)) {`
`4430`	`4430`	`$newType = TypeCombinator::intersect($type, $originalExprType);`
`4431`		`- if ($newType->isConstantScalarValue()->yes() && $newType->equals($originalExprType)) {`
	`4431`	`+ if ($newType->isObject()->no() && $newType->equals($originalExprType)) {`
`4432`	`4432`	`// don't add the same type over and over again to improve performance`
`4433`	`4433`	`return $this;`
`4434`	`4434`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,10 +10,10 @@ class HelloWorld`
`10`	`10`	`public function conditionalVarInTernary(array $innerHits): void`
`11`	`11`	`{`
`12`	`12`	`if (array_key_exists('nearest_premise', $innerHits) \|\| array_key_exists('matching_premises', $innerHits)) {`
`13`		`- assertType('array', $innerHits);`
	`13`	`+ assertType('array<mixed>', $innerHits);`
`14`	`14`	`$x = array_key_exists('nearest_premise', $innerHits)`
`15`	`15`	`? assertType("non-empty-array&hasOffset('nearest_premise')", $innerHits)`
`16`		`- : assertType('array', $innerHits);`
	`16`	`+ : assertType('array<mixed>', $innerHits);`
`17`	`17`
`18`	`18`	`assertType('array', $innerHits);`
`19`	`19`	`}`
`@@ -23,11 +23,11 @@ public function conditionalVarInTernary(array $innerHits): void`
`23`	`23`	`public function conditionalVarInIf(array $innerHits): void`
`24`	`24`	`{`
`25`	`25`	`if (array_key_exists('nearest_premise', $innerHits) \|\| array_key_exists('matching_premises', $innerHits)) {`
`26`		`- assertType('array', $innerHits);`
	`26`	`+ assertType('array<mixed>', $innerHits);`
`27`	`27`	`if (array_key_exists('nearest_premise', $innerHits)) {`
`28`	`28`	`assertType("non-empty-array&hasOffset('nearest_premise')", $innerHits);`
`29`	`29`	`} else {`
`30`		`- assertType('array', $innerHits);`
	`30`	`+ assertType('array<mixed>', $innerHits);`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`assertType('array', $innerHits);`