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

Merge pull request #6952 from orklah/null_propagation_in_return

Browse Source 
fix null propagation in return
This commit is contained in:
orklah 2021-11-21 21:53:50 +01:00 committed by GitHub
commit 46139272f6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/Psalm/Internal/PhpVisitor/Reflector/FunctionLikeDocblockScanner.php
View File

@ -948,18 +948,23 @@ class FunctionLikeDocblockScanner
}
}
// if the signature type contains null, we add null into the final return type too
if ($storage->signature_return_type->isNullable()
&& !$storage->return_type->isNullable()
&& !$storage->return_type->hasTemplate()
&& !$storage->return_type->hasConditional()
//don't add null to docblock type if it's not contained in signature type
&& UnionTypeComparator::isContainedBy(
$codebase,
$storage->return_type,
$storage->signature_return_type
)
) {
$storage->return_type->addType(new Type\Atomic\TNull());
//don't add null to final type if signature type don't match the docblock type
// however, we can't check for object types at this point (#6931), so we'll assume it's ok
if ($storage->return_type->hasObjectType() ||
UnionTypeComparator::isContainedBy(
$codebase,
$storage->return_type,
$storage->signature_return_type
)
) {
$storage->return_type->addType(new Type\Atomic\TNull());
}
}
}