bug #3944 ExplicitStringVariableFixer - fix array handling (gharlan)

This PR was merged into the 2.12 branch. Discussion ---------- ExplicitStringVariableFixer - fix array handling fixes #3943 Commits ------- 4c2222c ExplicitStringVariableFixer - fix array handling
PHP-CS-Fixer · Aug 10, 2018 · 33ff29c · 33ff29c
2 parents 853f2ce + 4c2222c
commit 33ff29c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/src/Fixer/StringNotation/ExplicitStringVariableFixer.php b/src/Fixer/StringNotation/ExplicitStringVariableFixer.php
@@ -95,6 +95,12 @@ protected function applyFix(\SplFileInfo $file, Tokens $tokens)
                 foreach ($variableTokens as $variablePartIndex => $variablePartToken) {
                     if ($variablePartToken->isGivenKind(T_NUM_STRING)) {
                         $tokens[$variablePartIndex] = new Token([T_LNUMBER, $variablePartToken->getContent()]);
+
+                        continue;
+                    }
+
+                    if ($variablePartToken->isGivenKind(T_STRING) && $tokens[$variablePartIndex + 1]->equals(']')) {
+                        $tokens[$variablePartIndex] = new Token([T_CONSTANT_ENCAPSED_STRING, "'".$variablePartToken->getContent()."'"]);
                     }
                 }
 

diff --git a/tests/Fixer/StringNotation/ExplicitStringVariableFixerTest.php b/tests/Fixer/StringNotation/ExplicitStringVariableFixerTest.php
@@ -114,8 +114,8 @@ public function provideTestFixCases()
                 '<?php $a = "My name is $array[1] !";',
             ],
             [
-                '<?php $a = "My name is {$array[MY_CONSTANT]} !";',
-                '<?php $a = "My name is $array[MY_CONSTANT] !";',
+                '<?php $a = "My name is {$array[\'foo\']} !";',
+                '<?php $a = "My name is $array[foo] !";',
             ],
             [
                 '<?php $a = "Closure not allowed ${closure}() text";',