Simplify

Author: ondrejmirtes

src/Analyser/TypeSpecifier.php

@@ -987,47 +987,35 @@ private function specifyTypesForConstantBinaryExpression(
 			$argType = $scope->getType($exprNode->getArgs()[0]->value);
 
 			if (count($exprNode->getArgs()) === 1) {
-				$isNormalCount = true;
+				$isNormalCount = TrinaryLogic::createYes();
 			} else {
 				$mode = $scope->getType($exprNode->getArgs()[1]->value);
-				if (!$mode->isInteger()->yes()) {
-					return new SpecifiedTypes();
-				}
-
-				$isNormalCount = (new ConstantIntegerType(COUNT_NORMAL))->isSuperTypeOf($mode)->yes();
-				if (!$isNormalCount) {
-					$isNormalCount = $argType->getIterableValueType()->isArray()->no();
-				}
+				$isNormalCount = (new ConstantIntegerType(COUNT_NORMAL))->isSuperTypeOf($mode)->or($argType->getIterableValueType()->isArray()->negate());
 			}
 
 			if (
-				$isNormalCount
+				$isNormalCount->yes()
 				&& $argType instanceof UnionType
-				&& $argType->isList()->yes()
 			) {
 				$result = [];
 				foreach ($argType->getTypes() as $innerType) {
-					if (!$innerType->isConstantArray()->yes()) {
-						$result = null;
-						break;
-					}
-
 					$arraySize = $innerType->getArraySize();
-					if (!$arraySize instanceof ConstantIntegerType) {
-						$result = null;
-						break;
+					$isSize = $constantType->isSuperTypeOf($arraySize);
+					if ($context->truthy()) {
+						if ($isSize->no()) {
+							continue;
+						}
 					}
-
-					if (!$constantType->isSuperTypeOf($arraySize)->yes()) {
-						continue;
+					if ($context->falsey()) {
+						if (!$isSize->yes()) {
+							continue;
+						}
 					}
 
 					$result[] = $innerType;
 				}
 
-				if ($result !== null) {
-					return $this->create($exprNode->getArgs()[0]->value, TypeCombinator::union(...$result), $context, false, $scope, $rootExpr);
-				}
+				return $this->create($exprNode->getArgs()[0]->value, TypeCombinator::union(...$result), $context, false, $scope, $rootExpr);
 			}
 
 			if ($context->truthy() || $constantType->getValue() === 0) {
@@ -1038,7 +1026,7 @@ private function specifyTypesForConstantBinaryExpression(
 
 				if ($argType->isArray()->yes()) {
 					$funcTypes = $this->create($exprNode, $constantType, $context, false, $scope, $rootExpr);
-					if ($isNormalCount && $argType->isList()->yes() && $context->truthy() && $constantType->getValue() < ConstantArrayTypeBuilder::ARRAY_COUNT_LIMIT) {
+					if ($isNormalCount->yes() && $argType->isList()->yes() && $context->truthy() && $constantType->getValue() < ConstantArrayTypeBuilder::ARRAY_COUNT_LIMIT) {
 						$valueTypesBuilder = ConstantArrayTypeBuilder::createEmpty();
 						$itemType = $argType->getIterableValueType();
 						for ($i = 0; $i < $constantType->getValue(); $i++) {

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

@@ -103,7 +103,7 @@ public function arrayIntRangeSize(): void
 		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{0: 'ab', 1?: 'xy'}", $x);
 		}
 		assertType("array{}|array{'xy'}|array{0: 'ab', 1?: 'xy'}", $x);
 	}