Skip to content

Commit 7ce8c5a

Browse files
carusogabrielcarusogabriel
committed
Slipt error messages while checking magic methods attributes
Closes phpGH-5465
1 parent f38d6ce commit 7ce8c5a

20 files changed

+32
-24
lines changed

‎Zend/tests/bug61025.phpt

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ echo $b->__invoke();
2020

2121
?>
2222
--EXPECTF--
23-
Warning: The magic method InvokeAble::__invoke() must have public visibility and cannot be static in %sbug61025.php on line %d
23+
Warning: The magic method InvokeAble::__invoke() cannot be static in %sbug61025.php on line %d
2424

25-
Warning: The magic method Bar::__invoke() must have public visibility and cannot be static in %sbug61025.php on line %d
25+
Warning: The magic method Bar::__invoke() must have public visibility in %sbug61025.php on line %d
2626
Bar
2727
Fatal error: Uncaught Error: Call to private method Bar::__invoke() from context '' in %sbug61025.php:%d
2828
Stack trace:

‎Zend/tests/bug65322.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,6 @@ eval('class A { private function __invoke() { } }');
1919

2020
?>
2121
--EXPECTF--
22-
string(%d) "The magic method A::__invoke() must have public visibility and cannot be static"
22+
string(%d) "The magic method A::__invoke() must have public visibility"
2323
string(%d) "%s(%d) : eval()'d code"
2424
string(1) "X"

‎Zend/tests/bug67436/bug67436.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,6 @@ a::staticTest();
2222
$b = new b();
2323
$b->test();
2424
--EXPECTF--
25-
string(%d) "The magic method b::__invoke() must have public visibility and cannot be static"
25+
string(%d) "The magic method b::__invoke() must have public visibility"
2626
b::test()
2727
a::test(c::TESTCONSTANT)

‎Zend/tests/bug67436/bug67436_nohandler.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@ a::staticTest();
1414
$b = new b();
1515
$b->test();
1616
--EXPECTF--
17-
Warning: The magic method b::__invoke() must have public visibility and cannot be static in %s on line %d
17+
Warning: The magic method b::__invoke() must have public visibility in %s on line %d
1818
b::test()
1919
a::test(c::TESTCONSTANT)

‎Zend/tests/bug70215.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,5 @@ $b();
1717

1818
?>
1919
--EXPECTF--
20-
Warning: The magic method A::__invoke() must have public visibility and cannot be static in %s on line %d
20+
Warning: The magic method A::__invoke() cannot be static in %s on line %d
2121
A

‎Zend/tests/errmsg_045.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ eval('class A { private function __invoke() { } }');
1414

1515
?>
1616
--EXPECTF--
17-
string(%d) "The magic method A::__invoke() must have public visibility and cannot be static"
17+
string(%d) "The magic method A::__invoke() must have public visibility"
1818
string(%d) "%s(%d) : eval()'d code"
1919

2020
Warning: Undefined variable $undefined in %s on line %d

