Skip to content

TypeCombinator: remove unnecessary iteration over types #6194

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
staabm merged 1 commit into from
Aug 8, 2026
+7 −12
Merged

TypeCombinator: remove unnecessary iteration over types #6194

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
19 changes: 7 additions & 12 deletions src/Type/TypeCombinator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1624,10 +1624,17 @@ public static function doIntersect(Type ...$types): Type
return $types[0];
}

// The comparator only orders UnionTypes relative to each other, so sorting is
// a no-op unless there are at least two of them. Skip it in the common case.
$unionTypesCount = 0;
foreach ($types as $type) {
if ($type instanceof NeverType && !$type->isExplicit()) {
return $type;
}
if (!$type instanceof UnionType) {
continue;
}
$unionTypesCount++;
}

// Fast path: the intersection of two plain unions whose members are all finite,
Expand Down Expand Up @@ -1667,18 +1674,6 @@ public static function doIntersect(Type ...$types): Type

return 0;
};
// The comparator only orders UnionTypes relative to each other, so sorting is
// a no-op unless there are at least two of them. Skip it in the common case.
$unionTypesCount = 0;
foreach ($types as $type) {
if (!$type instanceof UnionType) {
continue;
}
$unionTypesCount++;
if ($unionTypesCount >= 2) {
break;
}
}
Comment on lines -1673 to -1681

@staabm staabm Aug 8, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merges this loop into the above one so we don't need to run thru all types another time

if ($unionTypesCount >= 2) {
usort($types, $sortTypes);
}
Expand Down
Loading