Skip to content

Commit 702fb31

Browse files
zend_resolve_const_class_name_reference(): use double quotes around names (php#15998)
This is a follow-up to php#15990, as it turns out there was a second place that emits this kind of error message.
1 parent 8e6d8cf commit 702fb31

11 files changed

+17
-17
lines changed

Zend/tests/class_uses_static.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ class Test {
99

1010
?>
1111
--EXPECTF--
12-
Fatal error: Cannot use 'static' as trait name, as it is reserved in %s on line %d
12+
Fatal error: Cannot use "static" as trait name, as it is reserved in %s on line %d

Zend/tests/errmsg_030.phpt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
--TEST--
2-
errmsg: cannot use 'self' as parent class name
2+
errmsg: cannot use "self" as parent class name
33
--FILE--
44
<?php
55

@@ -9,4 +9,4 @@ class test extends self {
99
echo "Done\n";
1010
?>
1111
--EXPECTF--
12-
Fatal error: Cannot use 'self' as class name, as it is reserved in %s on line %d
12+
Fatal error: Cannot use "self" as class name, as it is reserved in %s on line %d

Zend/tests/errmsg_031.phpt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
--TEST--
2-
errmsg: cannot use 'parent' as parent class name
2+
errmsg: cannot use "parent" as parent class name
33
--FILE--
44
<?php
55

@@ -9,4 +9,4 @@ class test extends parent {
99
echo "Done\n";
1010
?>
1111
--EXPECTF--
12-
Fatal error: Cannot use 'parent' as class name, as it is reserved in %s on line %d
12+
Fatal error: Cannot use "parent" as class name, as it is reserved in %s on line %d

Zend/tests/errmsg_035.phpt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
--TEST--
2-
errmsg: cannot use 'self' as interface name
2+
errmsg: cannot use "self" as interface name
33
--FILE--
44
<?php
55

@@ -9,4 +9,4 @@ class test implements self {
99
echo "Done\n";
1010
?>
1111
--EXPECTF--
12-
Fatal error: Cannot use 'self' as interface name, as it is reserved in %s on line %d
12+
Fatal error: Cannot use "self" as interface name, as it is reserved in %s on line %d

Zend/tests/errmsg_036.phpt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
--TEST--
2-
errmsg: cannot use 'parent' as interface name
2+
errmsg: cannot use "parent" as interface name
33
--FILE--
44
<?php
55

@@ -9,4 +9,4 @@ class test implements parent {
99
echo "Done\n";
1010
?>
1111
--EXPECTF--
12-
Fatal error: Cannot use 'parent' as interface name, as it is reserved in %s on line %d
12+
Fatal error: Cannot use "parent" as interface name, as it is reserved in %s on line %d

Zend/tests/interface_extends_static.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ interface Foo extends static {}
77

88
?>
99
--EXPECTF--
10-
Fatal error: Cannot use 'static' as interface name, as it is reserved in %s on line %d
10+
Fatal error: Cannot use "static" as interface name, as it is reserved in %s on line %d

Zend/tests/lsb_006.phpt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
--TEST--
2-
ZE2 Late Static Binding ensuring extending 'static' is not allowed
2+
ZE2 Late Static Binding ensuring extending "static" is not allowed
33
--FILE--
44
<?php
55

@@ -9,4 +9,4 @@ class Foo extends static {
99
?>
1010
==DONE==
1111
--EXPECTF--
12-
Fatal error: Cannot use 'static' as class name, as it is reserved in %s on line %d
12+
Fatal error: Cannot use "static" as class name, as it is reserved in %s on line %d

Zend/tests/lsb_007.phpt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
--TEST--
2-
ZE2 Late Static Binding ensuring implementing 'static' is not allowed
2+
ZE2 Late Static Binding ensuring implementing "static" is not allowed
33
--FILE--
44
<?php
55

@@ -9,4 +9,4 @@ class Foo implements static {
99
?>
1010
==DONE==
1111
--EXPECTF--
12-
Fatal error: Cannot use 'static' as interface name, as it is reserved in %s on line %d
12+
Fatal error: Cannot use "static" as interface name, as it is reserved in %s on line %d

Zend/tests/static_in_trait_insteadof_list.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@ class Test {
1515

1616
?>
1717
--EXPECTF--
18-
Fatal error: Cannot use 'static' as trait name, as it is reserved in %s on line %d
18+
Fatal error: Cannot use "static" as trait name, as it is reserved in %s on line %d

Zend/tests/static_in_trait_insteadof_reference.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@ class Test {
1515

1616
?>
1717
--EXPECTF--
18-
Fatal error: Cannot use 'static' as trait name, as it is reserved in %s on line %d
18+
Fatal error: Cannot use "static" as trait name, as it is reserved in %s on line %d

Zend/zend_compile.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1764,7 +1764,7 @@ static zend_string *zend_resolve_const_class_name_reference(zend_ast *ast, const
17641764
zend_string *class_name = zend_ast_get_str(ast);
17651765
if (ZEND_FETCH_CLASS_DEFAULT != zend_get_class_fetch_type_ast(ast)) {
17661766
zend_error_noreturn(E_COMPILE_ERROR,
1767-
"Cannot use '%s' as %s, as it is reserved",
1767+
"Cannot use \"%s\" as %s, as it is reserved",
17681768
ZSTR_VAL(class_name), type);
17691769
}
17701770
return zend_resolve_class_name(class_name, ast->attr);

0 commit comments

Comments
 (0)