summaryrefslogtreecommitdiff
path: root/Zend/zend_builtin_functions.c
diff options
context:
space:
mode:
authorBob Weinand <bobwei9@hotmail.com>2015-06-22 10:36:42 +0200
committerBob Weinand <bobwei9@hotmail.com>2015-06-22 10:36:42 +0200
commit851b95fc4911bcd0c88810a91367f2294ea5b6c1 (patch)
tree6cf29533f29a24590cee33cee2e88670999a5461 /Zend/zend_builtin_functions.c
parentdb6990a91b2ca931074b29886c7f7819b14bb021 (diff)
downloadphp-git-851b95fc4911bcd0c88810a91367f2294ea5b6c1.tar.gz
Several return type fixes, still not completed... Incomplete prototypes :-/
Diffstat (limited to 'Zend/zend_builtin_functions.c')
-rw-r--r--Zend/zend_builtin_functions.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/Zend/zend_builtin_functions.c b/Zend/zend_builtin_functions.c
index 08e78fdc33..7e81951a88 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()
-/* array each(array &arr) */
+/* mixed 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()
-/* string get_parent_class([mixed object]) */
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_get_parent_class, 0, 0, IS_STRING, 0, 0)
+/* mixed get_parent_class([mixed object]) */
+ZEND_BEGIN_ARG_TYPE_INFO_EX(arginfo_get_parent_class, 0, 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()
-/* 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)
+/* mixed set_exception_handler(callable exception_handler) */
+ZEND_BEGIN_ARG_INFO_EX(arginfo_set_exception_handler, 0, 0, 1)
ZEND_ARG_TYPE_INFO(0, exception_handler, IS_CALLABLE, 0)
ZEND_END_ARG_INFO()
@@ -1071,8 +1071,8 @@ ZEND_FUNCTION(get_called_class)
}
/* }}} */
-/* {{{ proto string get_parent_class([mixed object])
- Retrieves the parent class name for object or class or current scope. */
+/* {{{ 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. */
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;