Skip to content

VariableAnalysisSniff::processCompactArguments(): fix comment tolerance #155

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 17, 2020
Merged

VariableAnalysisSniff::processCompactArguments(): fix comment tolerance #155

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion VariableAnalysis/Sniffs/CodeAnalysis/VariableAnalysisSniff.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
use VariableAnalysis\Lib\Helpers;
use PHP_CodeSniffer\Sniffs\Sniff;
use PHP_CodeSniffer\Files\File;
use PHP_CodeSniffer\Util\Tokens;

class VariableAnalysisSniff implements Sniff {
/**
Expand Down Expand Up @@ -1291,7 +1292,7 @@ protected function processCompactArguments(File $phpcsFile, $stackPtr, $argument

foreach ($arguments as $argumentPtrs) {
$argumentPtrs = array_values(array_filter($argumentPtrs, function ($argumentPtr) use ($tokens) {
return $tokens[$argumentPtr]['code'] !== T_WHITESPACE;
return isset(Tokens::$emptyTokens[$tokens[$argumentPtr]['code']]) === false;
}));
if (empty($argumentPtrs)) {
continue;
Expand Down
6 changes: 3 additions & 3 deletions VariableAnalysis/Tests/CodeAnalysis/fixtures/CompactFixture.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ function function_with_literal_compact($param1, $param2, $param3, $param4) {
$squish = compact('var1');
$squish = compact('var3');
$squish = compact('param1');
$squish = compact('var2', 'param3');
$squish = compact('var2', /*comment*/ 'param3');
$squish = compact(array('var4'), array('param4', 'var5'));
echo $squish;
}
Expand All @@ -20,10 +20,10 @@ function function_with_expression_compact($param1, $param2, $param3, $param4) {
$var8 = "value8";
$var9 = "value9";
$squish = compact("var1");
$squish = compact("var3");
$squish = compact("var3"/*comment*/ );
$squish = compact("param1");
$squish = compact("var2", "param3");
$squish = compact(array("var4"), array("param4", "var5"));
$squish = compact(array("var4"), array("param4", /*comment*/ "var5"));
$squish = compact($var6);
$squish = compact("var" . "7");
$squish = compact("blah $var8");
Expand Down