archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 13:38:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Zend parameter renames amendment

Browse source 
Closes GH-6228
This commit is contained in:
Máté Kocsis 2020-09-28 22:19:20 +02:00
parent de2d38d531
commit 7aa2d3519b
No known key found for this signature in database
GPG key ID: FD055E41728BF310
6 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Zend/tests/015.phpt
View file

@ -23,8 +23,8 @@ var_dump(trigger_error("error", E_USER_DEPRECATED));
--EXPECTF-- --EXPECTF--
Notice: error in %s on line %d Notice: error in %s on line %d
bool(true) 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_level) 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
Warning: error in %s on line %d Warning: error in %s on line %d
bool(true) bool(true)

4
Zend/tests/exception_handler_004.phpt
View file

@ -16,5 +16,5 @@ try {
?> ?>
--EXPECT-- --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 ($callback) 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, class "" not found

8
Zend/zend_builtin_functions.stub.php
View file

@ -68,18 +68,18 @@ function get_included_files(): array {}
/** @alias get_included_files */ /** @alias get_included_files */
function get_required_files(): array {} 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 */ /** @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 */ /** @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 {} function restore_error_handler(): bool {}
/** @return string|array|object|null */ /** @return string|array|object|null */
function set_exception_handler(?callable $exception_handler) {} function set_exception_handler(?callable $callback) {}
function restore_exception_handler(): bool {} function restore_exception_handler(): bool {}

10
Zend/zend_builtin_functions_arginfo.h
View file

@ -1,5 +1,5 @@
/* This is a generated file, edit the .stub.php file instead. /* 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_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_zend_version, 0, 0, IS_STRING, 0)
ZEND_END_ARG_INFO() 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_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(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() ZEND_END_ARG_INFO()
#define arginfo_user_error arginfo_trigger_error #define arginfo_user_error arginfo_trigger_error
ZEND_BEGIN_ARG_INFO_EX(arginfo_set_error_handler, 0, 0, 1) 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(0, callback, IS_CALLABLE, 1)
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, error_types, IS_LONG, 0, "E_ALL") ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, error_levels, IS_LONG, 0, "E_ALL")
ZEND_END_ARG_INFO() ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_restore_error_handler, 0, 0, _IS_BOOL, 0) ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_restore_error_handler, 0, 0, _IS_BOOL, 0)
ZEND_END_ARG_INFO() ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_INFO_EX(arginfo_set_exception_handler, 0, 0, 1) 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() ZEND_END_ARG_INFO()
#define arginfo_restore_exception_handler arginfo_restore_error_handler #define arginfo_restore_exception_handler arginfo_restore_error_handler

2
Zend/zend_closures.stub.php
View file

@ -14,7 +14,7 @@ final class Closure
public function bindTo(?object $newThis, object|string|null $newScope = "static"): ?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 {} public static function fromCallable(callable $callback): Closure {}
} }

4
Zend/zend_closures_arginfo.h
View file

@ -1,5 +1,5 @@
/* This is a generated file, edit the .stub.php file instead. /* 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_BEGIN_ARG_INFO_EX(arginfo_class_Closure___construct, 0, 0, 0)
ZEND_END_ARG_INFO() 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_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_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_END_ARG_INFO()
ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_Closure_fromCallable, 0, 1, Closure, 0) ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_Closure_fromCallable, 0, 1, Closure, 0)