Generic/ArrayIndent: don't use the same variable for different things

The variable `$expectedIndent` was being used for two different things:
the expected indentation value for the array elements and for the array
closing brace. This changes the code to use two different variables, one
for each expected indentation.

Author: rodrigoprimo

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

@@ -99,7 +99,7 @@ public function processMultiLineArray($phpcsFile, $stackPtr, $arrayStart, $array
             return;
         }//end if
 
-        $expectedIndent = ($startIndent + $this->indent);
+        $expectedElementIndent = ($startIndent + $this->indent);
 
         foreach ($indices as $index) {
             if (isset($index['index_start']) === true) {
@@ -118,18 +118,18 @@ public function processMultiLineArray($phpcsFile, $stackPtr, $arrayStart, $array
             $first = $phpcsFile->findFirstOnLine(T_WHITESPACE, $start, true);
 
             $foundIndent = ($tokens[$first]['column'] - 1);
-            if ($foundIndent === $expectedIndent) {
+            if ($foundIndent === $expectedElementIndent) {
                 continue;
             }
 
             $pluralizeSpace = 's';
-            if ($expectedIndent === 1) {
+            if ($expectedElementIndent === 1) {
                 $pluralizeSpace = '';
             }
 
             $error = 'Array key not indented correctly; expected %s space%s but found %s';
             $data  = [
-                $expectedIndent,
+                $expectedElementIndent,
                 $pluralizeSpace,
                 $foundIndent,
             ];
@@ -138,7 +138,7 @@ public function processMultiLineArray($phpcsFile, $stackPtr, $arrayStart, $array
                 continue;
             }
 
-            $padding = str_repeat(' ', $expectedIndent);
+            $padding = str_repeat(' ', $expectedElementIndent);
             if ($foundIndent === 0) {
                 $phpcsFile->fixer->addContentBefore($first, $padding);
             } else {
@@ -151,28 +151,28 @@ public function processMultiLineArray($phpcsFile, $stackPtr, $arrayStart, $array
             $error = 'Closing brace of array declaration must be on a new line';
             $fix   = $phpcsFile->addFixableError($error, $arrayEnd, 'CloseBraceNotNewLine');
             if ($fix === true) {
-                $padding = $phpcsFile->eolChar.str_repeat(' ', $expectedIndent);
+                $padding = $phpcsFile->eolChar.str_repeat(' ', $expectedElementIndent);
                 $phpcsFile->fixer->addContentBefore($arrayEnd, $padding);
             }
 
             return;
         }
 
         // The close brace must be indented one stop less.
-        $expectedIndent -= $this->indent;
-        $foundIndent     = ($tokens[$arrayEnd]['column'] - 1);
-        if ($foundIndent === $expectedIndent) {
+        $expectedCloseBraceIndent = ($expectedElementIndent - $this->indent);
+        $foundIndent = ($tokens[$arrayEnd]['column'] - 1);
+        if ($foundIndent === $expectedCloseBraceIndent) {
             return;
         }
 
         $pluralizeSpace = 's';
-        if ($expectedIndent === 1) {
+        if ($expectedCloseBraceIndent === 1) {
             $pluralizeSpace = '';
         }
 
         $error = 'Array close brace not indented correctly; expected %s space%s but found %s';
         $data  = [
-            $expectedIndent,
+            $expectedCloseBraceIndent,
             $pluralizeSpace,
             $foundIndent,
         ];
@@ -181,7 +181,7 @@ public function processMultiLineArray($phpcsFile, $stackPtr, $arrayStart, $array
             return;
         }
 
-        $padding = str_repeat(' ', $expectedIndent);
+        $padding = str_repeat(' ', $expectedCloseBraceIndent);
         if ($foundIndent === 0) {
             $phpcsFile->fixer->addContentBefore($arrayEnd, $padding);
         } else {