Fixed bug #2144 : Squiz.Arrays.ArrayDeclaration does incorrect align …

…calculation in array with cyrillic keys
squizlabs · Aug 29, 2018 · 32351dd · 32351dd
1 parent b0ee3ee
commit 32351dd
Show file tree

Hide file tree

Showing 6 changed files with 52 additions and 6 deletions.
diff --git a/package.xml b/package.xml
@@ -55,6 +55,7 @@ http://pear.php.net/dtd/package-2.0.xsd">
   - Fixed bug #2138 : Tokenizer detects wrong token for php ::class feature with spaces
   - Fixed bug #2143 : PSR2.Namespaces.UseDeclaration does not properly fix "use function" and "use const" statements
     -- Thanks to Chris Wilkinson for the patch
+  - Fixed bug #2144 : Squiz.Arrays.ArrayDeclaration does incorrect align calculation in array with cyrillic keys
  </notes>
  <contents>
   <dir name="/">

diff --git a/src/Standards/Squiz/Sniffs/Arrays/ArrayDeclarationSniff.php b/src/Standards/Squiz/Sniffs/Arrays/ArrayDeclarationSniff.php
@@ -485,14 +485,19 @@ public function processMultiLineArray($phpcsFile, $stackPtr, $arrayStart, $array
                 if ($indexStart === $indexEnd) {
                     $currentEntry['index']         = $indexEnd;
                     $currentEntry['index_content'] = $tokens[$indexEnd]['content'];
+                    $currentEntry['index_length']  = $tokens[$indexEnd]['length'];
                 } else {
                     $currentEntry['index']         = $indexStart;
-                    $currentEntry['index_content'] = $phpcsFile->getTokensAsString($indexStart, ($indexEnd - $indexStart + 1));
+                    $currentEntry['index_content'] = '';
+                    $currentEntry['index_length']  = 0;
+                    for ($i = $indexStart; $i <= $indexEnd; $i++) {
+                        $currentEntry['index_content'] .= $tokens[$i]['content'];
+                        $currentEntry['index_length']  += $tokens[$i]['length'];
+                    }
                 }
 
-                $indexLength = strlen($currentEntry['index_content']);
-                if ($maxLength < $indexLength) {
-                    $maxLength = $indexLength;
+                if ($maxLength < $currentEntry['index_length']) {
+                    $maxLength = $currentEntry['index_length'];
                 }
 
                 // Find the value of this index.
@@ -739,8 +744,8 @@ public function processMultiLineArray($phpcsFile, $stackPtr, $arrayStart, $array
 
             $arrowStart = ($tokens[$index['index']]['column'] + $maxLength + 1);
             if ($tokens[$index['arrow']]['column'] !== $arrowStart) {
-                $expected = ($arrowStart - (strlen($index['index_content']) + $tokens[$index['index']]['column']));
-                $found    = ($tokens[$index['arrow']]['column'] - (strlen($index['index_content']) + $tokens[$index['index']]['column']));
+                $expected = ($arrowStart - ($index['index_length'] + $tokens[$index['index']]['column']));
+                $found    = ($tokens[$index['arrow']]['column'] - ($index['index_length'] + $tokens[$index['index']]['column']));
                 $error    = 'Array double arrow not aligned correctly; expected %s space(s) but found %s';
                 $data     = [
                     $expected,

diff --git a/src/Standards/Squiz/Tests/Arrays/ArrayDeclarationUnitTest.1.inc b/src/Standards/Squiz/Tests/Arrays/ArrayDeclarationUnitTest.1.inc
@@ -393,3 +393,13 @@ HERE
 HERE
       ,
        );
+
+$foo = array(
+        'тип'  => 'авто',
+        'цвет' => 'синий',
+       );
+
+$paths = array(
+          Init::ROOT_DIR.'/тип'  => 'авто',
+          Init::ROOT_DIR.'/цвет' => 'синий',
+         );
diff --git a/src/Standards/Squiz/Tests/Arrays/ArrayDeclarationUnitTest.1.inc.fixed b/src/Standards/Squiz/Tests/Arrays/ArrayDeclarationUnitTest.1.inc.fixed
@@ -421,3 +421,13 @@ HERE
 HERE
 ,
        );
+
+$foo = array(
+        'тип'  => 'авто',
+        'цвет' => 'синий',
+       );
+
+$paths = array(
+          Init::ROOT_DIR.'/тип'  => 'авто',
+          Init::ROOT_DIR.'/цвет' => 'синий',
+         );
diff --git a/src/Standards/Squiz/Tests/Arrays/ArrayDeclarationUnitTest.2.inc b/src/Standards/Squiz/Tests/Arrays/ArrayDeclarationUnitTest.2.inc
@@ -382,3 +382,13 @@ HERE
 HERE
       ,
        ];
+
+$foo = [
+        'тип'  => 'авто',
+        'цвет' => 'синий',
+       ];
+
+$paths = [
+          Init::ROOT_DIR.'/тип'  => 'авто',
+          Init::ROOT_DIR.'/цвет' => 'синий',
+         ];
diff --git a/src/Standards/Squiz/Tests/Arrays/ArrayDeclarationUnitTest.2.inc.fixed b/src/Standards/Squiz/Tests/Arrays/ArrayDeclarationUnitTest.2.inc.fixed
@@ -408,3 +408,13 @@ HERE
 HERE
 ,
        ];
+
+$foo = [
+        'тип'  => 'авто',
+        'цвет' => 'синий',
+       ];
+
+$paths = [
+          Init::ROOT_DIR.'/тип'  => 'авто',
+          Init::ROOT_DIR.'/цвет' => 'синий',
+         ];