TokensAnalyzer - fix isConstantInvocation

PHP-CS-Fixer · Aug 19, 2018 · 53b196c · 53b196c
1 parent 0790602
commit 53b196c
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 0 deletions.
diff --git a/src/Tokenizer/TokensAnalyzer.php b/src/Tokenizer/TokensAnalyzer.php
@@ -355,6 +355,15 @@ public function isConstantInvocation($index)
             }
         }
 
+        // check for array in double quoted string: `"..$foo[bar].."`
+        if ($this->tokens[$prevIndex]->equals('[') && $this->tokens[$nextIndex]->equals(']')) {
+            $checkToken = $this->tokens[$this->tokens->getNextMeaningfulToken($nextIndex)];
+
+            if ($checkToken->equals('"') || $checkToken->isGivenKind([T_CURLY_OPEN, T_DOLLAR_OPEN_CURLY_BRACES, T_ENCAPSED_AND_WHITESPACE, T_VARIABLE])) {
+                return false;
+            }
+        }
+
         // check for goto label
         if ($this->tokens[$nextIndex]->equals(':') && $this->tokens[$prevIndex]->equalsAny([';', '}', [T_OPEN_TAG], [T_OPEN_TAG_WITH_ECHO]])) {
             return false;

diff --git a/tests/Tokenizer/TokensAnalyzerTest.php b/tests/Tokenizer/TokensAnalyzerTest.php
@@ -544,6 +544,10 @@ public function provideIsConstantInvocationCases()
                 '<?php echo FOO & $bar;',
                 [3 => true],
             ],
+            [
+                '<?php echo $foo[BAR];',
+                [5 => true],
+            ],
             [
                 '<?php echo FOO[BAR];',
                 [3 => true, 5 => true],
@@ -644,6 +648,14 @@ public function provideIsConstantInvocationCases()
                 '<?php try {} catch (FOO $e) {}',
                 [9 => false],
             ],
+            [
+                '<?php "$foo[BAR]";',
+                [4 => false],
+            ],
+            [
+                '<?php "{$foo[BAR]}";',
+                [5 => true],
+            ],
             [
                 '<?php FOO: goto FOO;',
                 [1 => false, 6 => false],