danog/psalm
1
0
Fork 0
mirror of https://github.com/danog/psalm.git synced 2025-01-22 05:41:20 +01:00
Code Issues Projects Releases Wiki Activity

Allow <false|T as object> to be falsy (#4711)

Browse Source
This commit is contained in:
orklah 2020-11-26 22:47:44 +01:00 committed by Daniil Gentili
parent 45c51eb121
commit 3636a9e361
Signed by: danog
GPG Key ID: 8C1BE3B34B230CA7
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/Psalm/Internal/Type/SimpleNegatedAssertionReconciler.php
View File

@ -165,7 +165,8 @@ class SimpleNegatedAssertionReconciler extends Reconciler
$suppressed_issues, $suppressed_issues,
$failed_reconciliation, $failed_reconciliation,
$is_equality, $is_equality,
$is_strict_equality $is_strict_equality,
false
); );
} }
@ -540,7 +541,8 @@ class SimpleNegatedAssertionReconciler extends Reconciler
array $suppressed_issues, array $suppressed_issues,
int &$failed_reconciliation, int &$failed_reconciliation,
bool $is_equality, bool $is_equality,
bool $is_strict_equality bool $is_strict_equality,
bool $recursive_check
) : Type\Union { ) : Type\Union {
$old_var_type_string = $existing_var_type->getId(); $old_var_type_string = $existing_var_type->getId();
$existing_var_atomic_types = $existing_var_type->getAtomicTypes(); $existing_var_atomic_types = $existing_var_type->getAtomicTypes();
@ -757,7 +759,8 @@ class SimpleNegatedAssertionReconciler extends Reconciler
$suppressed_issues, $suppressed_issues,
$template_did_fail, $template_did_fail,
$is_equality, $is_equality,
$is_strict_equality $is_strict_equality,
true
); );
$did_remove_type = true; $did_remove_type = true;
@ -777,7 +780,10 @@ class SimpleNegatedAssertionReconciler extends Reconciler
$existing_var_type->possibly_undefined = false; $existing_var_type->possibly_undefined = false;
$existing_var_type->possibly_undefined_from_try = false; $existing_var_type->possibly_undefined_from_try = false;
if ((!$did_remove_type || empty($existing_var_type->getAtomicTypes())) && !$existing_var_type->hasTemplate()) { if ((!$did_remove_type || empty($existing_var_type->getAtomicTypes())) &&
!$existing_var_type->hasTemplate() &&
!$recursive_check //don't emit issue if we're checking a subtype
) {
if ($key && $code_location && !$is_equality) { if ($key && $code_location && !$is_equality) {
self::triggerIssueForImpossible( self::triggerIssueForImpossible(
$existing_var_type, $existing_var_type,