From: Nikita Popov Date: Tue, 21 Jul 2020 13:30:59 +0000 (+0200) Subject: Tweak zend_test arginfo/zpp X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=df2749da70c40605799c5328bb545fb6d1709154;p=php Tweak zend_test arginfo/zpp --- diff --git a/ext/zend_test/test.c b/ext/zend_test/test.c index bc6860c4d7..413a6a302f 100644 --- a/ext/zend_test/test.c +++ b/ext/zend_test/test.c @@ -45,16 +45,12 @@ ZEND_FUNCTION(zend_test_func) ZEND_FUNCTION(zend_test_array_return) { - zval *arg1, *arg2; - - zend_parse_parameters(ZEND_NUM_ARGS(), "|zz", &arg1, &arg2); + ZEND_PARSE_PARAMETERS_NONE(); } ZEND_FUNCTION(zend_test_nullable_array_return) { - zval *arg1, *arg2; - - zend_parse_parameters(ZEND_NUM_ARGS(), "|zz", &arg1, &arg2); + ZEND_PARSE_PARAMETERS_NONE(); } ZEND_FUNCTION(zend_test_void_return) diff --git a/ext/zend_test/test.stub.php b/ext/zend_test/test.stub.php index 0cc00b4a32..be8402aab7 100644 --- a/ext/zend_test/test.stub.php +++ b/ext/zend_test/test.stub.php @@ -20,7 +20,7 @@ function zend_test_nullable_array_return(): ?array {} function zend_test_void_return(): void {} /** @deprecated */ -function zend_test_deprecated(): void {} +function zend_test_deprecated($arg = UNKNOWN): void {} function zend_create_unterminated_string(string $str): string {} diff --git a/ext/zend_test/test_arginfo.h b/ext/zend_test/test_arginfo.h index d65ce2220c..b406edf24f 100644 --- a/ext/zend_test/test_arginfo.h +++ b/ext/zend_test/test_arginfo.h @@ -1,5 +1,5 @@ /* This is a generated file, edit the .stub.php file instead. - * Stub hash: d04baf2ffeb73d2e48f806316407ec720ea6f176 */ + * Stub hash: d2f58424106d78e0bb3b363c34fa94472b5e758d */ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_zend_test_array_return, 0, 0, IS_ARRAY, 0) ZEND_END_ARG_INFO() @@ -10,7 +10,9 @@ ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_zend_test_void_return, 0, 0, IS_VOID, 0) ZEND_END_ARG_INFO() -#define arginfo_zend_test_deprecated arginfo_zend_test_void_return +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_zend_test_deprecated, 0, 0, IS_VOID, 0) + ZEND_ARG_INFO(0, arg) +ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_zend_create_unterminated_string, 0, 1, IS_STRING, 0) ZEND_ARG_TYPE_INFO(0, str, IS_STRING, 0)