ErickSkrauch/align_multiline_parameters now supports non-latin types and variable names

Author: erickskrauch

CHANGELOG.md

@@ -5,6 +5,9 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+### Added
+- `ErickSkrauch/align_multiline_parameters` now correctly handle non-latin types and variables names (but you still shouldn't do that).
+
 ### Fixed
 - Bug #6: `ErickSkrauch/align_multiline_parameters` not working correctly with unions and intersections.
 

src/FunctionNotation/AlignMultilineParametersFixer.php

@@ -74,7 +74,8 @@ public function isCandidate(Tokens $tokens): bool {
     }
 
     /**
-     * Must run after StatementIndentationFixer, MethodArgumentSpaceFixer, CompactNullableTypehintFixer
+     * Must run after StatementIndentationFixer, MethodArgumentSpaceFixer, CompactNullableTypehintFixer,
+     *                SingleSpaceAroundConstructFixer
      */
     public function getPriority(): int {
         return -10;
@@ -132,7 +133,7 @@ protected function applyFix(SplFileInfo $file, Tokens $tokens): void {
                     }
                 }
 
-                $variableNameLength = strlen($argument->getName());
+                $variableNameLength = mb_strlen($argument->getName());
                 if ($variableNameLength > $longestVariableName) {
                     $longestVariableName = $variableNameLength;
                 }
@@ -170,7 +171,7 @@ protected function applyFix(SplFileInfo $file, Tokens $tokens): void {
                     /** @var \PhpCsFixer\Tokenizer\Token $equalToken */
                     $equalToken = $tokens[$tokens->getNextMeaningfulToken($argument->getNameIndex())];
                     if ($equalToken->getContent() === '=') {
-                        $nameLen = strlen($argument->getName());
+                        $nameLen = mb_strlen($argument->getName());
                         $whitespaceIndex = $argument->getNameIndex() + 1;
                         if ($this->configuration[self::C_DEFAULTS] === true) {
                             $tokens->ensureWhitespaceAtIndex($whitespaceIndex, 0, str_repeat(' ', $longestVariableName - $nameLen + 1));
@@ -193,7 +194,7 @@ private function getFullTypeLength(Tokens $tokens, int $typeIndex): int {
         $typeLength = 0;
         $varNameTokenIndex = $tokens->getNextTokenOfKind($typeIndex, [[T_VARIABLE]]);
         for ($i = $typeIndex; $i < $varNameTokenIndex - 1; $i++) { // -1 to avoid whitespace between param name and type
-            $typeLength += strlen($tokens[$i]->getContent());
+            $typeLength += mb_strlen($tokens[$i]->getContent());
         }
 
         $possiblyReadonlyToken = $tokens[$typeIndex - 2];

tests/FunctionNotation/AlignMultilineParametersFixerTest.php

@@ -196,6 +196,23 @@ public function foo(
             ) => $int;
             ',
         ];
+
+        yield 'non-latin type and variable name' => [
+            '<?php
+            interface Жыве {}
+            function test(
+                string $string   = "string",
+                Жыве   $Беларусь = null
+            ): void {}
+            ',
+            '<?php
+            interface Жыве {}
+            function test(
+                string $string = "string",
+                Жыве $Беларусь = null
+            ): void {}
+            ',
+        ];
     }
 
     /**