Align magic methods' camelCase with documentation

Closes GH-5398

diff --git a/Zend/tests/magic_methods_010.phpt b/Zend/tests/magic_methods_010.phpt
index 6118bda67b56e5362a9ff5774bad02bcf73f8f2f..4c939d3faa1922818b4d0b3619154ab2de1f8858 100644 (file)
--- a/Zend/tests/magic_methods_010.phpt
+++ b/Zend/tests/magic_methods_010.phpt
@@ -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

diff --git a/Zend/zend_API.c b/Zend/zend_API.c
index ea78c22a463c342b2ca54f57d6e665b05b60f71c..6d23b3437295cb7953de23a5a38e3a0865693c87 100644 (file)
--- a/Zend/zend_API.c
+++ b/Zend/zend_API.c
@@ -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));
        }
 }
 /* }}} */