Skip to content

Commit d2d1d7e

Browse files
committed
Remove UnusedParameter, since it is a breaking change
1 parent 70c8f4c commit d2d1d7e

File tree

3 files changed

+7
-59
lines changed

3 files changed

+7
-59
lines changed

README.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@ Plugin for PHP_CodeSniffer static analysis tool that adds analysis of problemati
88
- Warns if variables are used for an array push shortcut without being defined. (Sniff code: `VariableAnalysis.CodeAnalysis.VariableAnalysis.UndefinedArrayVariable`)
99
- Warns if variables are used inside `unset()` without being defined. (Sniff code: `VariableAnalysis.CodeAnalysis.VariableAnalysis.UndefinedUnsetVariable`)
1010
- Warns if variables are set or declared but never used. (Sniff code: `VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable`)
11-
- Warns if function parameters are declared but never used. (Sniff code: `VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedParameter`)
12-
- Warns if function parameters are declared but never used before other parameters that are used. (Sniff code: `VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedParameterBeforeUsed`)
1311
- Warns if `$this`, `self::$static_member`, `static::$static_member` is used outside class scope. (Sniff codes: `VariableAnalysis.CodeAnalysis.VariableAnalysis.SelfOutsideClass` or `VariableAnalysis.CodeAnalysis.VariableAnalysis.StaticOutsideClass`)
1412

1513
## Installation

Tests/VariableAnalysisSniff/VariableAnalysisTest.php

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -628,13 +628,13 @@ public function testUnusedParamsHaveCorrectSniffCodes() {
628628
$phpcsFile->process();
629629

630630
$warnings = $phpcsFile->getWarnings();
631-
$this->assertEquals('VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedParameterBeforeUsed', $warnings[4][43][0]['source']);
632-
$this->assertEquals('VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedParameter', $warnings[16][52][0]['source']);
633-
$this->assertEquals('VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedParameter', $warnings[27][60][0]['source']);
634-
$this->assertEquals('VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedParameter', $warnings[39][42][0]['source']);
635-
$this->assertEquals('VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedParameter', $warnings[39][51][0]['source']);
636-
$this->assertEquals('VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedParameter', $warnings[72][5][0]['source']);
637-
$this->assertEquals('VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedParameter', $warnings[73][5][0]['source']);
631+
$this->assertEquals('VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable', $warnings[4][43][0]['source']);
632+
$this->assertEquals('VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable', $warnings[16][52][0]['source']);
633+
$this->assertEquals('VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable', $warnings[27][60][0]['source']);
634+
$this->assertEquals('VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable', $warnings[39][42][0]['source']);
635+
$this->assertEquals('VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable', $warnings[39][51][0]['source']);
636+
$this->assertEquals('VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable', $warnings[72][5][0]['source']);
637+
$this->assertEquals('VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable', $warnings[73][5][0]['source']);
638638
}
639639

640640
public function testValidUnusedVariableNamesIgnoresUnusedVariables() {

VariableAnalysis/Sniffs/CodeAnalysis/VariableAnalysisSniff.php

Lines changed: 0 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1696,14 +1696,6 @@ protected function processScopeCloseForVariable(File $phpcsFile, VariableInfo $v
16961696
return;
16971697
}
16981698

1699-
if ($varInfo->scopeType === ScopeType::PARAM && Helpers::areFollowingArgumentsUsed($varInfo, $scopeInfo)) {
1700-
$this->warnAboutUnusedParameterBeforeUsed($phpcsFile, $varInfo);
1701-
return;
1702-
}
1703-
if ($varInfo->scopeType === ScopeType::PARAM) {
1704-
$this->warnAboutUnusedParameterAfterUsed($phpcsFile, $varInfo);
1705-
return;
1706-
}
17071699
$this->warnAboutUnusedVariable($phpcsFile, $varInfo);
17081700
}
17091701

@@ -1728,48 +1720,6 @@ protected function warnAboutUnusedVariable(File $phpcsFile, VariableInfo $varInf
17281720
}
17291721
}
17301722

1731-
/**
1732-
* @param File $phpcsFile
1733-
* @param VariableInfo $varInfo
1734-
*
1735-
* @return void
1736-
*/
1737-
protected function warnAboutUnusedParameterAfterUsed(File $phpcsFile, VariableInfo $varInfo) {
1738-
foreach (array_unique($varInfo->allAssignments) as $indexForWarning) {
1739-
Helpers::debug("variable {$varInfo->name} at end of scope looks unused");
1740-
$phpcsFile->addWarning(
1741-
"Unused %s %s.",
1742-
$indexForWarning,
1743-
'UnusedParameter',
1744-
[
1745-
VariableInfo::$scopeTypeDescriptions[$varInfo->scopeType],
1746-
"\${$varInfo->name}",
1747-
]
1748-
);
1749-
}
1750-
}
1751-
1752-
/**
1753-
* @param File $phpcsFile
1754-
* @param VariableInfo $varInfo
1755-
*
1756-
* @return void
1757-
*/
1758-
protected function warnAboutUnusedParameterBeforeUsed(File $phpcsFile, VariableInfo $varInfo) {
1759-
foreach (array_unique($varInfo->allAssignments) as $indexForWarning) {
1760-
Helpers::debug("variable {$varInfo->name} at end of scope looks unused");
1761-
$phpcsFile->addWarning(
1762-
"Unused %s %s.",
1763-
$indexForWarning,
1764-
'UnusedParameterBeforeUsed',
1765-
[
1766-
VariableInfo::$scopeTypeDescriptions[$varInfo->scopeType],
1767-
"\${$varInfo->name}",
1768-
]
1769-
);
1770-
}
1771-
}
1772-
17731723
/**
17741724
* @param File $phpcsFile
17751725
* @param string $varName

0 commit comments

Comments
 (0)