Fixed type vs string

Allow both type and value to be checked
nikic · Nov 8, 2020 · 0300270 · 0300270
1 parent 1d1bc8a
commit 0300270
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/lib/PhpParser/Internal/TokenStream.php b/lib/PhpParser/Internal/TokenStream.php
@@ -64,7 +64,8 @@ public function haveTokenImmediatelyBefore(int $pos, $expectedTokenType) : bool
         $tokens = $this->tokens;
         $pos--;
         for (; $pos >= 0; $pos--) {
-            $tokenType = $tokens[$pos][0];
+            $index = is_string($expectedTokenType)?1:0;
+            $tokenType = $tokens[$pos][$index];
             if ($tokenType === $expectedTokenType) {
                 return true;
             }
@@ -90,7 +91,8 @@ public function haveTokenImmediatelyAfter(int $pos, $expectedTokenType) : bool {
         $tokens = $this->tokens;
         $pos++;
         for (; $pos < \count($tokens); $pos++) {
-            $tokenType = $tokens[$pos][0];
+            $index = is_string($expectedTokenType)?1:0;
+            $tokenType = $tokens[$pos][$index];
             if ($tokenType === $expectedTokenType) {
                 return true;
             }