From 7aa2d3519b09d37c908bce080f68bfb4d064bbaf Mon Sep 17 00:00:00 2001 From: =?utf8?q?M=C3=A1t=C3=A9=20Kocsis?= Date: Mon, 28 Sep 2020 22:19:20 +0200 Subject: [PATCH] Zend parameter renames amendment Closes GH-6228 --- Zend/tests/015.phpt | 4 ++-- Zend/tests/exception_handler_004.phpt | 4 ++-- Zend/zend_builtin_functions.stub.php | 8 ++++---- Zend/zend_builtin_functions_arginfo.h | 10 +++++----- Zend/zend_closures.stub.php | 2 +- Zend/zend_closures_arginfo.h | 4 ++-- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/Zend/tests/015.phpt b/Zend/tests/015.phpt index 8c4dd62d39..d492590bcd 100644 --- a/Zend/tests/015.phpt +++ b/Zend/tests/015.phpt @@ -23,8 +23,8 @@ var_dump(trigger_error("error", E_USER_DEPRECATED)); --EXPECTF-- Notice: error in %s on line %d bool(true) -trigger_error(): Argument #2 ($error_type) must be one of E_USER_ERROR, E_USER_WARNING, E_USER_NOTICE, or E_USER_DEPRECATED -trigger_error(): Argument #2 ($error_type) must be one of E_USER_ERROR, E_USER_WARNING, E_USER_NOTICE, or E_USER_DEPRECATED +trigger_error(): Argument #2 ($error_level) must be one of E_USER_ERROR, E_USER_WARNING, E_USER_NOTICE, or E_USER_DEPRECATED +trigger_error(): Argument #2 ($error_level) must be one of E_USER_ERROR, E_USER_WARNING, E_USER_NOTICE, or E_USER_DEPRECATED Warning: error in %s on line %d bool(true) diff --git a/Zend/tests/exception_handler_004.phpt b/Zend/tests/exception_handler_004.phpt index 9b2ae6933a..a9f9e77a59 100644 --- a/Zend/tests/exception_handler_004.phpt +++ b/Zend/tests/exception_handler_004.phpt @@ -16,5 +16,5 @@ try { ?> --EXPECT-- -set_exception_handler(): Argument #1 ($exception_handler) must be a valid callback or null, function "fo" not found or invalid function name -set_exception_handler(): Argument #1 ($exception_handler) must be a valid callback or null, class "" not found +set_exception_handler(): Argument #1 ($callback) must be a valid callback or null, function "fo" not found or invalid function name +set_exception_handler(): Argument #1 ($callback) must be a valid callback or null, class "" not found diff --git a/Zend/zend_builtin_functions.stub.php b/Zend/zend_builtin_functions.stub.php index eaf2ac490a..6209967b23 100644 --- a/Zend/zend_builtin_functions.stub.php +++ b/Zend/zend_builtin_functions.stub.php @@ -68,18 +68,18 @@ function get_included_files(): array {} /** @alias get_included_files */ function get_required_files(): array {} -function trigger_error(string $message, int $error_type = E_USER_NOTICE): bool {} +function trigger_error(string $message, int $error_level = E_USER_NOTICE): bool {} /** @alias trigger_error */ -function user_error(string $message, int $error_type = E_USER_NOTICE): bool {} +function user_error(string $message, int $error_level = E_USER_NOTICE): bool {} /** @return string|array|object|null */ -function set_error_handler(?callable $error_handler, int $error_types = E_ALL) {} +function set_error_handler(?callable $callback, int $error_levels = E_ALL) {} function restore_error_handler(): bool {} /** @return string|array|object|null */ -function set_exception_handler(?callable $exception_handler) {} +function set_exception_handler(?callable $callback) {} function restore_exception_handler(): bool {} diff --git a/Zend/zend_builtin_functions_arginfo.h b/Zend/zend_builtin_functions_arginfo.h index d10e2c3d68..d5d2fb9113 100644 --- a/Zend/zend_builtin_functions_arginfo.h +++ b/Zend/zend_builtin_functions_arginfo.h @@ -1,5 +1,5 @@ /* This is a generated file, edit the .stub.php file instead. - * Stub hash: fed3b572fbcae7bda87efc377b56e027da12b511 */ + * Stub hash: 9a77101b93e8584315bf43305830e129d359b033 */ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_zend_version, 0, 0, IS_STRING, 0) ZEND_END_ARG_INFO() @@ -124,21 +124,21 @@ ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_trigger_error, 0, 1, _IS_BOOL, 0) ZEND_ARG_TYPE_INFO(0, message, IS_STRING, 0) - ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, error_type, IS_LONG, 0, "E_USER_NOTICE") + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, error_level, IS_LONG, 0, "E_USER_NOTICE") ZEND_END_ARG_INFO() #define arginfo_user_error arginfo_trigger_error ZEND_BEGIN_ARG_INFO_EX(arginfo_set_error_handler, 0, 0, 1) - ZEND_ARG_TYPE_INFO(0, error_handler, IS_CALLABLE, 1) - ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, error_types, IS_LONG, 0, "E_ALL") + ZEND_ARG_TYPE_INFO(0, callback, IS_CALLABLE, 1) + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, error_levels, IS_LONG, 0, "E_ALL") ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_restore_error_handler, 0, 0, _IS_BOOL, 0) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(arginfo_set_exception_handler, 0, 0, 1) - ZEND_ARG_TYPE_INFO(0, exception_handler, IS_CALLABLE, 1) + ZEND_ARG_TYPE_INFO(0, callback, IS_CALLABLE, 1) ZEND_END_ARG_INFO() #define arginfo_restore_exception_handler arginfo_restore_error_handler diff --git a/Zend/zend_closures.stub.php b/Zend/zend_closures.stub.php index 875ee69203..906dedc5cf 100644 --- a/Zend/zend_closures.stub.php +++ b/Zend/zend_closures.stub.php @@ -14,7 +14,7 @@ final class Closure public function bindTo(?object $newThis, object|string|null $newScope = "static"): ?Closure {} - public function call(object $newThis, mixed ...$arguments): mixed {} + public function call(object $newThis, mixed ...$args): mixed {} public static function fromCallable(callable $callback): Closure {} } diff --git a/Zend/zend_closures_arginfo.h b/Zend/zend_closures_arginfo.h index 1a01ab2810..1ccde0d6dd 100644 --- a/Zend/zend_closures_arginfo.h +++ b/Zend/zend_closures_arginfo.h @@ -1,5 +1,5 @@ /* This is a generated file, edit the .stub.php file instead. - * Stub hash: 6c9840dd5c2e4c597cd0133bf2d0b523c272d3fe */ + * Stub hash: 0a2dd53716d30893aa5dd92a9907b2298abb3f70 */ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Closure___construct, 0, 0, 0) ZEND_END_ARG_INFO() @@ -17,7 +17,7 @@ ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Closure_call, 0, 1, IS_MIXED, 0) ZEND_ARG_TYPE_INFO(0, newThis, IS_OBJECT, 0) - ZEND_ARG_VARIADIC_TYPE_INFO(0, arguments, IS_MIXED, 0) + ZEND_ARG_VARIADIC_TYPE_INFO(0, args, IS_MIXED, 0) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_Closure_fromCallable, 0, 1, Closure, 0) -- 2.40.0