cvs: ZendEngine2 / zend_reflection_api.c

helly Mon Dec 27 08:32:23 2004 EDT Modified files: /ZendEngine2 zend_reflection_api.c Log: - More proto/error message fixes http://cvs.php.net/diff.php/ZendEngine2/zend_reflection_api.c?r1=1.142&r2=1.143&ty=u Index: ZendEngine2/zend_reflection_api.c diff -u ZendEngine2/zend_reflection_api.c:1.142 ZendEngine2/zend_reflection_api.c:1.143 --- ZendEngine2/zend_reflection_api.c:1.142 Mon Dec 27 06:41:45 2004 +++ ZendEngine2/zend_reflection_api.c Mon Dec 27 08:32:22 2004 @@ -19,7 +19,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_reflection_api.c,v 1.142 2004/12/27 11:41:45 helly Exp $ */ +/* $Id: zend_reflection_api.c,v 1.143 2004/12/27 13:32:22 helly Exp $ */ #include "zend.h" #include "zend_API.h" #include "zend_exceptions.h" @@ -1397,7 +1397,7 @@ } /* }}} */ /* {{{ proto public mixed ReflectionFunction::invokeArgs(array args) - Invokes the function */ + Invokes the function and pass its arguments as array. */ ZEND_METHOD(reflection_function, invokeArgs) { zval *retval_ptr; @@ -1907,7 +1907,7 @@ /* }}} */ /* {{{ proto public mixed ReflectionMethod::invoke(mixed object, mixed* args) - Invokes the function. Pass a */ + Invokes the method. */ ZEND_METHOD(reflection_method, invoke) { zval *retval_ptr; @@ -1924,7 +1924,7 @@ METHOD_NOTSTATIC; if (argc < 1) { - zend_error(E_WARNING, "%s expects at least one parameter, none given", get_active_function_name(TSRMLS_C)); + zend_error(E_WARNING, "Invoke() expects at least one parameter, none given"); RETURN_FALSE; } @@ -1934,11 +1934,11 @@ (mptr->common.fn_flags & ZEND_ACC_ABSTRACT)) { if (mptr->common.fn_flags & ZEND_ACC_ABSTRACT) { zend_throw_exception_ex(reflection_exception_ptr, 0 TSRMLS_CC, - "Trying to invoke abstract method %s::%s", + "Trying to invoke abstract method %s::%s()", mptr->common.scope->name, mptr->common.function_name); } else { zend_throw_exception_ex(reflection_exception_ptr, 0 TSRMLS_CC, - "Trying to invoke %s method %s::%s from scope %s", + "Trying to invoke %s method %s::%s() from scope %s", mptr->common.fn_flags & ZEND_ACC_PROTECTED ? "protected" : "private", mptr->common.scope->name, mptr->common.function_name, Z_OBJCE_P(getThis())->name); @@ -2010,7 +2010,7 @@ /* }}} */ /* {{{ proto public mixed ReflectionMethod::invokeArgs(mixed object, array args) - Invokes the function. Pass a */ + Invokes the function and pass its arguments as array. */ ZEND_METHOD(reflection_method, invokeArgs) { zval *retval_ptr;