TrailingArrayCommaSniff should not report errors for empty multiline arrays

Author: kukulich

SlevomatCodingStandard/Sniffs/Arrays/TrailingArrayCommaSniff.php

@@ -37,7 +37,11 @@ public function process(\PHP_CodeSniffer_File $phpcsFile, $stackPointer)
 
 		$previousToCloseParenthesisPointer = TokenHelper::findPreviousEffective($phpcsFile, $closeParenthesisPointer - 1);
 		$previousToCloseParenthesisToken = $tokens[$previousToCloseParenthesisPointer];
-		if ($previousToCloseParenthesisToken['code'] !== T_COMMA && $closeParenthesisToken['line'] !== $previousToCloseParenthesisToken['line']) {
+		if (
+			$previousToCloseParenthesisPointer !== $arrayToken['bracket_opener']
+			&& $previousToCloseParenthesisToken['code'] !== T_COMMA
+			&& $closeParenthesisToken['line'] !== $previousToCloseParenthesisToken['line']
+		) {
 			$fix = $phpcsFile->addFixableError(
 				'Multiline arrays must have a trailing comma after the last element.',
 				$previousToCloseParenthesisPointer,

tests/Sniffs/Arrays/TrailingArrayCommaSniffTest.php

@@ -7,13 +7,12 @@ class TrailingArrayCommaSniffTest extends \SlevomatCodingStandard\Sniffs\TestCas
 
 	public function testCheckFile()
 	{
-		$resultFile = $this->checkFile(__DIR__ . '/data/trailingCommas.php');
-		$this->assertNoSniffError($resultFile, 3);
-		$this->assertNoSniffError($resultFile, 10);
-		$this->assertNoSniffError($resultFile, 12);
-		$this->assertSniffError($resultFile, 18, TrailingArrayCommaSniff::CODE_MISSING_TRAILING_COMMA);
-		$this->assertSniffError($resultFile, 26, TrailingArrayCommaSniff::CODE_MISSING_TRAILING_COMMA);
-		$this->assertNoSniffError($resultFile, 28);
+		$report = $this->checkFile(__DIR__ . '/data/trailingCommas.php');
+
+		$this->assertSame(2, $report->getErrorCount());
+
+		$this->assertSniffError($report, 18, TrailingArrayCommaSniff::CODE_MISSING_TRAILING_COMMA);
+		$this->assertSniffError($report, 26, TrailingArrayCommaSniff::CODE_MISSING_TRAILING_COMMA);
 	}
 
 	public function testFixable()

tests/Sniffs/Arrays/data/fixableTrailingCommas.fixed.php

@@ -27,3 +27,13 @@
 	],
 	5,
 ];
+
+[
+	//
+];
+
+[
+	1,
+	//
+	3,
+];

tests/Sniffs/Arrays/data/fixableTrailingCommas.php

@@ -27,3 +27,13 @@
 	],
 	5,
 ];
+
+[
+	//
+];
+
+[
+	1,
+	//
+	3
+];

tests/Sniffs/Arrays/data/trailingCommas.php

@@ -27,3 +27,14 @@
 	],
 	5,
 ];
+
+$a5 = [
+	//
+];
+
+$a6 = [
+	1,
+	//
+	3,
+];
+