Extract OPTIONAL_KEYS_POWER_SET_LIMIT and FLATTEN_CONSTANT_ARRAYS_LIMIT

Author: ondrejmirtes

src/Type/Constant/ConstantArrayType.php

@@ -118,6 +118,7 @@ class ConstantArrayType implements Type
 	private const DESCRIBE_LIMIT = 8;
 	private const CHUNK_FINITE_TYPES_LIMIT = 5;
 	private const UNSEALED_ARRAY_SHAPES_LINK = 'https://phpstan.org/blog/phpstan-2-2-unsealed-array-shapes-safer-array-keys';
+	private const OPTIONAL_KEYS_POWER_SET_LIMIT = 10;
 
 	private TrinaryLogic $isList;
 
@@ -389,7 +390,7 @@ public function getAllArrays(): array
 			return $this->allArrays;
 		}
 
-		if (count($this->optionalKeys) <= 10) {
+		if (count($this->optionalKeys) <= self::OPTIONAL_KEYS_POWER_SET_LIMIT) {
 			$optionalKeysCombinations = $this->powerSet($this->optionalKeys);
 		} else {
 			$optionalKeysCombinations = [

src/Type/TypeUtils.php

@@ -23,6 +23,8 @@
 final class TypeUtils
 {
 
+	private const FLATTEN_CONSTANT_ARRAYS_LIMIT = 16384;
+
 	/**
 	 * @return list<ConstantIntegerType>
 	 */
@@ -159,7 +161,7 @@ public static function flattenTypes(Type $type): array
 			foreach ($constantArrays as $constantArray) {
 				$optionalCount = count($constantArray->getOptionalKeys());
 				$arrayCount = $optionalCount <= 20 ? (1 << $optionalCount) : PHP_INT_MAX;
-				if ($arrayCount > 16384 || $estimatedCount > 16384 / max($arrayCount, 1)) {
+				if ($arrayCount > self::FLATTEN_CONSTANT_ARRAYS_LIMIT || $estimatedCount > self::FLATTEN_CONSTANT_ARRAYS_LIMIT / max($arrayCount, 1)) {
 					$bail = true;
 					break;
 				}

turbo-ext/src/ConstantArrayType.cpp

@@ -39,14 +39,14 @@ zend_class_entry *pt_ce_constant_array_type = nullptr;
 /* AcceptsResult.cpp: new <result class>($trinary, $reasons, $lazyReasons) */
 bool pt_result_object_create(zval *out, zend_class_entry *ce, zval *trinary, zval *reasons, zval *lazyReasons);
 
-/* the twin's private constants */
+/* the twin's private constants; getAllArrays() enumerates the power set of
+ * up to OPTIONAL_KEYS_POWER_SET_LIMIT optional keys */
 #define PT_CAT_DESCRIBE_LIMIT 8
 #define PT_CAT_CHUNK_FINITE_TYPES_LIMIT 5
 #define PT_CAT_UNSEALED_ARRAY_SHAPES_LINK "https://phpstan.org/blog/phpstan-2-2-unsealed-array-shapes-safer-array-keys"
-/* the twin's inline thresholds: getAllArrays() enumerates the power set of
- * up to this many optional keys, generalize() keeps per-offset accessories
- * below this many required keys */
 #define PT_CAT_POWER_SET_OPTIONAL_KEYS_LIMIT 10
+/* the twin's inline threshold: generalize() keeps per-offset accessories
+ * below this many required keys */
 #define PT_CAT_GENERALIZE_OFFSET_ACCESSORIES_LIMIT 32
 
 /* PHP's CASE_LOWER / CASE_UPPER */
@@ -7308,6 +7308,7 @@ PT_MINIT_REGISTRATION(pt_register_constant_array_type)
 	cls.privateClassConstantLong("DESCRIBE_LIMIT", PT_CAT_DESCRIBE_LIMIT);
 	cls.privateClassConstantLong("CHUNK_FINITE_TYPES_LIMIT", PT_CAT_CHUNK_FINITE_TYPES_LIMIT);
 	cls.privateClassConstantString("UNSEALED_ARRAY_SHAPES_LINK", PT_CAT_UNSEALED_ARRAY_SHAPES_LINK);
+	cls.privateClassConstantLong("OPTIONAL_KEYS_POWER_SET_LIMIT", PT_CAT_POWER_SET_OPTIONAL_KEYS_LIMIT);
 
 	cls.method(sigs::__construct, [](INTERNAL_FUNCTION_PARAMETERS) {
 		zval *keyTypes, *valueTypes, *nextAutoIndexes = NULL, *optionalKeys = NULL, *isList = NULL, *unsealed = NULL;

turbo-ext/src/TypeUtils.cpp

@@ -23,6 +23,9 @@ namespace sigs = ptdecl::TypeUtils::sig;
 
 zend_class_entry *pt_ce_type_utils = nullptr;
 
+/* the twin's private constant */
+#define PT_TU_FLATTEN_CONSTANT_ARRAYS_LIMIT 16384
+
 namespace phpstanturbo {
 
 struct ConstantArrayCombinationContext
@@ -215,7 +218,7 @@ class TypeUtils
 			 * expanding: each ConstantArrayType with N optional keys produces
 			 * 2^N variants from getAllArrays(), multiplied across the
 			 * constant arrays; bail out above the limit rather than allocate
-			 * O(2^N). The twin's `16384 / max($arrayCount, 1)` is a float
+			 * O(2^N). The twin's `FLATTEN_CONSTANT_ARRAYS_LIMIT / max($arrayCount, 1)` is a float
 			 * division — compared as one here. */
 			zend_long estimatedCount = 1;
 			bool bail = false;
@@ -233,7 +236,7 @@ class TypeUtils
 				}
 				zend_long optionalCount = (zend_long) zv::ArrRef(optionalKeys.raw()).size();
 				zend_long arrayCount = optionalCount <= 20 ? ((zend_long) 1 << optionalCount) : ZEND_LONG_MAX;
-				if (arrayCount > 16384 || (double) estimatedCount > 16384.0 / (double) (arrayCount > 1 ? arrayCount : 1)) {
+				if (arrayCount > PT_TU_FLATTEN_CONSTANT_ARRAYS_LIMIT || (double) estimatedCount > (double) PT_TU_FLATTEN_CONSTANT_ARRAYS_LIMIT / (double) (arrayCount > 1 ? arrayCount : 1)) {
 					bail = true;
 					break;
 				}
@@ -481,6 +484,7 @@ PT_MINIT_REGISTRATION(pt_register_type_utils)
 {
 	reg::Class cls("PHPStan\\Type\\TypeUtils");
 	ptdecl::TypeUtils::declareClass(cls);
+	cls.privateClassConstantLong("FLATTEN_CONSTANT_ARRAYS_LIMIT", PT_TU_FLATTEN_CONSTANT_ARRAYS_LIMIT);
 	ptdecl::TypeUtils::declareProperties(cls);
 
 	static const reg::Arg nullableThisType = reg::obj("", "PHPStan\\Type\\ThisType", true);