Skip to content
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

Jump to bottom

Keep NeverType isExplicit-flag in TypeCombinator::intersect() #2112

Merged
merged 1 commit into from Dec 15, 2022
Merged

Keep NeverType isExplicit-flag in TypeCombinator::intersect() #2112

Show file tree
Hide file tree
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/Type/TypeCombinator.php
View file
Open in desktop
Expand Up @@ -946,7 +946,7 @@ public static function intersect(Type ...$types): Type
$valueType = $types[$j]->getValueType();
$newValueType = self::intersect($types[$i]->getOffsetValueType($offsetType), $valueType);
if ($newValueType instanceof NeverType) {
return new NeverType();
Copy link
Contributor Author

@staabm staabm Dec 14, 2022 •
edited

Choose a reason for hiding this comment

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

these lines dropped the explicitness flag before this PR

return $newValueType;
}
$types[$i] = $types[$i]->setOffsetValueType($offsetType, $newValueType);
array_splice($types, $j--, 1);
Expand All @@ -959,7 +959,7 @@ public static function intersect(Type ...$types): Type
$valueType = $types[$i]->getValueType();
$newValueType = self::intersect($types[$j]->getOffsetValueType($offsetType), $valueType);
if ($newValueType instanceof NeverType) {
return new NeverType();
return $newValueType;
}

$types[$j] = $types[$j]->setOffsetValueType($offsetType, $newValueType);
Expand Down Expand Up @@ -1044,7 +1044,7 @@ public static function intersect(Type ...$types): Type
) {
$keyType = self::intersect($types[$i]->getIterableKeyType(), $types[$j]->getIterableKeyType());
if ($keyType instanceof NeverType) {
return new NeverType();
return $keyType;
}
$types[$i] = new ArrayType($keyType, $types[$i]->getItemType());
continue;
Expand Down