fixed zend_parse_method_param

diff --git a/Zend/zend_API.c b/Zend/zend_API.c
index 7ff6cbbe7b68acde2a16221a0b5497431b0fd311..81b01a199f17eabaa37f3d67dda05ad1de4bf2d8 100644 (file)
--- a/Zend/zend_API.c
+++ b/Zend/zend_API.c
@@ -563,43 +563,30 @@ ZEND_API int zend_parse_parameters(int num_args TSRMLS_DC, char *type_spec, ...)
        return retval;
 }
 
-ZEND_API int zend_parse_method_parameters(int num_args TSRMLS_DC, zval *this_ptr, char *type_spec, zend_class_entry *ce, zval **object, ...)
+ZEND_API int zend_parse_method_parameters(int num_args TSRMLS_DC, zval *this_ptr, char *type_spec, ...)
 {
-       void **arg_stack = EG(argument_stack).top_element;
        va_list va;
        int retval;
+       char *p = type_spec;
+       zval **object;
+       zend_class_entry *ce;
 
-       *object = this_ptr;
-
-       if (!*object) {
-               zval **parameter;
-
-               if (zend_get_parameters_ex(1, &parameter) != SUCCESS) {
-                       zend_error(E_WARNING, "%s() expects an object of class %s as first parameter, none was given",
-                               get_active_function_name(TSRMLS_C), ce->name);
-
-                       return FAILURE;
-               } else {
-                       if (!zend_check_class(*parameter, ce)) {
-                               zend_error(E_WARNING, "%s() expects parameter 1 to be %s, %s given",
-                                       get_active_function_name(TSRMLS_C), ce->name,
-                                       zend_zval_type_name(*parameter));
-
-                               return FAILURE;
-                       } else {
-                               *object = *parameter;
-                       }
-
-                       EG(argument_stack).top_element++;
-               }
+       if (!this_ptr) {
+               va_start(va, type_spec);
+               retval = zend_parse_va_args(num_args, type_spec, &va, 0 TSRMLS_CC);
+               va_end(va);
        }
-       
-       va_start(va, type_spec);
-       retval = zend_parse_va_args(num_args, type_spec, &va, 0 TSRMLS_CC);
-       va_end(va);
+       else {
+               p++;
+               va_start(va, type_spec);
 
-       EG(argument_stack).top_element = arg_stack;
+               object = va_arg(va, zval **);
+               ce = va_arg(va, zend_class_entry *);
+               *object = this_ptr;
 
+               retval = zend_parse_va_args(num_args, p, &va, 0 TSRMLS_CC);
+               va_end(va);
+       }
        return retval;
 }
 

diff --git a/Zend/zend_API.h b/Zend/zend_API.h
index 1b162e7b64fb37a0ec5077dec22fa434cabf5042..9cc302e3b01c14ec30f34e9e52854f56a23f0403 100644 (file)
--- a/Zend/zend_API.h
+++ b/Zend/zend_API.h
@@ -123,7 +123,7 @@ ZEND_API int zend_parse_parameters(int num_args TSRMLS_DC, char *type_spec, ...)
 ZEND_API int zend_parse_parameters_ex(int flags, int num_args TSRMLS_DC, char *type_spec, ...);
 ZEND_API char *zend_zval_type_name(zval *arg);
 
-ZEND_API int zend_parse_method_parameters(int num_args TSRMLS_DC, zval *this_ptr, char *type_spec, zend_class_entry *ce, zval **object, ...);
+ZEND_API int zend_parse_method_parameters(int num_args TSRMLS_DC, zval *this_ptr, char *type_spec, ...);
 ZEND_API int zend_parse_method_parameters_ex(int flags, int num_args TSRMLS_DC, zval *this_ptr, char *type_spec, zend_class_entry *ce, void **object, ...);
 
 /* End of parameter parsing API -- andrei */