From acaf3fecad7f2ee0d82bb51ea680e396aae07b97 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Thu, 23 Jul 2020 12:28:13 +0200 Subject: [PATCH] Implement emulation of PHP 8 T_NAME_* tokens Like comment emulation, this is unconditional, as it is required for core functionality. --- lib/PhpParser/Lexer.php | 68 +++++++++++++++++++++++++++++++++--- test/PhpParser/LexerTest.php | 12 +++++++ 2 files changed, 75 insertions(+), 5 deletions(-) diff --git a/lib/PhpParser/Lexer.php b/lib/PhpParser/Lexer.php index c87811f52c..f12fd89269 100644 --- a/lib/PhpParser/Lexer.php +++ b/lib/PhpParser/Lexer.php @@ -34,14 +34,25 @@ class Lexer * first three. For more info see getNextToken() docs. */ public function __construct(array $options = []) { - // map from internal tokens to PhpParser tokens - $this->tokenMap = $this->createTokenMap(); - - // Compatibility define for PHP < 7.4 + // Compatibility define for PHP < 7.4. if (!defined('T_BAD_CHARACTER')) { \define('T_BAD_CHARACTER', -1); } + // Compatibility defines for PHP < 8.0. + if (!defined('T_NAME_QUALIFIED')) { + \define('T_NAME_QUALIFIED', -2); + } + if (!defined('T_NAME_FULLY_QUALIFIED')) { + \define('T_NAME_FULLY_QUALIFIED', -3); + } + if (!defined('T_NAME_RELATIVE')) { + \define('T_NAME_RELATIVE', -4); + } + + // Create Map from internal tokens to PhpParser tokens. + $this->tokenMap = $this->createTokenMap(); + // map of tokens to drop while lexing (the map is only used for isset lookup, // that's why the value is simply set to 1; the value is never actually used.) $this->dropTokens = array_fill_keys( @@ -138,7 +149,9 @@ protected function postprocessTokens(ErrorHandler $errorHandler) { // by checking if a trailing comment has a "*/" at the end. // // Additionally, we canonicalize to the PHP 8 comment format here, which does not include - // the trailing whitespace anymore + // the trailing whitespace anymore. + // + // We also canonicalize to the PHP 8 T_NAME_* tokens. $filePos = 0; $line = 1; @@ -170,6 +183,46 @@ protected function postprocessTokens(ErrorHandler $errorHandler) { } } + // Emulate PHP 8 T_NAME_* tokens, by combining sequences of T_NS_SEPARATOR and T_STRING + // into a single token. + // TODO: Also handle reserved keywords in namespaced names. + if (\is_array($token) + && ($token[0] === \T_NS_SEPARATOR || $token[0] === \T_STRING || $token[0] === \T_NAMESPACE)) { + $lastWasSeparator = $token[0] === \T_NS_SEPARATOR; + $text = $token[1]; + for ($j = $i + 1; isset($this->tokens[$j]); $j++) { + if ($lastWasSeparator) { + if ($this->tokens[$j][0] !== \T_STRING) { + break; + } + $lastWasSeparator = false; + } else { + if ($this->tokens[$j][0] !== \T_NS_SEPARATOR) { + break; + } + $lastWasSeparator = true; + } + $text .= $this->tokens[$j][1]; + } + if ($lastWasSeparator) { + // Trailing separator is not part of the name. + $j--; + $text = substr($text, 0, -1); + } + if ($j > $i + 1) { + if ($token[0] === \T_NS_SEPARATOR) { + $type = \T_NAME_FULLY_QUALIFIED; + } else if ($token[0] === \T_NAMESPACE) { + $type = \T_NAME_RELATIVE; + } else { + $type = \T_NAME_QUALIFIED; + } + $token = [$type, $text, $line]; + array_splice($this->tokens, $i, $j - $i, [$token]); + $numTokens -= $j - $i - 1; + } + } + $tokenValue = \is_string($token) ? $token : $token[1]; $tokenLen = \strlen($tokenValue); @@ -409,6 +462,11 @@ protected function createTokenMap() : array { $tokenMap[\T_COMPILER_HALT_OFFSET] = Tokens::T_STRING; } + // Assign tokens for which we define compatibility constants, as token_name() does not know them. + $tokenMap[\T_NAME_QUALIFIED] = Tokens::T_NAME_QUALIFIED; + $tokenMap[\T_NAME_FULLY_QUALIFIED] = Tokens::T_NAME_FULLY_QUALIFIED; + $tokenMap[\T_NAME_RELATIVE] = Tokens::T_NAME_RELATIVE; + return $tokenMap; } } diff --git a/test/PhpParser/LexerTest.php b/test/PhpParser/LexerTest.php index 79aea443ac..bbb13e02a1 100644 --- a/test/PhpParser/LexerTest.php +++ b/test/PhpParser/LexerTest.php @@ -215,6 +215,18 @@ public function provideTestLex() { [], [] ], + // tests PHP 8 T_NAME_* emulation + [ + ' []], + [ + [Tokens::T_NAME_QUALIFIED, 'Foo\Bar', [], []], + [Tokens::T_NAME_FULLY_QUALIFIED, '\Foo\Bar', [], []], + [Tokens::T_NAME_RELATIVE, 'namespace\Foo\Bar', [], []], + [Tokens::T_NAME_QUALIFIED, 'Foo\Bar', [], []], + [Tokens::T_NS_SEPARATOR, '\\', [], []], + ] + ], ]; }