diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2015-06-22 11:44:49 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2015-06-22 11:44:49 +0300 |
| commit | 3db071dba23ee3ee694aab915d7acf105dfde3c3 (patch) | |
| tree | 4671492402e815ac24db6e21768486bf3760d16b /Zend/zend_builtin_functions.c | |
| parent | 82b92cfa2e0a2e36448dc22719f90c8e636d2c26 (diff) | |
| download | php-git-3db071dba23ee3ee694aab915d7acf105dfde3c3.tar.gz | |
Revert "Fix set_error_handler() arginfo"
This reverts commit b5240280b089acad03616987cee4bb76d94c8c56.
Diffstat (limited to 'Zend/zend_builtin_functions.c')
| -rw-r--r-- | Zend/zend_builtin_functions.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Zend/zend_builtin_functions.c b/Zend/zend_builtin_functions.c index b2a138ae05..b0c660dddb 100644 --- a/Zend/zend_builtin_functions.c +++ b/Zend/zend_builtin_functions.c @@ -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) { |