1
0
mirror of https://github.com/danog/psalm.git synced 2024-12-12 09:19:40 +01:00

Remove an untested chunk of issue-triggering code that has only ever caused anguish

This commit is contained in:
Matthew Brown 2022-01-04 16:36:33 +00:00
parent 0fffb55a83
commit 4e81d0c5ab

View File

@ -473,30 +473,6 @@ class AssertionReconciler extends Reconciler
} elseif (!$new_type->hasMixed()) { } elseif (!$new_type->hasMixed()) {
$has_match = true; $has_match = true;
if ($key
&& $code_location
&& $new_type->getId() === $existing_var_type->getId()
//even if two objects are the same, equality is not guaranteed
// example: (ErrorException and TypeError are both Throwable but not equal)
&& !$new_type->hasNamedObjectType()
&& !$is_equality
&& !($original_assertion === 'loaded-class-string' && $old_var_type_string === 'class-string')
&& (!($statements_analyzer->getSource()->getSource() instanceof TraitAnalyzer)
|| ($key !== '$this'
&& !($existing_var_type->hasLiteralClassString() && $new_type->hasLiteralClassString())))
) {
self::triggerIssueForImpossible(
$existing_var_type,
$old_var_type_string,
$key,
$original_assertion,
true,
$negated,
$code_location,
$suppressed_issues
);
}
$any_scalar_type_match_found = false; $any_scalar_type_match_found = false;
if ($code_location if ($code_location