com php-src: Rename __callstatic (internal name) to __callStatic (userland name) in error me ssage: Zend/zend_API.c

From: Date: Tue, 03 Feb 2015 16:04:52 +0000
Subject: com php-src: Rename __callstatic (internal name) to __callStatic (userland name) in error me ssage: Zend/zend_API.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-85370@lists.php.net to get a copy of this message
Commit: 836dcb1da7647b971a86208fecbe04fa5a6f5725 Author: Dejan Marjanovic <dm@php.net> Tue, 3 Feb 2015 17:04:52 +0100 Parents: feef180e6c7eef8f7345d1a823d62e219e6b35e3 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=836dcb1da7647b971a86208fecbe04fa5a6f5725 Log: Rename __callstatic (internal name) to __callStatic (userland name) in error message Changed paths: M Zend/zend_API.c Diff: diff --git a/Zend/zend_API.c b/Zend/zend_API.c index 440e96d..9682439 100644 --- a/Zend/zend_API.c +++ b/Zend/zend_API.c @@ -1911,9 +1911,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

« previous php.cvs (#85370) next »