Merge branch 'issues/3100' of https://github.com/morozov/php-code-sniffer

Author: gsherwood

src/Standards/Generic/Sniffs/Arrays/ArrayIndentSniff.php

@@ -62,6 +62,7 @@ public function processMultiLineArray($phpcsFile, $stackPtr, $arrayStart, $array
         // Determine how far indented the entire array declaration should be.
         $ignore     = Tokens::$emptyTokens;
         $ignore[]   = T_DOUBLE_ARROW;
+        $ignore[]   = T_COMMA;
         $prev       = $phpcsFile->findPrevious($ignore, ($stackPtr - 1), null, true);
         $start      = $phpcsFile->findStartOfStatement($prev);
         $first      = $phpcsFile->findFirstOnLine(T_WHITESPACE, $start, true);

src/Standards/Generic/Tests/Arrays/ArrayIndentUnitTest.inc

@@ -77,3 +77,14 @@ $var = [
         2 => 'two',
     /* three */ 3 => 'three',
     ];
+
+// phpcs:set Generic.Arrays.ArrayIndent indent 4
+
+$foo = [
+    'foo'
+        . 'bar',
+    [
+            'baz',
+            'qux',
+        ],
+];

src/Standards/Generic/Tests/Arrays/ArrayIndentUnitTest.inc.fixed

@@ -78,3 +78,14 @@ $var = [
   2 => 'two',
   /* three */ 3 => 'three',
 ];
+
+// phpcs:set Generic.Arrays.ArrayIndent indent 4
+
+$foo = [
+    'foo'
+        . 'bar',
+    [
+        'baz',
+        'qux',
+    ],
+];

src/Standards/Generic/Tests/Arrays/ArrayIndentUnitTest.php

@@ -40,6 +40,9 @@ public function getErrorList()
             77 => 1,
             78 => 1,
             79 => 1,
+            87 => 1,
+            88 => 1,
+            89 => 1,
         ];
 
     }//end getErrorList()