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

Allow suppression of unused variable issues

Browse Source
This commit is contained in:
Brown 2019-07-24 17:01:41 -04:00
parent 862f48503f
commit ea2074b19b
2 changed files with 34 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/Psalm/Internal/Analyzer/StatementsAnalyzer.php
View File

@ -944,7 +944,7 @@ class StatementsAnalyzer extends SourceAnalyzer implements StatementsSource
$assign_stmt = null;
$assign_exp = null;
$assign_exp_found = false;
$i = 0;
while ($i<count($stmts) && !$assign_exp_found) {
$stmt = $stmts[$i];
@ -1029,6 +1029,8 @@ class StatementsAnalyzer extends SourceAnalyzer implements StatementsSource
$loc_list = array_column($this->unused_var_locations, 1);
$var_loc_map = array_combine($var_list, $loc_list);
$project_analyzer = $this->getProjectAnalyzer();
foreach ($this->unused_var_locations as $hash => list($var_id, $original_location)) {
if ($var_id === '$_' || isset($this->used_var_locations[$hash])) {
continue;
@ -1039,7 +1041,16 @@ class StatementsAnalyzer extends SourceAnalyzer implements StatementsSource
&& !isset($this->byref_uses[$var_id])
&& !$this->isSuperGlobal($var_id)
) {
if ($codebase->alter_code && !$this->checkIfVarRemoved($var_id, $original_location)) {
$issue = new UnusedVariable(
'Variable ' . $var_id . ' is never referenced',
$original_location
);
if ($codebase->alter_code
&& !$this->checkIfVarRemoved($var_id, $original_location)
&& isset($project_analyzer->getIssuesToFix()['UnusedVariable'])
&& !IssueBuffer::isSuppressed($issue, $this->getSuppressedIssues())
) {
$search_result = $this->findAssignStmt($stmts, $var_id, $original_location);
$assign_stmt = $search_result[0];
$assign_exp = $search_result[1];
@ -1121,10 +1132,7 @@ class StatementsAnalyzer extends SourceAnalyzer implements StatementsSource
}
if (IssueBuffer::accepts(
new UnusedVariable(
'Variable ' . $var_id . ' is never referenced',
$original_location
),
$issue,
$this->getSuppressedIssues()
)) {
// fall through

20
tests/FileManipulation/UnusedVariableManipulationTest.php
View File

@ -494,6 +494,26 @@ class UnusedVariableManipulationTest extends FileManipulationTest
['UnusedVariable'],
true,
],
'donRemoveSuppressedUnusedVariable' => [
'<?php
/** @psalm-suppress UnusedVariable */
function foo() : void {
$a = 5;
$b = "hello";
echo $b;
}',
'<?php
/** @psalm-suppress UnusedVariable */
function foo() : void {
$a = 5;
$b = "hello";
echo $b;
}',
'7.1',
['UnusedVariable'],
true,
],
];
}
}