diff options
| author | Máté Kocsis <kocsismate@woohoolabs.com> | 2020-10-17 12:01:40 +0200 |
|---|---|---|
| committer | Máté Kocsis <kocsismate@woohoolabs.com> | 2020-10-17 12:01:40 +0200 |
| commit | 7fe9df59783d42d8bd56cdcf81e3609f5e807e51 (patch) | |
| tree | 17fdce4daf371637ff2d1e648cc094ed9a4400da | |
| parent | 84c180d88b291dda66a53073516f49f7ab046f82 (diff) | |
| parent | f076ab0c0cd352cdd70040ba50d40cd229a463ad (diff) | |
| download | php-git-7fe9df59783d42d8bd56cdcf81e3609f5e807e51.tar.gz | |
Merge branch 'PHP-8.0'
| -rwxr-xr-x | ext/standard/basic_functions.stub.php | 3 | ||||
| -rw-r--r-- | ext/standard/basic_functions_arginfo.h | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/ext/standard/basic_functions.stub.php b/ext/standard/basic_functions.stub.php index 915f8b5398..98ea45be6b 100755 --- a/ext/standard/basic_functions.stub.php +++ b/ext/standard/basic_functions.stub.php @@ -528,8 +528,7 @@ function get_html_translation_table(int $table = HTML_SPECIALCHARS, int $flags = function assert(mixed $assertion, Throwable|string|null $description = null): bool {} -/** @param string|callable|null $value */ -function assert_options(int $option, $value = UNKNOWN): array|object|int|string|null {} +function assert_options(int $option, mixed $value = UNKNOWN): array|object|int|string|null {} /* string.c */ diff --git a/ext/standard/basic_functions_arginfo.h b/ext/standard/basic_functions_arginfo.h index 7495807f1b..4cc243b342 100644 --- a/ext/standard/basic_functions_arginfo.h +++ b/ext/standard/basic_functions_arginfo.h @@ -1,5 +1,5 @@ /* This is a generated file, edit the .stub.php file instead. - * Stub hash: 4cac5b648d326f06e5866f32881583c87d9bce73 */ + * Stub hash: 146996b3110f85a6a2d074fb910f0d7aae573358 */ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_set_time_limit, 0, 1, _IS_BOOL, 0) ZEND_ARG_TYPE_INFO(0, seconds, IS_LONG, 0) @@ -796,7 +796,7 @@ ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_assert_options, 0, 1, MAY_BE_ARRAY|MAY_BE_OBJECT|MAY_BE_LONG|MAY_BE_STRING|MAY_BE_NULL) ZEND_ARG_TYPE_INFO(0, option, IS_LONG, 0) - ZEND_ARG_INFO(0, value) + ZEND_ARG_TYPE_INFO(0, value, IS_MIXED, 0) ZEND_END_ARG_INFO() #define arginfo_bin2hex arginfo_base64_encode |