sebastian Thu, 03 Sep 2009 14:02:51 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=287991
Log:
Make invokeArgs() error messages consistent with invoke().
Changed paths:
U php/php-src/branches/PHP_5_2/ext/reflection/php_reflection.c
U
php/php-src/branches/PHP_5_2/ext/reflection/tests/ReflectionMethod_invokeArgs_error3.phpt
U php/php-src/branches/PHP_5_3/ext/reflection/php_reflection.c
U
php/php-src/branches/PHP_5_3/ext/reflection/tests/ReflectionMethod_invokeArgs_error3.phpt
U php/php-src/trunk/ext/reflection/php_reflection.c
U
php/php-src/trunk/ext/reflection/tests/ReflectionMethod_invokeArgs_error3.phpt
Modified: php/php-src/branches/PHP_5_2/ext/reflection/php_reflection.c
===================================================================
--- php/php-src/branches/PHP_5_2/ext/reflection/php_reflection.c
2009-09-03 12:58:31 UTC (rev 287990)
+++ php/php-src/branches/PHP_5_2/ext/reflection/php_reflection.c
2009-09-03 14:02:51 UTC (rev 287991)
@@ -2422,11 +2422,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);
@@ -2453,7 +2453,7 @@
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;
}
Modified:
php/php-src/branches/PHP_5_2/ext/reflection/tests/ReflectionMethod_invokeArgs_error3.phpt
===================================================================
---
php/php-src/branches/PHP_5_2/ext/reflection/tests/ReflectionMethod_invokeArgs_error3.phpt
2009-09-03 12:58:31 UTC (rev 287990)
+++
php/php-src/branches/PHP_5_2/ext/reflection/tests/ReflectionMethod_invokeArgs_error3.phpt
2009-09-03 14:02:51 UTC (rev 287991)
@@ -111,9 +111,9 @@
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
Modified: php/php-src/branches/PHP_5_3/ext/reflection/php_reflection.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/reflection/php_reflection.c
2009-09-03 12:58:31 UTC (rev 287990)
+++ php/php-src/branches/PHP_5_3/ext/reflection/php_reflection.c
2009-09-03 14:02:51 UTC (rev 287991)
@@ -2674,11 +2674,11 @@
{
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 @@
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;
}
Modified:
php/php-src/branches/PHP_5_3/ext/reflection/tests/ReflectionMethod_invokeArgs_error3.phpt
===================================================================
---
php/php-src/branches/PHP_5_3/ext/reflection/tests/ReflectionMethod_invokeArgs_error3.phpt
2009-09-03 12:58:31 UTC (rev 287990)
+++
php/php-src/branches/PHP_5_3/ext/reflection/tests/ReflectionMethod_invokeArgs_error3.phpt
2009-09-03 14:02:51 UTC (rev 287991)
@@ -109,9 +109,9 @@
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
Modified: php/php-src/trunk/ext/reflection/php_reflection.c
===================================================================
--- php/php-src/trunk/ext/reflection/php_reflection.c 2009-09-03 12:58:31 UTC
(rev 287990)
+++ php/php-src/trunk/ext/reflection/php_reflection.c 2009-09-03 14:02:51 UTC
(rev 287991)
@@ -2809,11 +2809,11 @@
{
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 @@
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;
}
Modified:
php/php-src/trunk/ext/reflection/tests/ReflectionMethod_invokeArgs_error3.phpt
===================================================================
---
php/php-src/trunk/ext/reflection/tests/ReflectionMethod_invokeArgs_error3.phpt
2009-09-03 12:58:31 UTC (rev 287990)
+++
php/php-src/trunk/ext/reflection/tests/ReflectionMethod_invokeArgs_error3.phpt
2009-09-03 14:02:51 UTC (rev 287991)
@@ -109,9 +109,9 @@
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
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
