Add zend_make_callable() which allows to make zval's callable zval's.

At the moment this function only converts strings of the form class::method
to an array(class,method).

1 files changed, 28 insertions, 1 deletions

diff --git a/Zend/zend_API.c b/Zend/zend_API.c
index f9a868ddda..a18de9fda7 100644
--- a/Zend/zend_API.c
+++ b/Zend/zend_API.c
@@ -1573,7 +1573,7 @@ ZEND_API int zend_disable_class(char *class_name, uint class_name_length TSRMLS_
 	return 1;
 }
 
-zend_bool zend_is_callable(zval *callable, zend_bool syntax_only, char **callable_name)
+ZEND_API zend_bool zend_is_callable(zval *callable, zend_bool syntax_only, char **callable_name)
 {
 	char *lcname;
 	zend_bool retval = 0;
@@ -1685,6 +1685,33 @@ zend_bool zend_is_callable(zval *callable, zend_bool syntax_only, char **callabl
 }
 
 
+ZEND_API zend_bool zend_make_callable(zval *callable, char **callable_name TSRMLS_DC)
+{
+	char *lcname, *func;
+	zend_bool retval = 0;
+
+	if (zend_is_callable(callable, 0, callable_name)) {
+		return 1;
+	}
+	switch (Z_TYPE_P(callable)) {
+		case IS_STRING:
+			lcname = zend_str_tolower_dup(Z_STRVAL_P(callable), Z_STRLEN_P(callable));
+
+			if ((func = strstr(lcname, "::")) != NULL) {
+				zval_dtor(callable);
+				array_init(callable);
+				add_next_index_stringl(callable, lcname, func - lcname, 1);
+				func += 2;
+				add_next_index_stringl(callable, func, strlen(func), 1);
+				retval = 1; 
+			}
+			efree(lcname);
+			break;
+	}
+	return retval;
+}
+
+
 ZEND_API char *zend_get_module_version(char *module_name)
 {
 	zend_module_entry *module;