Skip to content
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

Jump to bottom

ReferenceSniff: Fix false positive with bitwise and #162

Merged
merged 4 commits into from
Feb 15, 2022
Merged

ReferenceSniff: Fix false positive with bitwise and #162

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2a8dea2
Added failing test for bitwise operations on class properties
mattkynaston Feb 14, 2022
bbe886d
Check if $stackPtr is reference
mattkynaston Feb 14, 2022
a0c8f5d
remove redundant condition
michalbundyra Feb 15, 2022
fde5783
Merge branch 'master' into reference-is-reference
michalbundyra Feb 15, 2022
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
16 changes: 4 additions & 12 deletions src/WebimpressCodingStandard/Sniffs/Formatting/ReferenceSniff.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,9 @@
use function in_array;

use const T_BITWISE_AND;
use const T_COMMA;
use const T_NEW;
use const T_OPEN_PARENTHESIS;
use const T_OPEN_SHORT_ARRAY;
use const T_STRING;
use const T_WHITESPACE;

class ReferenceSniff implements Sniff
Expand All @@ -35,6 +33,10 @@ public function process(File $phpcsFile, $stackPtr)
{
$tokens = $phpcsFile->getTokens();

if (! $phpcsFile->isReference($stackPtr)) {
return;
}

$next = $phpcsFile->findNext(Tokens::$emptyTokens, $stackPtr + 1, null, true);
if ($tokens[$next]['code'] === T_NEW) {
$error = 'Reference operator is redundant before new keyword (objects are always passed by reference)';
Expand All @@ -49,16 +51,6 @@ public function process(File $phpcsFile, $stackPtr)

$prev = $phpcsFile->findPrevious(Tokens::$emptyTokens, $stackPtr - 1, null, true);

$tokenCodes = Tokens::$assignmentTokens + [
T_COMMA => T_COMMA,
T_OPEN_PARENTHESIS => T_OPEN_PARENTHESIS,
T_OPEN_SHORT_ARRAY => T_OPEN_SHORT_ARRAY,
T_STRING => T_STRING,
];
if (! in_array($tokens[$prev]['code'], $tokenCodes, true)) {
return;
}

// One space before &
if ($tokens[$prev]['line'] === $tokens[$stackPtr]['line']
&& ! in_array($tokens[$stackPtr - 1]['code'], [T_WHITESPACE, T_OPEN_PARENTHESIS, T_OPEN_SHORT_ARRAY], true)
Expand Down
10 changes: 10 additions & 0 deletions test/Sniffs/Formatting/ReferenceUnitTest.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,13 @@ $a = &new \DateTime();
$b = & new \DateTime();
$c =& new \DateTime();
$d =&new \DateTime();

class ReferenceClass
{
public int $flag = 1;

public function isFlagged()
{
return (bool) ($this->flag & 4);
}
}
10 changes: 10 additions & 0 deletions test/Sniffs/Formatting/ReferenceUnitTest.inc.fixed
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,13 @@ $a = new \DateTime();
$b = new \DateTime();
$c = new \DateTime();
$d =new \DateTime();

class ReferenceClass
{
public int $flag = 1;

public function isFlagged()
{
return (bool) ($this->flag & 4);
}
}