From: Dmitry Stogov <dmitry@zend.com>
Date: Mon, 22 Jun 2015 08:44:49 +0000 (+0300)
Subject: Revert "Fix set_error_handler() arginfo"
X-Git-Tag: php-7.0.0alpha2~2^2~24
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3db071dba23ee3ee694aab915d7acf105dfde3c3;p=php

Revert "Fix set_error_handler() arginfo"

This reverts commit b5240280b089acad03616987cee4bb76d94c8c56.
---

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)
 {