Skip to content

Commit 8db4b85

Browse files
committed
Fix return type of error_get_last()
Since phpGH-17056, the result may return the backtrace array.
1 parent 2ea386a commit 8db4b85

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

Zend/Optimizer/zend_func_infos.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -429,7 +429,7 @@ static const func_info_t func_infos[] = {
429429
#endif
430430
F1("get_current_user", MAY_BE_STRING),
431431
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),
432-
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),
432+
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),
433433
F1("highlight_file", MAY_BE_STRING|MAY_BE_BOOL),
434434
F1("php_strip_whitespace", MAY_BE_STRING),
435435
F1("highlight_string", MAY_BE_STRING|MAY_BE_TRUE),

ext/standard/basic_functions.stub.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1977,7 +1977,7 @@ function get_cfg_var(string $option): string|array|false {}
19771977
function error_log(string $message, int $message_type = 0, ?string $destination = null, ?string $additional_headers = null): bool {}
19781978

19791979
/**
1980-
* @return array<string, int|string>|null
1980+
* @return array<string, int|string|array>|null
19811981
* @refcount 1
19821982
*/
19831983
function error_get_last(): ?array {}

ext/standard/basic_functions_arginfo.h

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)