php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-14 19:41:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Align magic methods' camelCase with documentation

Browse Source 
Closes GH-5398
This commit is contained in:
Gabriel Caruso
2020-04-16 11:26:54 +02:00
parent ea0110f0de
commit add8c15a31
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Zend/tests/magic_methods_010.phpt
View File

@@ -12,4 +12,4 @@ class a {
--EXPECTF--
Warning: The magic method a::__toString() must have public visibility and cannot be static in %s on line %d
Fatal error: Method a::__tostring() cannot take arguments in %s on line %d
Fatal error: Method a::__toString() cannot take arguments in %s on line %d

4
Zend/zend_API.c
View File

@@ -2019,10 +2019,10 @@ ZEND_API void zend_check_magic_method_implementation(const zend_class_entry *ce,
} 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
) {
zend_error(error_type, "Method %s::%s() cannot take arguments", ZSTR_VAL(ce->name), ZEND_TOSTRING_FUNC_NAME);
zend_error(error_type, "Method %s::__toString() cannot take arguments", ZSTR_VAL(ce->name));
} else if (name_len == sizeof(ZEND_DEBUGINFO_FUNC_NAME) - 1 &&
!memcmp(lcname, ZEND_DEBUGINFO_FUNC_NAME, sizeof(ZEND_DEBUGINFO_FUNC_NAME)-1) && fptr->common.num_args != 0) {
zend_error(error_type, "Method %s::%s() cannot take arguments", ZSTR_VAL(ce->name), ZEND_DEBUGINFO_FUNC_NAME);
zend_error(error_type, "Method %s::__debugInfo() cannot take arguments", ZSTR_VAL(ce->name));
}
}
/* }}} */