diff --git a/Zend/Optimizer/zend_func_infos.h b/Zend/Optimizer/zend_func_infos.h index 42435e695a515..0fc33ae2f6e1c 100644 --- a/Zend/Optimizer/zend_func_infos.h +++ b/Zend/Optimizer/zend_func_infos.h @@ -429,7 +429,7 @@ static const func_info_t func_infos[] = { #endif F1("get_current_user", MAY_BE_STRING), FN("get_cfg_var", MAY_BE_STRING|MAY_BE_ARRAY|MAY_BE_ARRAY_KEY_LONG|MAY_BE_ARRAY_KEY_STRING|MAY_BE_ARRAY_OF_STRING|MAY_BE_ARRAY_OF_ARRAY|MAY_BE_FALSE), - F1("error_get_last", MAY_BE_ARRAY|MAY_BE_ARRAY_KEY_STRING|MAY_BE_ARRAY_OF_LONG|MAY_BE_ARRAY_OF_STRING|MAY_BE_NULL), + F1("error_get_last", MAY_BE_ARRAY|MAY_BE_ARRAY_KEY_STRING|MAY_BE_ARRAY_OF_LONG|MAY_BE_ARRAY_OF_STRING|MAY_BE_ARRAY_OF_ARRAY|MAY_BE_NULL), F1("highlight_file", MAY_BE_STRING|MAY_BE_BOOL), F1("php_strip_whitespace", MAY_BE_STRING), F1("highlight_string", MAY_BE_STRING|MAY_BE_TRUE), diff --git a/Zend/zend.c b/Zend/zend.c index 60eab332fa158..fcac6c08ac140 100644 --- a/Zend/zend.c +++ b/Zend/zend.c @@ -1050,6 +1050,8 @@ void zend_startup(zend_utility_functions *utility_functions) /* {{{ */ CG(map_ptr_last) = 0; #endif /* ZTS */ EG(error_reporting) = E_ALL & ~E_NOTICE; + EG(fatal_error_backtrace_on) = false; + ZVAL_UNDEF(&EG(last_fatal_error_backtrace)); zend_interned_strings_init(); zend_startup_builtin_functions(); diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c index 07e3d95bd60fe..1f55521fb72f1 100644 --- a/Zend/zend_execute_API.c +++ b/Zend/zend_execute_API.c @@ -824,7 +824,7 @@ zend_result zend_call_function(zend_fcall_info *fci, zend_fcall_info_cache *fci_ return SUCCESS; /* we would result in an unstable executor otherwise */ } - ZEND_ASSERT(fci->size == sizeof(zend_fcall_info)); + ZEND_ASSERT(ZEND_FCI_INITIALIZED(*fci)); if (!fci_cache || !fci_cache->function_handler) { char *error = NULL; diff --git a/ext/standard/basic_functions.stub.php b/ext/standard/basic_functions.stub.php index 1934610dc0fed..e7f4ff8844714 100644 --- a/ext/standard/basic_functions.stub.php +++ b/ext/standard/basic_functions.stub.php @@ -1977,7 +1977,7 @@ function get_cfg_var(string $option): string|array|false {} function error_log(string $message, int $message_type = 0, ?string $destination = null, ?string $additional_headers = null): bool {} /** - * @return array|null + * @return array|null * @refcount 1 */ function error_get_last(): ?array {} diff --git a/ext/standard/basic_functions_arginfo.h b/ext/standard/basic_functions_arginfo.h index 61feae1d88c68..3d92288643159 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: b0a0ccc94c6db2831f7f0b8e67562cd6a734fcdf */ + * Stub hash: 85677dc3476d25b7820fd3a26fe39f2e9378b6e7 */ 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)