Support arrays in fast-path

Author: staabm

src/Analyser/MutatingScope.php

@@ -4489,7 +4489,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;
 			}

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('non-empty-array', $innerHits);
+			assertType('non-empty-array<mixed>', $innerHits);
 			$x = array_key_exists('nearest_premise', $innerHits)
 				? assertType("non-empty-array&hasOffset('nearest_premise')", $innerHits)
-				: assertType('non-empty-array', $innerHits);
+				: assertType('non-empty-array<mixed>', $innerHits);
 
 			assertType('non-empty-array', $innerHits);
 		}
@@ -24,11 +24,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('non-empty-array', $innerHits);
+			assertType('non-empty-array<mixed>', $innerHits);
 			if (array_key_exists('nearest_premise', $innerHits)) {
 				assertType("non-empty-array&hasOffset('nearest_premise')", $innerHits);
 			} else {
-				assertType('non-empty-array', $innerHits);
+				assertType('non-empty-array<mixed>', $innerHits);
 			}
 
 			assertType('non-empty-array', $innerHits);