From: Nikita Popov Date: Mon, 9 Nov 2020 08:40:31 +0000 (+0100) Subject: Rename PhpToken::getAll() to PhpToken::tokenize() X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b1019f46ed79599df76cad1bc06587083f477b19;p=php Rename PhpToken::getAll() to PhpToken::tokenize() See https://externals.io/message/112189. Fixes bug #80328. --- diff --git a/NEWS b/NEWS index 95aa4618a7..9e7efeaf97 100644 --- a/NEWS +++ b/NEWS @@ -27,6 +27,9 @@ PHP NEWS message). (Nikita) . Fixed bug #80266 (parse_url silently drops port number 0). (cmb, Nikita) +- Tokenizer: + . Fixed bug #80328 (PhpToken::getAll() confusing name). (Nikita) + 29 Oct 2020, PHP 8.0.0RC3 - Core: diff --git a/ext/tokenizer/tests/PhpToken_extension.phpt b/ext/tokenizer/tests/PhpToken_extension.phpt index ef1a4f1272..b41843c060 100644 --- a/ext/tokenizer/tests/PhpToken_extension.phpt +++ b/ext/tokenizer/tests/PhpToken_extension.phpt @@ -20,7 +20,7 @@ class MyPhpToken extends PhpToken { } } -foreach (MyPhpToken::getAll($code) as $token) { +foreach (MyPhpToken::tokenize($code) as $token) { echo $token->getLoweredText(); if ($token->extra !== 123) { diff --git a/ext/tokenizer/tests/PhpToken_extension_errors.phpt b/ext/tokenizer/tests/PhpToken_extension_errors.phpt index d2bee1bc8f..72164f398c 100644 --- a/ext/tokenizer/tests/PhpToken_extension_errors.phpt +++ b/ext/tokenizer/tests/PhpToken_extension_errors.phpt @@ -10,7 +10,7 @@ class MyPhpToken1 extends PhpToken { } try { - var_dump(MyPhpToken1::getAll("getMessage(), "\n"; } @@ -19,7 +19,7 @@ abstract class MyPhpToken2 extends PhpToken { } try { - var_dump(MyPhpToken2::getAll("getMessage(), "\n"; } diff --git a/ext/tokenizer/tests/PhpToken_methods.phpt b/ext/tokenizer/tests/PhpToken_methods.phpt index 570e880473..269fdf5277 100644 --- a/ext/tokenizer/tests/PhpToken_methods.phpt +++ b/ext/tokenizer/tests/PhpToken_methods.phpt @@ -15,7 +15,7 @@ function foo() { PHP; // Token names and ignorability. -$tokens = PhpToken::getAll($code); +$tokens = PhpToken::tokenize($code); foreach ($tokens as $i => $token) { printf("[%2d] %-26s %s\n", $i, $token->getTokenName(), $token->isIgnorable() ? "ignorable" : "meaningful"); diff --git a/ext/tokenizer/tests/PhpToken_toString.phpt b/ext/tokenizer/tests/PhpToken_toString.phpt index 17dbfa84a7..f4b9e8b118 100644 --- a/ext/tokenizer/tests/PhpToken_toString.phpt +++ b/ext/tokenizer/tests/PhpToken_toString.phpt @@ -3,7 +3,7 @@ PhpToken implements __toString() --FILE-- --FILE-- @@ -11,8 +11,8 @@ function foo() { echo "bar"; } PHP; -var_dump(PhpToken::getAll($code)); -var_dump(PhpToken::getAll($code, TOKEN_PARSE)); +var_dump(PhpToken::tokenize($code)); +var_dump(PhpToken::tokenize($code, TOKEN_PARSE)); ?> --EXPECTF-- diff --git a/ext/tokenizer/tests/bug77966.phpt b/ext/tokenizer/tests/bug77966.phpt index 142cc7c9ab..db2ed83738 100644 --- a/ext/tokenizer/tests/bug77966.phpt +++ b/ext/tokenizer/tests/bug77966.phpt @@ -12,7 +12,7 @@ class C { } CODE; -$tokens = PhpToken::getAll($code, TOKEN_PARSE); +$tokens = PhpToken::tokenize($code, TOKEN_PARSE); foreach ($tokens as $token) { echo "{$token->getTokenName()}: \"$token->text\"\n"; } diff --git a/ext/tokenizer/tests/namespaced_names.phpt b/ext/tokenizer/tests/namespaced_names.phpt index 34e947b352..651524b8e4 100644 --- a/ext/tokenizer/tests/namespaced_names.phpt +++ b/ext/tokenizer/tests/namespaced_names.phpt @@ -12,7 +12,7 @@ namespace\Foo Foo \ Bar CODE; -foreach (PhpToken::getAll($code) as $token) { +foreach (PhpToken::tokenize($code) as $token) { echo "{$token->getTokenName()}: \"$token->text\"\n"; } diff --git a/ext/tokenizer/tokenizer.c b/ext/tokenizer/tokenizer.c index d12b5edba8..7567a270af 100644 --- a/ext/tokenizer/tokenizer.c +++ b/ext/tokenizer/tokenizer.c @@ -92,7 +92,7 @@ static zend_string *php_token_get_text(zval *obj) { static zend_bool tokenize_common( zval *return_value, zend_string *source, zend_long flags, zend_class_entry *token_class); -PHP_METHOD(PhpToken, getAll) +PHP_METHOD(PhpToken, tokenize) { zend_string *source; zend_long flags = 0; diff --git a/ext/tokenizer/tokenizer.stub.php b/ext/tokenizer/tokenizer.stub.php index a3a4246a1a..c329ef4932 100644 --- a/ext/tokenizer/tokenizer.stub.php +++ b/ext/tokenizer/tokenizer.stub.php @@ -9,7 +9,7 @@ function token_name(int $id): string {} class PhpToken implements Stringable { /** @return static[] */ - public static function getAll(string $code, int $flags = 0): array {} + public static function tokenize(string $code, int $flags = 0): array {} final public function __construct(int $id, string $text, int $line = -1, int $pos = -1) {} diff --git a/ext/tokenizer/tokenizer_arginfo.h b/ext/tokenizer/tokenizer_arginfo.h index 8bf694074e..01d37d406e 100644 --- a/ext/tokenizer/tokenizer_arginfo.h +++ b/ext/tokenizer/tokenizer_arginfo.h @@ -1,5 +1,5 @@ /* This is a generated file, edit the .stub.php file instead. - * Stub hash: ef39f4efec05a3ebc5cf56a6b26e01369f00d129 */ + * Stub hash: a06da9ea0191ed78ee7af8f0d9eaccb17dfa4b20 */ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_token_get_all, 0, 1, IS_ARRAY, 0) ZEND_ARG_TYPE_INFO(0, code, IS_STRING, 0) @@ -10,7 +10,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_token_name, 0, 1, IS_STRING, 0) ZEND_ARG_TYPE_INFO(0, id, IS_LONG, 0) ZEND_END_ARG_INFO() -#define arginfo_class_PhpToken_getAll arginfo_token_get_all +#define arginfo_class_PhpToken_tokenize arginfo_token_get_all ZEND_BEGIN_ARG_INFO_EX(arginfo_class_PhpToken___construct, 0, 0, 2) ZEND_ARG_TYPE_INFO(0, id, IS_LONG, 0) @@ -35,7 +35,7 @@ ZEND_END_ARG_INFO() ZEND_FUNCTION(token_get_all); ZEND_FUNCTION(token_name); -ZEND_METHOD(PhpToken, getAll); +ZEND_METHOD(PhpToken, tokenize); ZEND_METHOD(PhpToken, __construct); ZEND_METHOD(PhpToken, is); ZEND_METHOD(PhpToken, isIgnorable); @@ -51,7 +51,7 @@ static const zend_function_entry ext_functions[] = { static const zend_function_entry class_PhpToken_methods[] = { - ZEND_ME(PhpToken, getAll, arginfo_class_PhpToken_getAll, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC) + ZEND_ME(PhpToken, tokenize, arginfo_class_PhpToken_tokenize, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC) ZEND_ME(PhpToken, __construct, arginfo_class_PhpToken___construct, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL) ZEND_ME(PhpToken, is, arginfo_class_PhpToken_is, ZEND_ACC_PUBLIC) ZEND_ME(PhpToken, isIgnorable, arginfo_class_PhpToken_isIgnorable, ZEND_ACC_PUBLIC)