Skip to content

Commit 78d1645

Browse files
committed
Tokens::$contextSensitiveKeywords: remove asym keywords
These tokens are not single word keywords, so do not belong in this list. Includes updating the test code to allow for the new tests to still pass.
1 parent 3bc7291 commit 78d1645

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

src/Util/Tokens.php

-3
Original file line numberDiff line numberDiff line change
@@ -747,11 +747,8 @@ final class Tokens
747747
T_NEW => T_NEW,
748748
T_PRINT => T_PRINT,
749749
T_PRIVATE => T_PRIVATE,
750-
T_PRIVATE_SET => T_PRIVATE_SET,
751750
T_PROTECTED => T_PROTECTED,
752-
T_PROTECTED_SET => T_PROTECTED_SET,
753751
T_PUBLIC => T_PUBLIC,
754-
T_PUBLIC_SET => T_PUBLIC_SET,
755752
T_READONLY => T_READONLY,
756753
T_REQUIRE => T_REQUIRE,
757754
T_REQUIRE_ONCE => T_REQUIRE_ONCE,

tests/Core/Tokenizers/PHP/ContextSensitiveKeywordsTest.php

+9-1
Original file line numberDiff line numberDiff line change
@@ -155,8 +155,16 @@ public static function dataStrings()
155155
*/
156156
public function testKeywords($testMarker, $expectedTokenType)
157157
{
158+
$tokenTargets = Tokens::$contextSensitiveKeywords;
159+
$tokenTargets[] = T_STRING;
160+
$tokenTargets[] = T_ANON_CLASS;
161+
$tokenTargets[] = T_MATCH_DEFAULT;
162+
$tokenTargets[] = T_PRIVATE_SET;
163+
$tokenTargets[] = T_PROTECTED_SET;
164+
$tokenTargets[] = T_PUBLIC_SET;
165+
158166
$tokens = $this->phpcsFile->getTokens();
159-
$target = $this->getTargetToken($testMarker, (Tokens::$contextSensitiveKeywords + [T_ANON_CLASS, T_MATCH_DEFAULT, T_STRING]));
167+
$target = $this->getTargetToken($testMarker, $tokenTargets);
160168
$tokenArray = $tokens[$target];
161169

162170
$this->assertSame(

0 commit comments

Comments
 (0)