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

bugfix: in case the old type is already more accurate than the new type, do not consider the new type as a replacement

Browse Source 
Signed-off-by: Maximilian Bösing <2189546+boesing@users.noreply.github.com>
This commit is contained in:
Maximilian Bösing 2022-06-12 03:35:59 +02:00
parent 02d4f0c614
commit ed1bb8a9a6
No known key found for this signature in database
GPG Key ID: 9A8988C93CEC81A3
1 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/Psalm/Internal/Analyzer/Statements/Expression/CallAnalyzer.php
View File

@ -1135,6 +1135,10 @@ class CallAnalyzer
*/
private static function isNewTypeNarrowingDownOldType(Union $old_type, Union $new_type): bool
{
if ($new_type->isSingle()) {
return true;
}
// non-mixed is always better than mixed
if ($old_type->isMixed() && !$new_type->hasMixed()) {
return true;
@ -1145,10 +1149,27 @@ class CallAnalyzer
return true;
}
// Literals might always replace non-literals (even tho the old type could already contain a literal)
if (($old_type->isString() && $new_type->allStringLiterals())
|| ($old_type->isInt() && $new_type->allIntLiterals())
|| ($old_type->isFloat() && $new_type->allFloatLiterals())) {
// Do not hassle around with non-single old types if they are not nullable
if (!$old_type->isSingle()) {
return false;
}
$old_atomic_type = $old_type->getSingleAtomic();
foreach ($new_type->getAtomicTypes() as $new_atomic_type) {
if ($new_atomic_type->equals($old_atomic_type, false)) {
// Old type is one of the new types and thus, the old type must not be modified
return false;
}
}
// Literals should always replace non-literals
if (!$old_type->containsAnyLiteral() &&
(
($old_type->isString() && $new_type->allStringLiterals())
|| ($old_type->isInt() && $new_type->allIntLiterals())
|| ($old_type->isFloat() && $new_type->allFloatLiterals())
)
) {
return true;
}