diff options
| author | Stanislav Malyshev <stas@php.net> | 2015-03-08 17:57:47 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2015-03-08 17:57:47 -0700 |
| commit | 69d183dd1926c4f1b35f9303e6960732f71e29de (patch) | |
| tree | f511c18cca30f3a9475ca23b99429520e157d94c /Zend/zend_API.c | |
| parent | 33ef5c47a5dd30d1143bf716a07036f68853daa3 (diff) | |
| parent | 836dcb1da7647b971a86208fecbe04fa5a6f5725 (diff) | |
| download | php-git-69d183dd1926c4f1b35f9303e6960732f71e29de.tar.gz | |
Merge branch 'pull-request/1049'
* pull-request/1049:
Rename __callstatic (internal name) to __callStatic (userland name) in error message
Diffstat (limited to 'Zend/zend_API.c')
| -rw-r--r-- | Zend/zend_API.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Zend/zend_API.c b/Zend/zend_API.c index 304632f762..c513d5db5e 100644 --- a/Zend/zend_API.c +++ b/Zend/zend_API.c @@ -1914,9 +1914,9 @@ ZEND_API void zend_check_magic_method_implementation(const zend_class_entry *ce, !memcmp(lcname, ZEND_CALLSTATIC_FUNC_NAME, sizeof(ZEND_CALLSTATIC_FUNC_NAME)-1) ) { if (fptr->common.num_args != 2) { - zend_error(error_type, "Method %s::%s() must take exactly 2 arguments", ce->name->val, ZEND_CALLSTATIC_FUNC_NAME); + zend_error(error_type, "Method %s::__callStatic() must take exactly 2 arguments", ce->name->val); } else if (ARG_SHOULD_BE_SENT_BY_REF(fptr, 1) || ARG_SHOULD_BE_SENT_BY_REF(fptr, 2)) { - zend_error(error_type, "Method %s::%s() cannot take arguments by reference", ce->name->val, ZEND_CALLSTATIC_FUNC_NAME); + zend_error(error_type, "Method %s::__callStatic() cannot take arguments by reference", ce->name->val); } } else if (name_len == sizeof(ZEND_TOSTRING_FUNC_NAME) - 1 && !memcmp(lcname, ZEND_TOSTRING_FUNC_NAME, sizeof(ZEND_TOSTRING_FUNC_NAME)-1) && fptr->common.num_args != 0 |