archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

- More proto/error message fixes

Browse source
This commit is contained in:
Marcus Boerger 2004-12-27 13:32:22 +00:00
parent 698c0361d6
commit 03af7c8abc
2 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Zend/zend_reflection_api.c
View file

@ -1397,7 +1397,7 @@ static int _zval_array_to_c_array(zval **arg, zval ****params TSRMLS_DC) /* {{{
} /* }}} */
/* {{{ 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 @@ ZEND_METHOD(reflection_method, __toString)
/* }}} */
/* {{{ 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 @@ ZEND_METHOD(reflection_method, invoke)
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 @@ ZEND_METHOD(reflection_method, invoke)
(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 @@ ZEND_METHOD(reflection_method, invoke)
/* }}} */
/* {{{ 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;

12
ext/reflection/php_reflection.c
View file

@ -1397,7 +1397,7 @@ static int _zval_array_to_c_array(zval **arg, zval ****params TSRMLS_DC) /* {{{
} /* }}} */
/* {{{ 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 @@ ZEND_METHOD(reflection_method, __toString)
/* }}} */
/* {{{ 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 @@ ZEND_METHOD(reflection_method, invoke)
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 @@ ZEND_METHOD(reflection_method, invoke)
(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 @@ ZEND_METHOD(reflection_method, invoke)
/* }}} */
/* {{{ 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;