Fixed bug #2504 : Generic.WhiteSpace.ScopeIndent false positives with nested arrays and nowdoc string

Also removed some duplicated code as it was always run twice and no tests needed it

Author: gsherwood

package.xml

@@ -51,6 +51,7 @@ http://pear.php.net/dtd/package-2.0.xsd">
   - Fixed bug #2479 : Generic.WhiteSpace.ScopeIndent error when using array destructing with exact indent checking
   - Fixed bug #2498 : Squiz.Arrays.ArrayDeclaration.MultiLineNotAllowed autofix breaks heredoc
   - Fixed bug #2502 : Generic.WhiteSpace.ScopeIndent false positives with nested switch indentation and case fall-through
+  - Fixed bug #2504 : Generic.WhiteSpace.ScopeIndent false positives with nested arrays and nowdoc string
  </notes>
  <contents>
   <dir name="/">

src/Standards/Generic/Sniffs/WhiteSpace/ScopeIndentSniff.php

@@ -229,16 +229,6 @@ public function process(File $phpcsFile, $stackPtr)
 
             $exact = $this->exact;
 
-            if ($tokens[$i]['code'] === T_OPEN_SHORT_ARRAY) {
-                $disableExactEnd = max($disableExactEnd, $tokens[$i]['bracket_closer']);
-                if ($this->debug === true) {
-                    $line = $tokens[$i]['line'];
-                    $type = $tokens[$disableExactEnd]['type'];
-                    echo "Opening short array bracket found on line $line".PHP_EOL;
-                    echo "\t=> disabling exact indent checking until $disableExactEnd ($type)".PHP_EOL;
-                }
-            }
-
             if ($tokens[$i]['code'] === T_OPEN_PARENTHESIS
                 && isset($tokens[$i]['parenthesis_closer']) === true
             ) {
@@ -1001,7 +991,11 @@ public function process(File $phpcsFile, $stackPtr)
                     $line = $tokens[$i]['line'];
                     $type = $tokens[$disableExactEnd]['type'];
                     echo "Opening short array bracket found on line $line".PHP_EOL;
-                    echo "\t=> disabling exact indent checking until $disableExactEnd ($type)".PHP_EOL;
+                    if ($disableExactEnd === $tokens[$i]['bracket_closer']) {
+                        echo "\t=> disabling exact indent checking until $disableExactEnd ($type)".PHP_EOL;
+                    } else {
+                        echo "\t=> continuing to disable exact indent checking until $disableExactEnd ($type)".PHP_EOL;
+                    }
                 }
             }
 
@@ -1010,10 +1004,26 @@ public function process(File $phpcsFile, $stackPtr)
             if ($tokens[$i]['code'] === T_START_HEREDOC
                 || $tokens[$i]['code'] === T_START_NOWDOC
             ) {
-                $i = $phpcsFile->findNext([T_END_HEREDOC, T_END_NOWDOC], ($i + 1));
-                $i = $phpcsFile->findNext(Tokens::$emptyTokens, ($i + 1), null, true);
+                if ($this->debug === true) {
+                    $line = $tokens[$i]['line'];
+                    $type = $tokens[$disableExactEnd]['type'];
+                    echo "Here/nowdoc found on line $line".PHP_EOL;
+                }
+
+                $i    = $phpcsFile->findNext([T_END_HEREDOC, T_END_NOWDOC], ($i + 1));
+                $next = $phpcsFile->findNext(Tokens::$emptyTokens, ($i + 1), null, true);
+                if ($tokens[$next]['code'] === T_COMMA) {
+                    $i = $next;
+                }
+
+                if ($this->debug === true) {
+                    $line = $tokens[$i]['line'];
+                    $type = $tokens[$i]['type'];
+                    echo "\t* skipping to token $i ($type) on line $line *".PHP_EOL;
+                }
+
                 continue;
-            }
+            }//end if
 
             // Completely skip multi-line strings as the indent is a part of the
             // content itself.

src/Standards/Generic/Tests/WhiteSpace/ScopeIndentUnitTest.1.inc

@@ -1418,6 +1418,17 @@ switch ($x) {
         }
 }
 
+$foo = [
+    [
+        'a' => [
+        ],
+        'b' => <<<'FOO'
+foo;
+FOO
+    ],
+    $a,
+];
+
 ?>
 
 <?php

src/Standards/Generic/Tests/WhiteSpace/ScopeIndentUnitTest.1.inc.fixed

@@ -1418,6 +1418,17 @@ switch ($x) {
         }
 }
 
+$foo = [
+    [
+        'a' => [
+        ],
+        'b' => <<<'FOO'
+foo;
+FOO
+    ],
+    $a,
+];
+
 ?>
 
 <?php

src/Standards/Generic/Tests/WhiteSpace/ScopeIndentUnitTest.2.inc

@@ -1418,6 +1418,17 @@ switch ($x) {
 		}
 }
 
+$foo = [
+	[
+		'a' => [
+		],
+		'b' => <<<'FOO'
+foo;
+FOO
+	],
+	$a,
+];
+
 ?>
 
 <?php

src/Standards/Generic/Tests/WhiteSpace/ScopeIndentUnitTest.2.inc.fixed

@@ -1418,6 +1418,17 @@ switch ($x) {
 		}
 }
 
+$foo = [
+	[
+		'a' => [
+		],
+		'b' => <<<'FOO'
+foo;
+FOO
+	],
+	$a,
+];
+
 ?>
 
 <?php

src/Standards/Generic/Tests/WhiteSpace/ScopeIndentUnitTest.php

@@ -178,10 +178,10 @@ public function getErrorList($testFile='ScopeIndentUnitTest.inc')
             1340 => 1,
             1342 => 1,
             1345 => 1,
-            1424 => 1,
-            1425 => 1,
-            1426 => 1,
-            1427 => 1,
+            1435 => 1,
+            1436 => 1,
+            1437 => 1,
+            1438 => 1,
         ];
 
     }//end getErrorList()