From 4b2e3f246544d19bdeb5e737719c1abf08a32485 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Tue, 29 Sep 2020 15:21:32 +0200 Subject: [PATCH 1/2] Update ext/tokenizer param names --- ext/tokenizer/tokenizer.stub.php | 4 ++-- ext/tokenizer/tokenizer_arginfo.h | 11 ++++------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/ext/tokenizer/tokenizer.stub.php b/ext/tokenizer/tokenizer.stub.php index 72d61ad8560a2..5ecf46d0cc041 100644 --- a/ext/tokenizer/tokenizer.stub.php +++ b/ext/tokenizer/tokenizer.stub.php @@ -2,9 +2,9 @@ /** @generate-function-entries */ -function token_get_all(string $source, int $flags = 0): array {} +function token_get_all(string $code, int $flags = 0): array {} -function token_name(int $token): string {} +function token_name(int $token_id): string {} class PhpToken implements Stringable { diff --git a/ext/tokenizer/tokenizer_arginfo.h b/ext/tokenizer/tokenizer_arginfo.h index 6e313cd0de384..b7407a7fa4227 100644 --- a/ext/tokenizer/tokenizer_arginfo.h +++ b/ext/tokenizer/tokenizer_arginfo.h @@ -1,19 +1,16 @@ /* This is a generated file, edit the .stub.php file instead. - * Stub hash: d8e8b4d749c2960b33fd20b27a1abf033604d4e2 */ + * Stub hash: f19668313f95a078ec054f754e8f6d6044365530 */ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_token_get_all, 0, 1, IS_ARRAY, 0) - ZEND_ARG_TYPE_INFO(0, source, IS_STRING, 0) + ZEND_ARG_TYPE_INFO(0, code, IS_STRING, 0) ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, flags, IS_LONG, 0, "0") ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_token_name, 0, 1, IS_STRING, 0) - ZEND_ARG_TYPE_INFO(0, token, IS_LONG, 0) + ZEND_ARG_TYPE_INFO(0, token_id, IS_LONG, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_PhpToken_getAll, 0, 1, IS_ARRAY, 0) - ZEND_ARG_TYPE_INFO(0, code, IS_STRING, 0) - ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, flags, IS_LONG, 0, "0") -ZEND_END_ARG_INFO() +#define arginfo_class_PhpToken_getAll 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) From dba81b9b3d08bd300ebbf8bffb689c9e7db9bc2a Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Tue, 29 Sep 2020 15:43:45 +0200 Subject: [PATCH 2/2] $token_id -> $id --- ext/tokenizer/tokenizer.stub.php | 2 +- ext/tokenizer/tokenizer_arginfo.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ext/tokenizer/tokenizer.stub.php b/ext/tokenizer/tokenizer.stub.php index 5ecf46d0cc041..a3a4246a1af6a 100644 --- a/ext/tokenizer/tokenizer.stub.php +++ b/ext/tokenizer/tokenizer.stub.php @@ -4,7 +4,7 @@ function token_get_all(string $code, int $flags = 0): array {} -function token_name(int $token_id): string {} +function token_name(int $id): string {} class PhpToken implements Stringable { diff --git a/ext/tokenizer/tokenizer_arginfo.h b/ext/tokenizer/tokenizer_arginfo.h index b7407a7fa4227..8bf694074e2e1 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: f19668313f95a078ec054f754e8f6d6044365530 */ + * Stub hash: ef39f4efec05a3ebc5cf56a6b26e01369f00d129 */ 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) @@ -7,7 +7,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_token_get_all, 0, 1, IS_ARRAY, 0 ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_token_name, 0, 1, IS_STRING, 0) - ZEND_ARG_TYPE_INFO(0, token_id, IS_LONG, 0) + ZEND_ARG_TYPE_INFO(0, id, IS_LONG, 0) ZEND_END_ARG_INFO() #define arginfo_class_PhpToken_getAll arginfo_token_get_all