danog/psalm
1
0
Fork 0
mirror of https://github.com/danog/psalm.git synced 2025-01-06 04:59:14 +01:00
Code Issues Projects Releases Wiki Activity

Fix #4549 Better intersection between parent types (#4560)

Browse Source
This commit is contained in:
Thomas Mauro Vargiu 2020-11-16 02:29:49 +01:00 committed by GitHub
parent 5df2b771aa
commit 4e8fb9c37f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/Psalm/Internal/Codebase/Methods.php
View File

@ -779,11 +779,19 @@ class Methods
if ((!$old_contained_by_new && !$new_contained_by_old) if ((!$old_contained_by_new && !$new_contained_by_old)
|| ($old_contained_by_new && $new_contained_by_old) || ($old_contained_by_new && $new_contained_by_old)
) { ) {
$attempted_intersection = Type::intersectUnionTypes( if ($old_contained_by_new && $new_contained_by_old) {
$overridden_storage->return_type, $attempted_intersection = Type::intersectUnionTypes(
$candidate_type, $candidate_type,
$source_analyzer->getCodebase() $overridden_storage->return_type,
); $source_analyzer->getCodebase()
);
} else {
$attempted_intersection = Type::intersectUnionTypes(
$overridden_storage->return_type,
$candidate_type,
$source_analyzer->getCodebase()
);
}
if ($attempted_intersection) { if ($attempted_intersection) {
$self_class = $overridden_method_id->fq_class_name; $self_class = $overridden_method_id->fq_class_name;