com php-src: Revert "Several return type fixes, still not completed... Incomplete prototypes :-/": Zend/zend_builtin_functions.c
| From: | Dmitry Stogov | Date: | Mon, 22 Jun 2015 08:44:01 +0000 |
| Subject: | com php-src: Revert "Several return type fixes, still not completed... Incomplete prototypes :-/": Zend/zend_builtin_functions.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-87434@lists.php.net to get a copy of this message | ||
Commit: 13d5893c2aad219cde5d9c5a83000669bc7e6d06
Author: Dmitry Stogov <dmitry@zend.com> Mon, 22 Jun 2015 11:44:01 +0300
Parents: 851b95fc4911bcd0c88810a91367f2294ea5b6c1
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=13d5893c2aad219cde5d9c5a83000669bc7e6d06
Log:
Revert "Several return type fixes, still not completed... Incomplete prototypes :-/"
This reverts commit 851b95fc4911bcd0c88810a91367f2294ea5b6c1.
Changed paths:
M Zend/zend_builtin_functions.c
Diff:
diff --git a/Zend/zend_builtin_functions.c b/Zend/zend_builtin_functions.c
index 7e81951..08e78fd 100644
--- a/Zend/zend_builtin_functions.c
+++ b/Zend/zend_builtin_functions.c
@@ -163,7 +163,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_strncasecmp, 0, 3, IS_LONG, 0, 0
ZEND_ARG_TYPE_INFO(0, len, IS_LONG, 0)
ZEND_END_ARG_INFO()
-/* mixed each(array &arr) */
+/* array each(array &arr) */
ZEND_BEGIN_ARG_INFO_EX(arginfo_each, 0, 0, 1)
ZEND_ARG_TYPE_INFO(1, arr, IS_ARRAY, 0)
ZEND_END_ARG_INFO()
@@ -194,8 +194,8 @@ ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_get_called_class, 0, 0, IS_STRING, 0, 0)
ZEND_END_ARG_INFO()
-/* mixed get_parent_class([mixed object]) */
-ZEND_BEGIN_ARG_TYPE_INFO_EX(arginfo_get_parent_class, 0, 0, 0)
+/* string get_parent_class([mixed object]) */
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_get_parent_class, 0, 0, IS_STRING, 0, 0)
ZEND_ARG_INFO(0, object)
ZEND_END_ARG_INFO()
@@ -307,8 +307,8 @@ ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_INFO_EX(arginfo_restore_error_handler, 0, 0, 0)
ZEND_END_ARG_INFO()
-/* mixed set_exception_handler(callable exception_handler) */
-ZEND_BEGIN_ARG_INFO_EX(arginfo_set_exception_handler, 0, 0, 1)
+/* string set_exception_handler(callable exception_handler) */
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_set_exception_handler, 0, 1, IS_STRING, 0, 0)
ZEND_ARG_TYPE_INFO(0, exception_handler, IS_CALLABLE, 0)
ZEND_END_ARG_INFO()
@@ -1071,8 +1071,8 @@ ZEND_FUNCTION(get_called_class)
}
/* }}} */
-/* {{{ proto mixed get_parent_class([mixed object])
- Retrieves the parent class name for object or class or current scope or false if not in a scope.
*/
+/* {{{ proto string get_parent_class([mixed object])
+ Retrieves the parent class name for object or class or current scope. */
ZEND_FUNCTION(get_parent_class)
{
zval *arg;
@@ -1878,7 +1878,7 @@ ZEND_FUNCTION(restore_error_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 */
+ Sets a user-defined exception handler function. Returns the previously defined exception
handler, or false on error */
ZEND_FUNCTION(set_exception_handler)
{
zval *exception_handler;