archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Improve error messages for magic methods by appending method's class

Browse source 
Closes GH-5397.
This commit is contained in:
Gabriel Caruso 2020-04-16 01:39:51 +02:00
parent 481caf17bc
commit 75a58ba522
No known key found for this signature in database
GPG key ID: 4B385A6EE6C9678D
18 changed files with 34 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Zend/tests/bug61025.phpt
View file

@ -20,9 +20,9 @@ echo $b->__invoke();
?>
--EXPECTF--
Warning: The magic method __invoke() must have public visibility and cannot be static in %sbug61025.php on line %d
Warning: The magic method InvokeAble::__invoke() must have public visibility and cannot be static in %sbug61025.php on line %d
Warning: The magic method __invoke() must have public visibility and cannot be static in %sbug61025.php on line %d
Warning: The magic method Bar::__invoke() must have public visibility and cannot be static in %sbug61025.php on line %d
Bar
Fatal error: Uncaught Error: Call to private method Bar::__invoke() from context '' in %sbug61025.php:%d
Stack trace:

2
Zend/tests/bug65322.phpt
View file

@ -19,6 +19,6 @@ eval('class A { private function __invoke() { } }');
?>
--EXPECTF--
string(76) "The magic method __invoke() must have public visibility and cannot be static"
string(%d) "The magic method A::__invoke() must have public visibility and cannot be static"
string(%d) "%s(%d) : eval()'d code"
string(1) "X"

4
Zend/tests/bug67436/bug67436.phpt
View file

@ -21,7 +21,7 @@ a::staticTest();
$b = new b();
$b->test();
--EXPECT--
string(76) "The magic method __invoke() must have public visibility and cannot be static"
--EXPECTF--
string(%d) "The magic method b::__invoke() must have public visibility and cannot be static"
b::test()
a::test(c::TESTCONSTANT)

2
Zend/tests/bug67436/bug67436_nohandler.phpt
View file

@ -14,6 +14,6 @@ a::staticTest();
$b = new b();
$b->test();
--EXPECTF--
Warning: The magic method __invoke() must have public visibility and cannot be static in %s on line %d
Warning: The magic method b::__invoke() must have public visibility and cannot be static in %s on line %d
b::test()
a::test(c::TESTCONSTANT)

2
Zend/tests/bug70215.phpt
View file

@ -17,5 +17,5 @@ $b();
?>
--EXPECTF--
Warning: The magic method __invoke() must have public visibility and cannot be static in %s on line %d
Warning: The magic method A::__invoke() must have public visibility and cannot be static in %s on line %d
A

2
Zend/tests/errmsg_045.phpt
View file

@ -14,7 +14,7 @@ eval('class A { private function __invoke() { } }');
?>
--EXPECTF--
string(76) "The magic method __invoke() must have public visibility and cannot be static"
string(%d) "The magic method A::__invoke() must have public visibility and cannot be static"
string(%d) "%s(%d) : eval()'d code"
Warning: Undefined variable $undefined in %s on line %d

2
Zend/tests/magic_methods_002.phpt
View file

