Skip to content

TypeCombinator: Reduce number of intersect() calls #4668

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 1 commit into from
Dec 25, 2025
+10 −6
Merged

TypeCombinator: Reduce number of intersect() calls #4668

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 10 additions & 6 deletions src/Type/TypeCombinator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -940,12 +940,14 @@ private static function optimizeConstantArrays(array $types): array
$keyType = TypeCombinator::union(...array_values($keyTypes));
$valueType = TypeCombinator::union(...array_values($valueTypes));

$arrayType = new ArrayType($keyType, $valueType);
$accessories = [];
if ($isList) {
$arrayType = TypeCombinator::intersect($arrayType, new AccessoryArrayListType());
$accessories[] = new AccessoryArrayListType();
}
$accessories[] = new NonEmptyArrayType();
$accessories[] = new OversizedArrayType();

return TypeCombinator::intersect($arrayType, new NonEmptyArrayType(), new OversizedArrayType());
return TypeCombinator::intersect(new ArrayType($keyType, $valueType), ...$accessories);
});

if (!$isOversized) {
Expand Down Expand Up @@ -975,12 +977,14 @@ private static function optimizeConstantArrays(array $types): array
$valueType = $valueType->generalize(GeneralizePrecision::lessSpecific());
}

$arrayType = new ArrayType($keyType, $valueType);
$accessories = [];
if ($eachIsList) {
$arrayType = self::intersect($arrayType, new AccessoryArrayListType());
$accessories[] = new AccessoryArrayListType();
}
$accessories[] = new NonEmptyArrayType();
$accessories[] = new OversizedArrayType();

return [self::intersect($arrayType, new NonEmptyArrayType(), new OversizedArrayType())];
return [self::intersect(new ArrayType($keyType, $valueType), ...$accessories)];
}

return $results;
Expand Down
Loading