Restructure conditionals, fix min/max limit calculation

Author: herndlm

src/Analyser/TypeSpecifier.php

@@ -1103,9 +1103,14 @@ private function specifyTypesForCountFuncCall(
 				$sizeType instanceof IntegerRangeType
 				&& $sizeType->getMin() !== null
 				&& $sizeType->getMin() <= ConstantArrayTypeBuilder::ARRAY_COUNT_LIMIT
-				&& ($sizeType->getMax() === null || $sizeType->getMax() - $sizeType->getMin() <= ConstantArrayTypeBuilder::ARRAY_COUNT_LIMIT)
 				&& $arrayType->getKeyType()->isSuperTypeOf(IntegerRangeType::fromInterval(0, $sizeType->getMin() - 1))->yes()
-				&& ($sizeType->getMax() === null || $arrayType->getKeyType()->isSuperTypeOf(IntegerRangeType::fromInterval(0, $sizeType->getMax() - 1))->yes())
+				&& (
+					$sizeType->getMax() === null
+					|| (
+						$sizeType->getMax() <= ConstantArrayTypeBuilder::ARRAY_COUNT_LIMIT
+						&& $arrayType->getKeyType()->isSuperTypeOf(IntegerRangeType::fromInterval(0, $sizeType->getMax() - 1))->yes()
+					)
+				)
 			) {
 				// turn optional offsets non-optional
 				$valueTypesBuilder = ConstantArrayTypeBuilder::createEmpty();