Skip to content

TypeCombinator: Prevent unnecessary work #4667

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ondrejmirtes merged 5 commits into from
Dec 25, 2025
+11 −17
Merged

TypeCombinator: Prevent unnecessary work #4667

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
57017d5
TypeCombinator: Prevent unnecessary work
staabm Dec 25, 2025
41fc5a5
remove unncessary array_map()
staabm Dec 25, 2025
13ea855
use foreach over slower array_map()
staabm Dec 25, 2025
04ba277
move method call out of loop
staabm Dec 25, 2025
d604302
Update TypeCombinator.php
staabm Dec 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 11 additions & 17 deletions src/Type/TypeCombinator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
use PHPStan\Type\Generic\TemplateUnionType;
use function array_key_exists;
use function array_key_first;
use function array_map;
use function array_merge;
use function array_slice;
use function array_splice;
Expand Down Expand Up @@ -789,13 +788,9 @@ private static function processArrayTypes(array $arrayTypes): array

/** @var int|float $nextConstantKeyTypeIndex */
$nextConstantKeyTypeIndex = 1;
$constantArraysMap = array_map(
static fn (Type $t) => $t->getConstantArrays(),
$arrayTypes,
);

foreach ($arrayTypes as $arrayIdx => $arrayType) {
$constantArrays = $constantArraysMap[$arrayIdx];
foreach ($arrayTypes as $arrayType) {
$constantArrays = $arrayType->getConstantArrays();
$isConstantArray = $constantArrays !== [];
if (!$isConstantArray || !$arrayType->isIterableAtLeastOnce()->no()) {
$filledArrays++;
Expand All @@ -810,11 +805,11 @@ private static function processArrayTypes(array $arrayTypes): array
continue;
}

$constantArrays = $arrayType->getConstantArrays();
foreach ($constantArrays as $constantArray) {
$valueTypes = $constantArray->getValueTypes();
foreach ($constantArray->getKeyTypes() as $i => $keyType) {
$keyTypesForGeneralArray[] = $keyType;
$valueTypesForGeneralArray[] = $constantArray->getValueTypes()[$i];
$valueTypesForGeneralArray[] = $valueTypes[$i];

$keyTypeValue = $keyType->getValue();
if (array_key_exists($keyTypeValue, $constantKeyTypesNumbered)) {
Expand Down Expand Up @@ -870,12 +865,11 @@ private static function processArrayTypes(array $arrayTypes): array
];
}

$reducedArrayTypes = self::reduceArrays($arrayTypes, true);

return array_map(
static fn (Type $arrayType) => self::intersect($arrayType, ...$accessoryTypes),
self::optimizeConstantArrays($reducedArrayTypes),
);
$reducedArrayTypes = self::optimizeConstantArrays(self::reduceArrays($arrayTypes, true));
foreach ($reducedArrayTypes as $idx => $reducedArray) {
$reducedArrayTypes[$idx] = self::intersect($reducedArray, ...$accessoryTypes);
}
return $reducedArrayTypes;
}

/**
Expand Down Expand Up @@ -909,6 +903,7 @@ private static function optimizeConstantArrays(array $types): array
$valueTypes = [];
$keyTypes = [];
$nextAutoIndex = 0;
$innerValueTypes = $type->getValueTypes();
foreach ($type->getKeyTypes() as $i => $innerKeyType) {
if (!$innerKeyType instanceof ConstantIntegerType) {
$isList = false;
Expand All @@ -922,8 +917,7 @@ private static function optimizeConstantArrays(array $types): array
$generalizedKeyType = $innerKeyType->generalize(GeneralizePrecision::moreSpecific());
$keyTypes[$generalizedKeyType->describe(VerbosityLevel::precise())] = $generalizedKeyType;

$innerValueType = $type->getValueTypes()[$i];
$generalizedValueType = TypeTraverser::map($innerValueType, static function (Type $type) use ($traverse): Type {
$generalizedValueType = TypeTraverser::map($innerValueTypes[$i], static function (Type $type) use ($traverse): Type {
if ($type instanceof ArrayType || $type instanceof ConstantArrayType) {
return TypeCombinator::intersect($type, new OversizedArrayType());
}
Expand Down
Loading