@ -11,4 +11,4 @@ class foo {
?>
--EXPECTF--
Warning: The magic method __unset() must have public visibility and cannot be static in %s on line %d
Warning: The magic method foo::__unset() must have public visibility and cannot be static in %s on line %d

2
Zend/tests/magic_methods_003.phpt
View file

@ -11,4 +11,4 @@ class foo {
?>
--EXPECTF--
Warning: The magic method __unset() must have public visibility and cannot be static in %s on line %d
Warning: The magic method foo::__unset() must have public visibility and cannot be static in %s on line %d

2
Zend/tests/magic_methods_004.phpt
View file

@ -11,4 +11,4 @@ class foo {
?>
--EXPECTF--
Warning: The magic method __unset() must have public visibility and cannot be static in %s on line %d
Warning: The magic method foo::__unset() must have public visibility and cannot be static in %s on line %d

2
Zend/tests/magic_methods_005.phpt
View file

@ -9,4 +9,4 @@ interface a {
?>
--EXPECTF--
Warning: The magic method __call() must have public visibility and cannot be static in %s on line %d
Warning: The magic method a::__call() must have public visibility and cannot be static in %s on line %d

2
Zend/tests/magic_methods_006.phpt
View file

@ -9,4 +9,4 @@ interface a {
?>
--EXPECTF--
Warning: The magic method __callStatic() must have public visibility and be static in %s on line %d
Warning: The magic method a::__callStatic() must have public visibility and be static in %s on line %d

2
Zend/tests/magic_methods_007.phpt
View file

@ -9,6 +9,6 @@ abstract class b {
?>
--EXPECTF--
Warning: The magic method __set() must have public visibility and cannot be static in %s on line %d
Warning: The magic method b::__set() must have public visibility and cannot be static in %s on line %d
Fatal error: Method b::__set() must take exactly 2 arguments in %s on line %d

2
Zend/tests/magic_methods_008.phpt
View file

@ -14,6 +14,6 @@ class a extends b {
?>
--EXPECTF--
Warning: The magic method __set() must have public visibility and cannot be static in %s on line %d
Warning: The magic method a::__set() must have public visibility and cannot be static in %s on line %d
Fatal error: Access level to a::__set() must be public (as in class b) in %s on line 8

2
Zend/tests/magic_methods_009.phpt
View file

@ -10,4 +10,4 @@ class a {
?>
--EXPECTF--
Warning: The magic method __callStatic() must have public visibility and be static in %s on line %d
Warning: The magic method a::__callStatic() must have public visibility and be static in %s on line %d

2
Zend/tests/magic_methods_010.phpt
View file

@ -10,6 +10,6 @@ class a {
?>
--EXPECTF--
Warning: The magic method __toString() must have public visibility and cannot be static in %s on line %d
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

28
Zend/zend_compile.c
View file

@ -6049,16 +6049,18 @@ static void zend_compile_implicit_closure_uses(closure_info *info)
ZEND_HASH_FOREACH_END();
}
static void zend_check_magic_method_attr(uint32_t attr, const char* method, zend_bool is_static) /* {{{ */
static void zend_check_magic_method_attr(uint32_t attr, zend_class_entry *ce, const char* method, zend_bool is_static) /* {{{ */
{
if (is_static) {
if (!(attr & ZEND_ACC_PUBLIC) || !(attr & ZEND_ACC_STATIC)) {
zend_error(E_WARNING, "The magic method %s() must have public visibility and be static", method);
zend_error(E_WARNING,
"The magic method %s::%s() must have public visibility and be static",
ZSTR_VAL(ce->name), method);
}
} else if (!(attr & ZEND_ACC_PUBLIC) || (attr & ZEND_ACC_STATIC)) {
zend_error(E_WARNING,
"The magic method %s() must have public visibility and cannot be static",
method);
"The magic method %s::%s() must have public visibility and cannot be static",
ZSTR_VAL(ce->name), method);
}
}
/* }}} */
@ -6138,35 +6140,35 @@ void zend_begin_method_decl(zend_op_array *op_array, zend_string *name, zend_boo
} else if (zend_string_equals_literal(lcname, ZEND_CLONE_FUNC_NAME)) {
ce->clone = (zend_function *) op_array;
} else if (zend_string_equals_literal(lcname, ZEND_CALL_FUNC_NAME)) {
zend_check_magic_method_attr(fn_flags, "__call", 0);
zend_check_magic_method_attr(fn_flags, ce, "__call", 0);
ce->__call = (zend_function *) op_array;
} else if (zend_string_equals_literal(lcname, ZEND_CALLSTATIC_FUNC_NAME)) {
zend_check_magic_method_attr(fn_flags, "__callStatic", 1);
zend_check_magic_method_attr(fn_flags, ce, "__callStatic", 1);
ce->__callstatic = (zend_function *) op_array;
} else if (zend_string_equals_literal(lcname, ZEND_GET_FUNC_NAME)) {
zend_check_magic_method_attr(fn_flags, "__get", 0);
zend_check_magic_method_attr(fn_flags, ce, "__get", 0);
ce->__get = (zend_function *) op_array;
ce->ce_flags |= ZEND_ACC_USE_GUARDS;
} else if (zend_string_equals_literal(lcname, ZEND_SET_FUNC_NAME)) {
zend_check_magic_method_attr(fn_flags, "__set", 0);
zend_check_magic_method_attr(fn_flags, ce, "__set", 0);
ce->__set = (zend_function *) op_array;
ce->ce_flags |= ZEND_ACC_USE_GUARDS;
} else if (zend_string_equals_literal(lcname, ZEND_UNSET_FUNC_NAME)) {
zend_check_magic_method_attr(fn_flags, "__unset", 0);
zend_check_magic_method_attr(fn_flags, ce, "__unset", 0);
ce->__unset = (zend_function *) op_array;
ce->ce_flags |= ZEND_ACC_USE_GUARDS;
} else if (zend_string_equals_literal(lcname, ZEND_ISSET_FUNC_NAME)) {
zend_check_magic_method_attr(fn_flags, "__isset", 0);
zend_check_magic_method_attr(fn_flags, ce, "__unset", 0);
ce->__isset = (zend_function *) op_array;
ce->ce_flags |= ZEND_ACC_USE_GUARDS;
} else if (zend_string_equals_literal(lcname, ZEND_TOSTRING_FUNC_NAME)) {
zend_check_magic_method_attr(fn_flags, "__toString", 0);
zend_check_magic_method_attr(fn_flags, ce, "__toString", 0);
ce->__tostring = (zend_function *) op_array;
add_stringable_interface(ce);
} else if (zend_string_equals_literal(lcname, ZEND_INVOKE_FUNC_NAME)) {
zend_check_magic_method_attr(fn_flags, "__invoke", 0);
zend_check_magic_method_attr(fn_flags, ce, "__invoke", 0);
} else if (zend_string_equals_literal(lcname, ZEND_DEBUGINFO_FUNC_NAME)) {
zend_check_magic_method_attr(fn_flags, "__debugInfo", 0);
zend_check_magic_method_attr(fn_flags, ce, "__debugInfo", 0);
ce->__debugInfo = (zend_function *) op_array;
}

2
tests/classes/__call_005.phpt
View file

@ -22,7 +22,7 @@ $b = new B();
$b->test();
?>
--EXPECTF--
Warning: The magic method __call() must have public visibility and cannot be static in %s__call_005.php on line 3
Warning: The magic method A::__call() must have public visibility and cannot be static in %s__call_005.php on line 3
In A::__call(test1, array(1,a))
object(B)#1 (0) {
}

2
tests/classes/__call_007.phpt
View file

@ -51,7 +51,7 @@ try {
}
?>
--EXPECTF--
Warning: The magic method __call() must have public visibility and cannot be static in %s on line 3
Warning: The magic method A::__call() must have public visibility and cannot be static in %s on line 3
---> Invoke __call via simple method call.
object(A)#1 (0) {
}