archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Revert "Fix set_error_handler() arginfo"

Browse source 
This reverts commit b5240280b0.
This commit is contained in:
Dmitry Stogov 2015-06-22 11:44:49 +03:00
parent 82b92cfa2e
commit 3db071dba2
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Zend/zend_builtin_functions.c
View file

@ -300,9 +300,9 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_trigger_error, 0, 0, 1)
ZEND_ARG_TYPE_INFO(0, error_type, IS_LONG, 0)
ZEND_END_ARG_INFO()
/* mixed set_error_handler(string error_handler [, int error_types]) */
ZEND_BEGIN_ARG_INFO_EX(arginfo_set_error_handler, 0, 0, 1)
ZEND_ARG_TYPE_INFO(0, error_handler, IS_CALLABLE, 0)
/* string set_error_handler(string error_handler [, int error_types]) */
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_set_error_handler, 0, 1, IS_STRING, 0, 0)
ZEND_ARG_TYPE_INFO(0, error_handler, IS_STRING, 0)
ZEND_ARG_TYPE_INFO(0, error_types, IS_LONG, 0)
ZEND_END_ARG_INFO()
@ -1811,7 +1811,7 @@ ZEND_FUNCTION(trigger_error)
}
/* }}} */
/* {{{ proto string set_error_handler(callable error_handler [, int error_types])
/* {{{ proto string set_error_handler(string error_handler [, int error_types])
Sets a user-defined error handler function. Returns the previously defined error handler, or false on error */
ZEND_FUNCTION(set_error_handler)
{
@ -1880,7 +1880,7 @@ ZEND_FUNCTION(restore_error_handler)
}
/* }}} */
/* {{{ proto mixed set_exception_handler(callable exception_handler)
/* {{{ proto string set_exception_handler(callable exception_handler)
Sets a user-defined exception handler function. Returns the previously defined exception handler, or false on error */
ZEND_FUNCTION(set_exception_handler)
{