more tests

Author: staabm

src/Analyser/TypeSpecifier.php

@@ -1007,14 +1007,27 @@ private function specifyTypesForConstantBinaryExpression(
 			) {
 				$result = [];
 				foreach ($argType->getTypes() as $innerType) {
-					if (!$innerType->getArraySize()->isSuperTypeOf($constantType)->yes()) {
+					if (!$innerType->isConstantArray()->yes()) {
+						$result = null;
+						break;
+					}
+
+					$arraySize = $innerType->getArraySize();
+					if (!$arraySize instanceof ConstantIntegerType) {
+						$result = null;
+						break;
+					}
+
+					if (!$constantType->isSuperTypeOf($arraySize)->yes()) {
 						continue;
 					}
 
 					$result[] = $innerType;
 				}
 
-				return $this->create($exprNode->getArgs()[0]->value, TypeCombinator::union(...$result), $context, false, $scope, $rootExpr);
+				if ($result !== null) {
+					return $this->create($exprNode->getArgs()[0]->value, TypeCombinator::union(...$result), $context, false, $scope, $rootExpr);
+				}
 			}
 
 			if ($context->truthy() || $constantType->getValue() === 0) {

tests/PHPStan/Analyser/nsrt/narrow-tagged-union.php

@@ -78,5 +78,42 @@ public function nestedArrays(array $arr): void
 		}
 		assertType("array{array<int>, numeric-string}|array{string, '', non-empty-string}", $arr);
 	}
+
+	/** @param array{string, '', non-empty-string}|array{array<int>, numeric-string} $arr */
+	public function nonArray(array $arr): void
+	{
+		// don't narrow when $arr contains recursive arrays
+		if (count($arr, COUNT_RECURSIVE) === 3) {
+			assertType("array{array<int>, numeric-string}|array{string, '', non-empty-string}", $arr);
+		} else {
+			assertType("array{array<int>, numeric-string}|array{string, '', non-empty-string}", $arr);
+		}
+		assertType("array{array<int>, numeric-string}|array{string, '', non-empty-string}", $arr);
+
+		if (count($arr, COUNT_NORMAL) === 3) {
+			assertType("array{string, '', non-empty-string}", $arr);
+		} else {
+			assertType("array{array<int>, numeric-string}", $arr);
+		}
+		assertType("array{array<int>, numeric-string}|array{string, '', non-empty-string}", $arr);
+	}
+
+	public function arrayIntRangeSize(): void
+	{
+		$x = [];
+		if (rand(0,1)) {
+			$x[] = 'ab';
+		}
+		if (rand(0,1)) {
+			$x[] = 'xy';
+		}
+
+		if (count($x) === 1) {
+			assertType("array{'xy'}|array{0: 'ab', 1?: 'xy'}", $x);
+		} else {
+			assertType("array{}|array{'xy'}|array{0: 'ab', 1?: 'xy'}", $x);
+		}
+		assertType("array{}|array{'xy'}|array{0: 'ab', 1?: 'xy'}", $x);
+	}
 }