Tokenizer/PHP: bug fix in improved context sensitive keyword support [1]

As reported in 3607, the `eval` keyword was not included in the list of context sensitive keyword. This is a regression compared to PHPCS 3.6.2. Fixed now, including unit tests. Fixes 3607
squizlabs · Jun 12, 2022 · 854aba7 · 854aba7
1 parent 5e27199
commit 854aba7
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 0 deletions.
diff --git a/src/Util/Tokens.php b/src/Util/Tokens.php
@@ -694,6 +694,7 @@ final class Tokens
         T_ENDSWITCH    => T_ENDSWITCH,
         T_ENDWHILE     => T_ENDWHILE,
         T_ENUM         => T_ENUM,
+        T_EVAL         => T_EVAL,
         T_EXIT         => T_EXIT,
         T_EXTENDS      => T_EXTENDS,
         T_FINAL        => T_FINAL,

diff --git a/tests/Core/Tokenizer/ContextSensitiveKeywordsTest.inc b/tests/Core/Tokenizer/ContextSensitiveKeywordsTest.inc
@@ -29,6 +29,7 @@ class ContextSensitiveKeywords
     const /* testEndSwitch */ ENDSWITCH = 'ENDSWITCH';
     const /* testEndWhile */ ENDWHILE = 'ENDWHILE';
     const /* testEnum */ ENUM = 'ENUM';
+    const /* testEval */ EVAL = 'EVAL';
     const /* testExit */ EXIT = 'EXIT';
     const /* testExtends */ EXTENDS = 'EXTENDS';
     const /* testFinal */ FINAL = 'FINAL';
@@ -165,6 +166,8 @@ echo $foo;
 print $foo;
 /* testDieIsKeyword */
 die($foo);
+/* testEvalIsKeyword */
+eval('<?php echo 5;');
 /* testExitIsKeyword */
 exit;
 
@@ -212,3 +215,5 @@ $instantiated3 = new /* testClassInstantiationStaticIsKeyword */ static($param);
 
 class Foo extends /* testNamespaceInNameIsKeyword */ namespace\Exception
 {}
+
+function /* testKeywordAfterFunctionShouldBeString */ eval() {}
diff --git a/tests/Core/Tokenizer/ContextSensitiveKeywordsTest.php b/tests/Core/Tokenizer/ContextSensitiveKeywordsTest.php
@@ -72,6 +72,7 @@ public function dataStrings()
             ['/* testEndSwitch */'],
             ['/* testEndWhile */'],
             ['/* testEnum */'],
+            ['/* testEval */'],
             ['/* testExit */'],
             ['/* testExtends */'],
             ['/* testFinal */'],
@@ -121,6 +122,8 @@ public function dataStrings()
             ['/* testNamespaceNameIsString1 */'],
             ['/* testNamespaceNameIsString2 */'],
             ['/* testNamespaceNameIsString3 */'],
+
+            ['/* testKeywordAfterFunctionShouldBeString */'],
         ];
 
     }//end dataStrings()
@@ -376,6 +379,10 @@ public function dataKeywords()
                 '/* testDieIsKeyword */',
                 'T_EXIT',
             ],
+            [
+                '/* testEvalIsKeyword */',
+                'T_EVAL',
+            ],
             [
                 '/* testExitIsKeyword */',
                 'T_EXIT',