DisallowIncrementAndDecrementOperatorsSniff: Fixed error codes for post operators in some situations

Author: kukulich

SlevomatCodingStandard/Sniffs/Operators/DisallowIncrementAndDecrementOperatorsSniff.php

@@ -4,10 +4,10 @@
 
 use PHP_CodeSniffer\Files\File;
 use PHP_CodeSniffer\Sniffs\Sniff;
+use SlevomatCodingStandard\Helpers\IdentificatorHelper;
 use SlevomatCodingStandard\Helpers\TokenHelper;
 use const T_DEC;
 use const T_INC;
-use const T_VARIABLE;
 
 class DisallowIncrementAndDecrementOperatorsSniff implements Sniff
 {
@@ -37,9 +37,10 @@ public function process(File $phpcsFile, $operatorPointer): void
 	{
 		$tokens = $phpcsFile->getTokens();
 
-		$previousPointer = TokenHelper::findPreviousEffective($phpcsFile, $operatorPointer - 1);
-
-		$isPostOperator = $tokens[$previousPointer]['code'] === T_VARIABLE;
+		/** @var int $nextPointer */
+		$nextPointer = TokenHelper::findNextEffective($phpcsFile, $operatorPointer + 1);
+		$afterVariableEndPointer = IdentificatorHelper::findEndPointer($phpcsFile, $nextPointer);
+		$isPostOperator = $afterVariableEndPointer === null;
 
 		if ($tokens[$operatorPointer]['code'] === T_INC) {
 			if ($isPostOperator) {

tests/Sniffs/Operators/DisallowIncrementAndDecrementOperatorsSniffTest.php

@@ -16,12 +16,14 @@ public function testErrors(): void
 	{
 		$report = self::checkFile(__DIR__ . '/data/disallowIncrementAndDecrementOperatorsErrors.php');
 
-		self::assertSame(4, $report->getErrorCount());
+		self::assertSame(6, $report->getErrorCount());
 
 		self::assertSniffError($report, 3, DisallowIncrementAndDecrementOperatorsSniff::CODE_DISALLOWED_POST_INCREMENT_OPERATOR);
 		self::assertSniffError($report, 4, DisallowIncrementAndDecrementOperatorsSniff::CODE_DISALLOWED_PRE_INCREMENT_OPERATOR);
 		self::assertSniffError($report, 6, DisallowIncrementAndDecrementOperatorsSniff::CODE_DISALLOWED_POST_DECREMENT_OPERATOR);
 		self::assertSniffError($report, 7, DisallowIncrementAndDecrementOperatorsSniff::CODE_DISALLOWED_PRE_DECREMENT_OPERATOR);
+		self::assertSniffError($report, 9, DisallowIncrementAndDecrementOperatorsSniff::CODE_DISALLOWED_POST_INCREMENT_OPERATOR);
+		self::assertSniffError($report, 10, DisallowIncrementAndDecrementOperatorsSniff::CODE_DISALLOWED_POST_DECREMENT_OPERATOR);
 	}
 
 }

tests/Sniffs/Operators/data/disallowIncrementAndDecrementOperatorsErrors.php

@@ -5,3 +5,6 @@
 
 $k--;
 --$l;
+
+$a['a']++;
+$a['a']--;