Report magic method names as written

Report the name the way the user has written it, the same way we
always do.

diff --git a/Zend/tests/magic_methods_006.phpt b/Zend/tests/magic_methods_006.phpt
index b07764ec6f76a03c025221f39c9160d2821b037f..0a83a448ef51d17a23d9f9c60b57bcd24ce7dfc5 100644 (file)
--- a/Zend/tests/magic_methods_006.phpt
+++ b/Zend/tests/magic_methods_006.phpt
@@ -9,4 +9,4 @@ interface a {
 
 ?>
 --EXPECTF--
-Fatal error: Method a::__callStatic() must be static in %s on line %d
+Fatal error: Method a::__callstatic() must be static in %s on line %d

diff --git a/Zend/tests/magic_methods_009.phpt b/Zend/tests/magic_methods_009.phpt
index 97b54d2412de21c8edc044626aad1c6d15bc514a..4ed33225ff4b816f8dee1d0ffd2e5feaef59e60e 100644 (file)
--- a/Zend/tests/magic_methods_009.phpt
+++ b/Zend/tests/magic_methods_009.phpt
@@ -10,4 +10,4 @@ class a {
 
 ?>
 --EXPECTF--
-Warning: The magic method a::__callStatic() must have public visibility in %s on line %d
+Warning: The magic method a::__callstatic() must have public visibility in %s on line %d

diff --git a/Zend/zend_API.c b/Zend/zend_API.c
index 14f7cd695a8a05998cf925a622aa7d62290d6186..99b9100f61e04e6b72731f3c11fbe6a37e92e2cc 100644 (file)
--- a/Zend/zend_API.c
+++ b/Zend/zend_API.c
@@ -2008,63 +2008,64 @@ ZEND_API zend_module_entry* zend_register_internal_module(zend_module_entry *mod
 /* }}} */
 
 static void zend_check_magic_method_args(
-               uint32_t num_args, const char *name,
-               const zend_class_entry *ce, const zend_function *fptr, int error_type)
+               uint32_t num_args, const zend_class_entry *ce, const zend_function *fptr, int error_type)
 {
        if (fptr->common.num_args != num_args) {
                if (num_args == 0) {
                        zend_error(error_type, "Method %s::%s() cannot take arguments",
-                               ZSTR_VAL(ce->name), name);
+                               ZSTR_VAL(ce->name), ZSTR_VAL(fptr->common.function_name));
                } else if (num_args == 1) {
                        zend_error(error_type, "Method %s::%s() must take exactly 1 argument",
-                               ZSTR_VAL(ce->name), name);
+                               ZSTR_VAL(ce->name), ZSTR_VAL(fptr->common.function_name));
                } else {
                        zend_error(error_type, "Method %s::%s() must take exactly %" PRIu32 " arguments",
-                               ZSTR_VAL(ce->name), name, num_args);
+                               ZSTR_VAL(ce->name), ZSTR_VAL(fptr->common.function_name), num_args);
                }
                return;
        }
        for (uint32_t i = 0; i < num_args; i++) {
                if (QUICK_ARG_SHOULD_BE_SENT_BY_REF(fptr, i + 1)) {
                        zend_error(error_type, "Method %s::%s() cannot take arguments by reference",
-                               ZSTR_VAL(ce->name), name);
+                               ZSTR_VAL(ce->name), ZSTR_VAL(fptr->common.function_name));
                        return;
                }
        }
 }
 
 static void zend_check_magic_method_non_static(
-               const char *name, const zend_class_entry *ce, const zend_function *fptr, int error_type)
+               const zend_class_entry *ce, const zend_function *fptr, int error_type)
 {
        if (fptr->common.fn_flags & ZEND_ACC_STATIC) {
-               zend_error(error_type, "Method %s::%s() cannot be static", ZSTR_VAL(ce->name), name);
+               zend_error(error_type, "Method %s::%s() cannot be static",
+                       ZSTR_VAL(ce->name), ZSTR_VAL(fptr->common.function_name));
        }
 }
 
 static void zend_check_magic_method_static(
-               const char *name, const zend_class_entry *ce, const zend_function *fptr, int error_type)
+               const zend_class_entry *ce, const zend_function *fptr, int error_type)
 {
        if (!(fptr->common.fn_flags & ZEND_ACC_STATIC)) {
-               zend_error(error_type, "Method %s::%s() must be static", ZSTR_VAL(ce->name), name);
+               zend_error(error_type, "Method %s::%s() must be static",
+                       ZSTR_VAL(ce->name), ZSTR_VAL(fptr->common.function_name));
        }
 }
 
 static void zend_check_magic_method_public(
-               const char *name, const zend_class_entry *ce, const zend_function *fptr, int error_type)
+               const zend_class_entry *ce, const zend_function *fptr, int error_type)
 {
        // TODO: Remove this warning after adding proper visibility handling.
        if (!(fptr->common.fn_flags & ZEND_ACC_PUBLIC)) {
                zend_error(E_WARNING, "The magic method %s::%s() must have public visibility",
-                       ZSTR_VAL(ce->name), name);
+                       ZSTR_VAL(ce->name), ZSTR_VAL(fptr->common.function_name));
        }
 }
 
 static void zend_check_magic_method_no_return_type(
-               const char *name, const zend_class_entry *ce, const zend_function *fptr, int error_type)
+               const zend_class_entry *ce, const zend_function *fptr, int error_type)
 {
        if (fptr->common.fn_flags & ZEND_ACC_HAS_RETURN_TYPE) {
                zend_error_noreturn(error_type, "Method %s::%s() cannot declare a return type",
-                       ZSTR_VAL(ce->name), name);
+                       ZSTR_VAL(ce->name), ZSTR_VAL(fptr->common.function_name));
        }
 }
 
