Skip to content

Commit 7a7cd6b

Browse files
authored
Merge pull request #292 from rodrigoprimo/fix-increment-decrement-spacing-error-message
Generic/IncrementDecrementSpacing: fix post-decrement error message
2 parents b03d10f + 4607a26 commit 7a7cd6b

File tree

4 files changed

+14
-1
lines changed

4 files changed

+14
-1
lines changed

src/Standards/Generic/Sniffs/WhiteSpace/IncrementDecrementSpacingSniff.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ public function process(File $phpcsFile, $stackPtr)
135135
$fixable = false;
136136
$spaces = 'comment';
137137
} else {
138-
if ($tokens[$stackPtr]['line'] !== $tokens[$nextNonEmpty]['line']) {
138+
if ($tokens[$stackPtr]['line'] !== $tokens[$prevNonEmpty]['line']) {
139139
$spaces = 'newline';
140140
} else {
141141
$spaces = $tokens[($stackPtr - 1)]['length'];

src/Standards/Generic/Tests/WhiteSpace/IncrementDecrementSpacingUnitTest.inc

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,3 +35,9 @@ $obj->prop['key'] ++;
3535

3636
--ClassName::$prop;
3737
-- ClassName::$prop;
38+
39+
getObject()->count
40+
++;
41+
getObject()->count++;
42+
++ getObject()->count;
43+
++getObject()->count;

src/Standards/Generic/Tests/WhiteSpace/IncrementDecrementSpacingUnitTest.inc.fixed

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,3 +34,8 @@ $obj->prop['key']++;
3434

3535
--ClassName::$prop;
3636
--ClassName::$prop;
37+
38+
getObject()->count++;
39+
getObject()->count++;
40+
++getObject()->count;
41+
++getObject()->count;

src/Standards/Generic/Tests/WhiteSpace/IncrementDecrementSpacingUnitTest.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,8 @@ public function getErrorList($testFile='')
5353
$errors[31] = 1;
5454
$errors[34] = 1;
5555
$errors[37] = 1;
56+
$errors[40] = 1;
57+
$errors[42] = 1;
5658

5759
return $errors;
5860

0 commit comments

Comments
 (0)