From fa67b146513565ebbb750dbd3277f0b9fad33148 Mon Sep 17 00:00:00 2001 From: Sebastian Bergmann Date: Thu, 3 Sep 2009 14:02:51 +0000 Subject: [PATCH] Make invokeArgs() error messages consistent with invoke(). --- ext/reflection/php_reflection.c | 6 +++--- .../tests/ReflectionMethod_invokeArgs_error3.phpt | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ext/reflection/php_reflection.c b/ext/reflection/php_reflection.c index 4f82b309a1..f7192f723b 100644 --- a/ext/reflection/php_reflection.c +++ b/ext/reflection/php_reflection.c @@ -2809,11 +2809,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 %v::%v", + "Trying to invoke abstract method %v::%v()", mptr->common.scope->name, mptr->common.function_name); } else { zend_throw_exception_ex(reflection_exception_ptr, 0 TSRMLS_CC, - "Trying to invoke %s method %v::%v from scope %v", + "Trying to invoke %s method %v::%v() from scope %v", mptr->common.fn_flags & ZEND_ACC_PROTECTED ? "protected" : "private", mptr->common.scope->name, mptr->common.function_name, Z_OBJCE_P(getThis())->name); @@ -2840,7 +2840,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 %v::%v without an object", + "Trying to invoke non static method %v::%v() without an object", mptr->common.scope->name, mptr->common.function_name); return; } diff --git a/ext/reflection/tests/ReflectionMethod_invokeArgs_error3.phpt b/ext/reflection/tests/ReflectionMethod_invokeArgs_error3.phpt index c6738c13e8..c50b20e738 100644 --- a/ext/reflection/tests/ReflectionMethod_invokeArgs_error3.phpt +++ b/ext/reflection/tests/ReflectionMethod_invokeArgs_error3.phpt @@ -109,9 +109,9 @@ NULL NULL Private method: -unicode(84) "Trying to invoke private method TestClass::privateMethod from scope ReflectionMethod" +unicode(86) "Trying to invoke private method TestClass::privateMethod() from scope ReflectionMethod" Abstract method: -unicode(51) "Trying to invoke abstract method AbstractClass::foo" +unicode(53) "Trying to invoke abstract method AbstractClass::foo()" Warning: ReflectionMethod::invokeArgs() expects exactly 2 parameters, 1 given in %sReflectionMethod_invokeArgs_error3.php on line %d -- 2.40.0