@@ -2076,63 +2077,63 @@ ZEND_API void zend_check_magic_method_implementation(const zend_class_entry *ce,
        }
 
        if (zend_string_equals_literal(lcname, ZEND_CONSTRUCTOR_FUNC_NAME)) {
-               zend_check_magic_method_non_static("__construct", ce, fptr, error_type);
-               zend_check_magic_method_no_return_type("__construct", ce, fptr, error_type);
+               zend_check_magic_method_non_static(ce, fptr, error_type);
+               zend_check_magic_method_no_return_type(ce, fptr, error_type);
        } else if (zend_string_equals_literal(lcname, ZEND_DESTRUCTOR_FUNC_NAME)) {
-               zend_check_magic_method_args(0, "__destruct", ce, fptr, error_type);
-               zend_check_magic_method_non_static("__destruct", ce, fptr, error_type);
-               zend_check_magic_method_no_return_type("__destruct", ce, fptr, error_type);
+               zend_check_magic_method_args(0, ce, fptr, error_type);
+               zend_check_magic_method_non_static(ce, fptr, error_type);
+               zend_check_magic_method_no_return_type(ce, fptr, error_type);
        } else if (zend_string_equals_literal(lcname, ZEND_CLONE_FUNC_NAME)) {
-               zend_check_magic_method_args(0, "__clone", ce, fptr, error_type);
-               zend_check_magic_method_non_static("__clone", ce, fptr, error_type);
-               zend_check_magic_method_no_return_type("__clone", ce, fptr, error_type);
+               zend_check_magic_method_args(0, ce, fptr, error_type);
+               zend_check_magic_method_non_static(ce, fptr, error_type);
+               zend_check_magic_method_no_return_type(ce, fptr, error_type);
        } else if (zend_string_equals_literal(lcname, ZEND_GET_FUNC_NAME)) {
-               zend_check_magic_method_args(1, "__get", ce, fptr, error_type);
-               zend_check_magic_method_non_static("__get", ce, fptr, error_type);
-               zend_check_magic_method_public("__get", ce, fptr, error_type);
+               zend_check_magic_method_args(1, ce, fptr, error_type);
+               zend_check_magic_method_non_static(ce, fptr, error_type);
+               zend_check_magic_method_public(ce, fptr, error_type);
        } else if (zend_string_equals_literal(lcname, ZEND_SET_FUNC_NAME)) {
-               zend_check_magic_method_args(2, "__set", ce, fptr, error_type);
-               zend_check_magic_method_non_static("__set", ce, fptr, error_type);
-               zend_check_magic_method_public("__set", ce, fptr, error_type);
+               zend_check_magic_method_args(2, ce, fptr, error_type);
+               zend_check_magic_method_non_static(ce, fptr, error_type);
+               zend_check_magic_method_public(ce, fptr, error_type);
        } else if (zend_string_equals_literal(lcname, ZEND_UNSET_FUNC_NAME)) {
-               zend_check_magic_method_args(1, "__unset", ce, fptr, error_type);
-               zend_check_magic_method_non_static("__unset", ce, fptr, error_type);
-               zend_check_magic_method_public("__unset", ce, fptr, error_type);
+               zend_check_magic_method_args(1, ce, fptr, error_type);
+               zend_check_magic_method_non_static(ce, fptr, error_type);
+               zend_check_magic_method_public(ce, fptr, error_type);
        } else if (zend_string_equals_literal(lcname, ZEND_ISSET_FUNC_NAME)) {
-               zend_check_magic_method_args(1, "__isset", ce, fptr, error_type);
-               zend_check_magic_method_non_static("__isset", ce, fptr, error_type);
-               zend_check_magic_method_public("__isset", ce, fptr, error_type);
+               zend_check_magic_method_args(1, ce, fptr, error_type);
+               zend_check_magic_method_non_static(ce, fptr, error_type);
+               zend_check_magic_method_public(ce, fptr, error_type);
        } else if (zend_string_equals_literal(lcname, ZEND_CALL_FUNC_NAME)) {
-               zend_check_magic_method_args(2, "__call", ce, fptr, error_type);
-               zend_check_magic_method_non_static("__call", ce, fptr, error_type);
-               zend_check_magic_method_public("__call", ce, fptr, error_type);
+               zend_check_magic_method_args(2, ce, fptr, error_type);
+               zend_check_magic_method_non_static(ce, fptr, error_type);
+               zend_check_magic_method_public(ce, fptr, error_type);
        } else if (zend_string_equals_literal(lcname, ZEND_CALLSTATIC_FUNC_NAME)) {
-               zend_check_magic_method_args(2, "__callStatic", ce, fptr, error_type);
-               zend_check_magic_method_static("__callStatic", ce, fptr, error_type);
-               zend_check_magic_method_public("__callStatic", ce, fptr, error_type);
+               zend_check_magic_method_args(2, ce, fptr, error_type);
+               zend_check_magic_method_static(ce, fptr, error_type);
+               zend_check_magic_method_public(ce, fptr, error_type);
        } else if (zend_string_equals_literal(lcname, ZEND_TOSTRING_FUNC_NAME)) {
-               zend_check_magic_method_args(0, "__toString", ce, fptr, error_type);
-               zend_check_magic_method_non_static("__toString", ce, fptr, error_type);
-               zend_check_magic_method_public("__toString", ce, fptr, error_type);
+               zend_check_magic_method_args(0, ce, fptr, error_type);
+               zend_check_magic_method_non_static(ce, fptr, error_type);
+               zend_check_magic_method_public(ce, fptr, error_type);
        } else if (zend_string_equals_literal(lcname, ZEND_DEBUGINFO_FUNC_NAME)) {
-               zend_check_magic_method_args(0, "__debugInfo", ce, fptr, error_type);
-               zend_check_magic_method_non_static("__debugInfo", ce, fptr, error_type);
-               zend_check_magic_method_public("__debugInfo", ce, fptr, error_type);
+               zend_check_magic_method_args(0, ce, fptr, error_type);
+               zend_check_magic_method_non_static(ce, fptr, error_type);
+               zend_check_magic_method_public(ce, fptr, error_type);
        } else if (zend_string_equals_literal(lcname, "__serialize")) {
-               zend_check_magic_method_args(0, "__serialize", ce, fptr, error_type);
-               zend_check_magic_method_non_static("__serialize", ce, fptr, error_type);
-               zend_check_magic_method_public("__serialize", ce, fptr, error_type);
+               zend_check_magic_method_args(0, ce, fptr, error_type);
+               zend_check_magic_method_non_static(ce, fptr, error_type);
+               zend_check_magic_method_public(ce, fptr, error_type);
        } else if (zend_string_equals_literal(lcname, "__unserialize")) {
-               zend_check_magic_method_args(1, "__unserialize", ce, fptr, error_type);
-               zend_check_magic_method_non_static("__unserialize", ce, fptr, error_type);
-               zend_check_magic_method_public("__unserialize", ce, fptr, error_type);
+               zend_check_magic_method_args(1, ce, fptr, error_type);
+               zend_check_magic_method_non_static(ce, fptr, error_type);
+               zend_check_magic_method_public(ce, fptr, error_type);
        } else if (zend_string_equals_literal(lcname, "__set_state")) {
-               zend_check_magic_method_args(1, "__set_state", ce, fptr, error_type);
-               zend_check_magic_method_static("__set_state", ce, fptr, error_type);
-               zend_check_magic_method_public("__set_state", ce, fptr, error_type);
+               zend_check_magic_method_args(1, ce, fptr, error_type);
+               zend_check_magic_method_static(ce, fptr, error_type);
+               zend_check_magic_method_public(ce, fptr, error_type);
        } else if (zend_string_equals_literal(lcname, "__invoke")) {
-               zend_check_magic_method_non_static("__invoke", ce, fptr, error_type);
-               zend_check_magic_method_public("__invoke", ce, fptr, error_type);
+               zend_check_magic_method_non_static(ce, fptr, error_type);
+               zend_check_magic_method_public(ce, fptr, error_type);
        }
 }
 /* }}} */