From b5240280b089acad03616987cee4bb76d94c8c56 Mon Sep 17 00:00:00 2001 From: Rasmus Lerdorf Date: Sun, 21 Jun 2015 23:48:00 -0400 Subject: [PATCH] Fix set_error_handler() arginfo --- Zend/zend_builtin_functions.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Zend/zend_builtin_functions.c b/Zend/zend_builtin_functions.c index b0c660dddb..b2a138ae05 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) { -- 2.40.0