com php-src: Fix set_error_handler() arginfo: Zen d/zend_builtin_functions.c
| From: | Rasmus Lerdorf | Date: | Mon, 22 Jun 2015 03:48:00 +0000 |
| Subject: | com php-src: Fix set_error_handler() arginfo: Zen d/zend_builtin_functions.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-87424@lists.php.net to get a copy of this message | ||
Commit: b5240280b089acad03616987cee4bb76d94c8c56
Author: Rasmus Lerdorf <rasmus@php.net> Sun, 21 Jun 2015 23:48:00 -0400
Parents: d2356541d0386e3f0b6d593e2cc046ced68ff050
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=b5240280b089acad03616987cee4bb76d94c8c56
Log:
Fix set_error_handler() arginfo
Changed paths:
M Zend/zend_builtin_functions.c
Diff:
diff --git a/Zend/zend_builtin_functions.c b/Zend/zend_builtin_functions.c
index b0c660d..b2a138a 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()
-/* 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)
+/* 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)
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(string error_handler [, int error_types])
+/* {{{ proto string set_error_handler(callable 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 string set_exception_handler(callable exception_handler)
+/* {{{ proto mixed 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)
{