danog/psalm
1
0
Fork 0
mirror of https://github.com/danog/psalm.git synced 2024-11-27 12:55:26 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #7286 from orklah/classconstinparamout

Browse Source 
resolve ClassConstant for both sides in isContainedBy
This commit is contained in:
orklah 2022-01-03 23:37:51 +01:00 committed by GitHub
commit 72270078be
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/Psalm/Internal/Type/Comparator/UnionTypeComparator.php
View File

@ -84,27 +84,6 @@ class UnionTypeComparator
continue;
}
if ($input_type_part instanceof TClassConstant) {
$expanded = TypeExpander::expandAtomic(
$codebase,
$input_type_part,
$input_type_part->fq_classlike_name,
$input_type_part->fq_classlike_name,
null,
true,
true
);
if ($expanded instanceof Atomic) {
if (!$expanded instanceof TClassConstant) {
$input_atomic_types[] = $expanded;
continue;
}
} else {
$input_atomic_types = array_merge($expanded, $input_atomic_types);
continue;
}
}
$type_match_found = false;
$scalar_type_match_found = false;
@ -485,21 +464,30 @@ class UnionTypeComparator
): array {
$atomic_types = [];
foreach ($union_type->getAtomicTypes() as $atomic_type) {
if (!$atomic_type instanceof TTypeAlias) {
if (!$atomic_type instanceof TTypeAlias && !$atomic_type instanceof TClassConstant) {
$atomic_types[] = $atomic_type;
continue;
}
if ($atomic_type instanceof TTypeAlias) {
$fq_classlike_name = $atomic_type->declaring_fq_classlike_name;
} else {
$fq_classlike_name = $atomic_type->fq_classlike_name;
}
$expanded = TypeExpander::expandAtomic(
$codebase,
$atomic_type,
$atomic_type->declaring_fq_classlike_name,
$atomic_type->declaring_fq_classlike_name,
$fq_classlike_name,
$fq_classlike_name,
null,
true,
true
);
if ($expanded instanceof Atomic) {
$atomic_types[] = $expanded;
if (!$expanded instanceof TTypeAlias && !$expanded instanceof TClassConstant) {
$atomic_types[] = $expanded;
}
continue;
}