From 4c2222c49397901e28d0827c853985d445f171cf Mon Sep 17 00:00:00 2001
From: Gregor Harlan <mail@gh01.de>
Date: Wed, 25 Jul 2018 00:28:55 +0200
Subject: [PATCH] ExplicitStringVariableFixer - fix array handling

---
 src/Fixer/StringNotation/ExplicitStringVariableFixer.php    | 6 ++++++
 .../StringNotation/ExplicitStringVariableFixerTest.php      | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/Fixer/StringNotation/ExplicitStringVariableFixer.php b/src/Fixer/StringNotation/ExplicitStringVariableFixer.php
index dca33542ec7..ee205c5c120 100644
--- 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
index bb35ca39959..ce4e9d4a07a 100644
--- 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";',