Fixed bug squizlabs#1392 : Scope indent calculated incorrectly when u…

…sing array destructuring

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

@@ -472,6 +472,8 @@ public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
                             $type = $tokens[$first]['type'];
                             echo "\t* amended first token is $first ($type) on line $line *".PHP_EOL;
                         }
+                    } else if ($tokens[$first]['code'] === T_WHITESPACE) {
+                        $first = $phpcsFile->findNext(T_WHITESPACE, ($first + 1), null, true);
                     }
 
                     if (isset($tokens[$first]['scope_closer']) === true

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

@@ -1168,6 +1168,20 @@ $foo = foo(
     }
 );
 
+function test()
+{
+    $array = [];
+    foreach ($array as $data) {
+        [
+            'key1' => $var1,
+            'key2' => $var2,
+        ] = $data;
+        foreach ($var1 as $method) {
+            echo $method . $var2;
+        }
+    }
+}
+
     function foo()
     {
         $foo = array(

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

@@ -1168,6 +1168,20 @@ $foo = foo(
     }
 );
 
+function test()
+{
+    $array = [];
+    foreach ($array as $data) {
+        [
+            'key1' => $var1,
+            'key2' => $var2,
+        ] = $data;
+        foreach ($var1 as $method) {
+            echo $method . $var2;
+        }
+    }
+}
+
 function foo()
 {
     $foo = array(

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

@@ -1168,6 +1168,20 @@ $foo = foo(
 	}
 );
 
+function test()
+{
+	$array = [];
+	foreach ($array as $data) {
+		[
+			'key1' => $var1,
+			'key2' => $var2,
+		] = $data;
+		foreach ($var1 as $method) {
+			echo $method . $var2;
+		}
+	}
+}
+
 	function foo()
 	{
 		$foo = array(

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

@@ -1168,6 +1168,20 @@ $foo = foo(
 	}
 );
 
+function test()
+{
+	$array = [];
+	foreach ($array as $data) {
+		[
+			'key1' => $var1,
+			'key2' => $var2,
+		] = $data;
+		foreach ($var1 as $method) {
+			echo $method . $var2;
+		}
+	}
+}
+
 function foo()
 {
 	$foo = array(

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

@@ -155,14 +155,14 @@ public function getErrorList($testFile='ScopeIndentUnitTest.inc')
                 858  => 1,
                 879  => 1,
                 1163 => 1,
-                1171 => 1,
-                1176 => 1,
-                1178 => 1,
-                1181 => 1,
                 1185 => 1,
-                1186 => 1,
-                1187 => 1,
-                1188 => 1,
+                1190 => 1,
+                1192 => 1,
+                1195 => 1,
+                1199 => 1,
+                1200 => 1,
+                1201 => 1,
+                1202 => 1,
                );
 
     }//end getErrorList()

package.xml

@@ -34,6 +34,7 @@ http://pear.php.net/dtd/package-2.0.xsd">
     -- Thanks to Mark Clements for the patch
   - Fixed bug #1381 : Tokenizer: derefencing incorrectly identified as short array
   - Fixed bug #1387 : Squiz.ControlStructures.ControlSignature does not handle alt syntax when checking space after closing brace
+  - Fixed bug #1392 : Scope indent calculated incorrectly when using array destructuring
  </notes>
  <contents>
   <dir name="/">