Mirrors
/
php
mirror of https://github.com/php/php-src
3
0
Fork 0
Code Releases Activity
Browse Source

Be precise

PEAR_1_4DEV
Marcus Boerger 23 years ago
parent
49a538d054
commit
e679504861
2 changed files with 24 additions and 4 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 14
      Zend/zend_reflection_api.c
  2. 14
      ext/reflection/php_reflection.c

14
Zend/zend_reflection_api.c
View File

@ -976,8 +976,18 @@ ZEND_METHOD(reflection_method, invoke)
if (!(mptr->common.fn_flags & ZEND_ACC_PUBLIC) ||
(mptr->common.fn_flags & ZEND_ACC_ABSTRACT)) {
_DO_THROW("Trying to invoke a non-public or abstract method");
/* Returns from this function */
if (mptr->common.fn_flags & ZEND_ACC_ABSTRACT) {
zend_throw_exception_ex(zend_exception_get_abstract(), 0 TSRMLS_CC,
"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",
mptr->common.fn_flags & ZEND_ACC_PROTECTED ? "protected" : "private",
mptr->common.scope->name, mptr->common.function_name,
Z_OBJCE_P(getThis())->name);
}
return;
}
params = safe_emalloc(sizeof(zval **), argc, 0);

14
ext/reflection/php_reflection.c
View File

@ -976,8 +976,18 @@ ZEND_METHOD(reflection_method, invoke)
if (!(mptr->common.fn_flags & ZEND_ACC_PUBLIC) ||
(mptr->common.fn_flags & ZEND_ACC_ABSTRACT)) {
_DO_THROW("Trying to invoke a non-public or abstract method");
/* Returns from this function */
if (mptr->common.fn_flags & ZEND_ACC_ABSTRACT) {
zend_throw_exception_ex(zend_exception_get_abstract(), 0 TSRMLS_CC,
"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",
mptr->common.fn_flags & ZEND_ACC_PROTECTED ? "protected" : "private",
mptr->common.scope->name, mptr->common.function_name,
Z_OBJCE_P(getThis())->name);
}
return;
}
params = safe_emalloc(sizeof(zval **), argc, 0);

Write Preview
Loading…
Cancel
Save