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

Ignore just-coerced vars

Browse Source
This commit is contained in:
Matt Brown 2020-10-17 23:35:24 -04:00
parent b646414304
commit 3c29ffd0b7
3 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Psalm/Internal/Analyzer/Statements/Block/IfAnalyzer.php
View File

@ -1853,6 +1853,13 @@ class IfAnalyzer
Context $outer_context,
array $cond_assigned_var_ids
) : void {
// this filters out coercions to expeccted types in ArgumentAnalyzer
$cond_assigned_var_ids = \array_filter($cond_assigned_var_ids);
if (!$cond_assigned_var_ids) {
return;
}
$exprs = self::getDefinitelyEvaluatedOredExpressions($cond);
// if there was no assignment in the first expression it's safe to proceed

2
src/Psalm/Internal/Analyzer/Statements/Expression/Call/ArgumentAnalyzer.php
View File

@ -1181,7 +1181,7 @@ class ArgumentAnalyzer
}
if ($context->inside_conditional) {
$context->assigned_var_ids[$var_id] = true;
$context->assigned_var_ids[$var_id] = false;
}
if ($was_cloned) {

15
tests/TypeReconciliation/ConditionalTest.php
View File

@ -2900,6 +2900,21 @@ class ConditionalTest extends \Psalm\Tests\TestCase
}
}'
],
'nonRedundantConditionAfterThing' => [
'<?php
class U {
public function takes(self $u) : bool {
return true;
}
}
function bar(?U $a, ?U $b) : void {
if ($a === null
|| ($b !== null && $a->takes($b))
|| $b === null
) {}
}'
],
];
}