danog/psalm
1
0
Fork 0
mirror of https://github.com/danog/psalm.git synced 2024-12-04 18:48:03 +01:00
Code Issues Projects Releases Wiki Activity

Fix #3660 - ensure mixed percentage for file never drops below 0

Browse Source
This commit is contained in:
Matthew Brown 2021-08-14 10:35:31 -04:00
parent 1b19670c39
commit a4479761a7
2 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -312,12 +312,21 @@ class IfAnalyzer
if (!$post_if_context->collect_initializations
&& !$post_if_context->collect_mutations
&& $statements_analyzer->getFilePath() === $statements_analyzer->getRootFilePath()
&& (!(($parent_source = $statements_analyzer->getSource())
instanceof \Psalm\Internal\Analyzer\FunctionLikeAnalyzer)
|| !$parent_source->getSource() instanceof \Psalm\Internal\Analyzer\TraitAnalyzer)
) {
$codebase = $statements_analyzer->getCodebase();
$codebase->analyzer->decrementMixedCount($statements_analyzer->getFilePath());
$parent_source = $statements_analyzer->getSource();
$functionlike_storage = $parent_source instanceof \Psalm\Internal\Analyzer\FunctionLikeAnalyzer
? $parent_source->getFunctionLikeStorage()
: null;
if (!$parent_source instanceof \Psalm\Internal\Analyzer\FunctionLikeAnalyzer
|| (!$parent_source->getSource() instanceof \Psalm\Internal\Analyzer\TraitAnalyzer
&& (!$functionlike_storage
|| !isset($functionlike_storage->param_lookup[substr($var_id, 1)])))
) {
$codebase = $statements_analyzer->getCodebase();
$codebase->analyzer->decrementMixedCount($statements_analyzer->getFilePath());
}
}
IssueBuffer::remove(

6
src/Psalm/Internal/Codebase/Analyzer.php
View File

@ -1216,6 +1216,10 @@ class Analyzer
return;
}
if ($this->mixed_counts[$file_path][0] === 0) {
return;
}
--$this->mixed_counts[$file_path][0];
}
@ -1403,7 +1407,7 @@ class Analyzer
[$path_mixed_count, $path_nonmixed_count] = $this->mixed_counts[$file_path];
if ($path_mixed_count + $path_nonmixed_count) {
$stats .= number_format(100 * $path_nonmixed_count / ($path_mixed_count + $path_nonmixed_count), 0)
$stats .= number_format(100 * $path_nonmixed_count / ($path_mixed_count + $path_nonmixed_count), 3)
. '% ' . $this->config->shortenFileName($file_path)
. ' (' . $path_mixed_count . ' mixed)' . "\n";
}