Browse Source

Make invokeArgs() error messages consistent with invoke().

experimental/5.3-FPM
Sebastian Bergmann 17 years ago
parent
commit
853c6de65b
  1. 6
      ext/reflection/php_reflection.c
  2. 4
      ext/reflection/tests/ReflectionMethod_invokeArgs_error3.phpt

6
ext/reflection/php_reflection.c

@ -2674,11 +2674,11 @@ ZEND_METHOD(reflection_method, invokeArgs)
{
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);
@ -2705,7 +2705,7 @@ ZEND_METHOD(reflection_method, invokeArgs)
if (!object) {
efree(params);
zend_throw_exception_ex(reflection_exception_ptr, 0 TSRMLS_CC,
"Trying to invoke non static method %s::%s without an object",
"Trying to invoke non static method %s::%s() without an object",
mptr->common.scope->name, mptr->common.function_name);
return;
}

4
ext/reflection/tests/ReflectionMethod_invokeArgs_error3.phpt

@ -109,9 +109,9 @@ NULL
NULL
Private method:
string(84) "Trying to invoke private method TestClass::privateMethod from scope ReflectionMethod"
string(86) "Trying to invoke private method TestClass::privateMethod() from scope ReflectionMethod"
Abstract method:
string(51) "Trying to invoke abstract method AbstractClass::foo"
string(53) "Trying to invoke abstract method AbstractClass::foo()"
Warning: ReflectionMethod::invokeArgs() expects exactly 2 parameters, 1 given in %s on line %d
Loading…
Cancel
Save