Squiz.Formatting.OperatorBracket now correctly fixes statements containing short array syntax

Author: gsherwood

package.xml

@@ -62,6 +62,7 @@ http://pear.php.net/dtd/package-2.0.xsd">
   - Squiz.Formatting.OperatorBracket no longer throws errors for PHP 7.1 multi catch exceptions
   - Squiz.Commenting.LongConditionClosingComment now supports finally statements
   - Squiz.Formatting.OperatorBracket now correctly fixes pipe separated flags
+  - Squiz.Formatting.OperatorBracket now correctly fixes statements containing short array syntax
   - Squiz.PHP.EmbeddedPhp now properly fixes cases where the only content in an embedded PHP block is a comment
     -- Thanks to Juliette Reinders Folmer for the patch
   - Squiz.WhiteSpace.ControlStructureSpacing now ignores comments when checking blank lines at the top of control structures

src/Standards/Squiz/Sniffs/Formatting/OperatorBracketSniff.php

@@ -317,6 +317,11 @@ public function addMissingBracketsError($phpcsFile, $stackPtr)
                 continue;
             }
 
+            if ($tokens[$before]['code'] === T_CLOSE_SHORT_ARRAY) {
+                $before = $tokens[$before]['bracket_opener'];
+                continue;
+            }
+
             break;
         }//end for
 
@@ -348,6 +353,11 @@ public function addMissingBracketsError($phpcsFile, $stackPtr)
                 continue;
             }
 
+            if ($tokens[$after]['code'] === T_OPEN_SHORT_ARRAY) {
+                $after = $tokens[$after]['bracket_closer'];
+                continue;
+            }
+
             break;
         }//end for
 

src/Standards/Squiz/Tests/Formatting/OperatorBracketUnitTest.inc

@@ -157,3 +157,5 @@ if (empty($foo[-1]) === true) {
 try {
 } catch (AException | BException $e) {
 }
+
+$var = $foo['blah'] + [];

src/Standards/Squiz/Tests/Formatting/OperatorBracketUnitTest.inc.fixed

@@ -157,3 +157,5 @@ if (empty($foo[-1]) === true) {
 try {
 } catch (AException | BException $e) {
 }
+
+$var = ($foo['blah'] + []);

src/Standards/Squiz/Tests/Formatting/OperatorBracketUnitTest.php

@@ -62,6 +62,7 @@ public function getErrorList($testFile='OperatorBracketUnitTest.inc')
                     137 => 1,
                     139 => 1,
                     150 => 1,
+                    161 => 1,
                    );
             break;
         case 'OperatorBracketUnitTest.js':