Closing parenthesis should be after array closing bracket "])"

Author: louisl

CodeIgniter4/Sniffs/Arrays/ArrayDeclarationSniff.php

@@ -403,7 +403,7 @@ public function processMultiLineArray($phpcsFile, $stackPtr, $arrayStart, $array
         // If this is the first argument in a function ensure the bracket to be right after the parenthesis. eg "array_combine([".
         if ($tokens[$prevNonWhitespaceToken]['code'] === T_OPEN_PARENTHESIS && $tokens[$stackPtr]['code'] === T_OPEN_SHORT_ARRAY) {
             if ($tokens[$stackPtr]['line'] > $tokens[$prevNonWhitespaceToken]['line']) {
-                $error = 'Array open bracket should be after function open parenthesis "(["';
+                $error = 'Array openening bracket should be after function open parenthesis "(["';
                 $data  = array();
                 $fix   = $phpcsFile->addFixableError($error, $stackPtr, 'ShortArrayOpenWrongLine', $data);
                 if ($fix === true) {
@@ -417,11 +417,31 @@ public function processMultiLineArray($phpcsFile, $stackPtr, $arrayStart, $array
             }
         }
 
-        // Check the closing bracket is on a new line.
+        // Get content before closing array bracket/brace.
         $lastContent = $phpcsFile->findPrevious(T_WHITESPACE, ($arrayEnd - 1), $arrayStart, true);
+
+        // Check for ) after last Array end.
+        $afterCloser = $phpcsFile->findNext(T_WHITESPACE, ($arrayEnd + 1), null, true);
+        if ($tokens[$afterCloser]['code'] === T_CLOSE_PARENTHESIS) {
+            if ($tokens[$afterCloser]['column'] !== ($tokens[$arrayEnd]['column'] + 1)) {
+                $error = 'Closing parenthesis should be after array closing bracket "])"';
+                $data  = array();
+                $fix   = $phpcsFile->addFixableError($error, $afterCloser, 'CloseBracketAfterArrayBracket');
+                if ($fix === true) {
+                    $phpcsFile->fixer->beginChangeset();
+                    for ($i = ($arrayEnd + 1); $i < $afterCloser; $i++) {
+                        $phpcsFile->fixer->replaceToken($i, '');
+                    }
+
+                    $phpcsFile->fixer->endChangeset();
+                }
+            }
+        }
+
+        // Check the closing bracket is on a new line.
         if ($tokens[$lastContent]['line'] === $tokens[$arrayEnd]['line']) {
             $error = 'Closing parenthesis of array declaration must be on a new line';
-            $fix   = $phpcsFile->addFixableError($error, $arrayEnd, 'CloseBraceNewLine');
+            $fix   = $phpcsFile->addFixableError($error, $arrayEnd, 'CloseArrayBraceNewLine');
             if ($fix === true) {
                 $phpcsFile->fixer->addNewlineBefore($arrayEnd);
             }
@@ -442,7 +462,7 @@ public function processMultiLineArray($phpcsFile, $stackPtr, $arrayStart, $array
                       ($found / $this->tabWidth),
                      );
 
-            $fix = $phpcsFile->addFixableError($error, $arrayEnd, 'CloseBraceNotAligned', $data);
+            $fix = $phpcsFile->addFixableError($error, $arrayEnd, 'CloseArrayBraceNotAligned', $data);
             if ($fix === true) {
                 if ($found === 0) {
                     $phpcsFile->fixer->addContent(($arrayEnd - 1), str_repeat(' ', $expected));

CodeIgniter4/Tests/Arrays/ArrayDeclarationUnitTest.inc.fixed

@@ -182,8 +182,7 @@ class MyClass {
 		$message->setCustomProperty('user_info', [
             'id'   => $id,
             'name' => 'Test message',
-        ]
-		);
+        ]);
 
 		$users = [
 			[

CodeIgniter4/Tests/Arrays/ArrayDeclarationUnitTest.php

@@ -96,6 +96,7 @@ public function getErrorList()
                 117 => 1,
                 118 => 1,
                 119 => 1,
+                120 => 1,
                );
 
     }//end getErrorList()