‎Zend/tests/magic_methods_002.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ class foo {
1111

1212
?>
1313
--EXPECTF--
14-
Warning: The magic method foo::__unset() must have public visibility and cannot be static in %s on line %d
14+
Warning: The magic method foo::__unset() must have public visibility in %s on line %d

‎Zend/tests/magic_methods_003.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ class foo {
1111

1212
?>
1313
--EXPECTF--
14-
Warning: The magic method foo::__unset() must have public visibility and cannot be static in %s on line %d
14+
Warning: The magic method foo::__unset() cannot be static in %s on line %d

‎Zend/tests/magic_methods_004.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ class foo {
1111

1212
?>
1313
--EXPECTF--
14-
Warning: The magic method foo::__unset() must have public visibility and cannot be static in %s on line %d
14+
Warning: The magic method foo::__unset() must have public visibility in %s on line %d

‎Zend/tests/magic_methods_005.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ interface a {
99

1010
?>
1111
--EXPECTF--
12-
Warning: The magic method a::__call() must have public visibility and cannot be static in %s on line %d
12+
Warning: The magic method a::__call() cannot be static in %s on line %d

‎Zend/tests/magic_methods_006.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ interface a {
99

1010
?>
1111
--EXPECTF--
12-
Warning: The magic method a::__callStatic() must have public visibility and be static in %s on line %d
12+
Warning: The magic method a::__callStatic() must be static in %s on line %d

‎Zend/tests/magic_methods_007.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@ abstract class b {
99

1010
?>
1111
--EXPECTF--
12-
Warning: The magic method b::__set() must have public visibility and cannot be static in %s on line %d
12+
Warning: The magic method b::__set() must have public visibility in %s on line %d
1313

1414
Fatal error: Method b::__set() must take exactly 2 arguments in %s on line %d

‎Zend/tests/magic_methods_008.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@ class a extends b {
1414

1515
?>
1616
--EXPECTF--
17-
Warning: The magic method a::__set() must have public visibility and cannot be static in %s on line %d
17+
Warning: The magic method a::__set() must have public visibility in %s on line %d
1818

1919
Fatal error: Access level to a::__set() must be public (as in class b) in %s on line 8

‎Zend/tests/magic_methods_009.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ class a {
1010

1111
?>
1212
--EXPECTF--
13-
Warning: The magic method a::__callStatic() must have public visibility and be static in %s on line %d
13+
Warning: The magic method a::__callStatic() must have public visibility in %s on line %d

‎Zend/tests/magic_methods_010.phpt

+3-1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ class a {
1010

1111
?>
1212
--EXPECTF--
13-
Warning: The magic method a::__toString() must have public visibility and cannot be static in %s on line %d
13+
Warning: The magic method a::__toString() must have public visibility in %s on line %d
14+
15+
Warning: The magic method a::__toString() cannot be static in %s on line %d
1416

1517
Fatal error: Method a::__toString() cannot take arguments in %s on line %d

‎Zend/tests/magic_methods_serialize.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ class Foo {
77
}
88
?>
99
--EXPECTF--
10-
Warning: The magic method Foo::__serialize() must have public visibility and cannot be static in %s on line %d
10+
Warning: The magic method Foo::__serialize() cannot be static in %s on line %d
1111

1212
Fatal error: Method Foo::__serialize() cannot take arguments in %s on line %d

‎Zend/tests/magic_methods_unserialize.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ class Foo {
77
}
88
?>
99
--EXPECTF--
10-
Warning: The magic method Foo::__unserialize() must have public visibility and cannot be static in %s on line %d
10+
Warning: The magic method Foo::__unserialize() cannot be static in %s on line %d
1111

1212
Fatal error: Method Foo::__unserialize() must take exactly 1 argument in %s on line %d

‎Zend/zend_compile.c

+10-4
Original file line numberDiff line numberDiff line change
@@ -6041,15 +6041,21 @@ static void zend_compile_implicit_closure_uses(closure_info *info)
60416041

60426042
static void zend_check_magic_method_attr(uint32_t attr, zend_class_entry *ce, const char* method, zend_bool is_static) /* {{{ */
60436043
{
6044+
if (!(attr & ZEND_ACC_PUBLIC)) {
6045+
zend_error(E_WARNING,
6046+
"The magic method %s::%s() must have public visibility",
6047+
ZSTR_VAL(ce->name), method);
6048+
}
6049+
60446050
if (is_static) {
6045-
if (!(attr & ZEND_ACC_PUBLIC) || !(attr & ZEND_ACC_STATIC)) {
6051+
if (!(attr & ZEND_ACC_STATIC)) {
60466052
zend_error(E_WARNING,
6047-
"The magic method %s::%s() must have public visibility and be static",
6053+
"The magic method %s::%s() must be static",
60486054
ZSTR_VAL(ce->name), method);
60496055
}
6050-
} else if (!(attr & ZEND_ACC_PUBLIC) || (attr & ZEND_ACC_STATIC)) {
6056+
} else if (attr & ZEND_ACC_STATIC) {
60516057
zend_error(E_WARNING,
6052-
"The magic method %s::%s() must have public visibility and cannot be static",
6058+
"The magic method %s::%s() cannot be static",
60536059
ZSTR_VAL(ce->name), method);
60546060
}
60556061
}

‎tests/classes/__call_005.phpt

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

‎tests/classes/__call_007.phpt

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

0 commit comments

Comments
 (0)