Skip to content

Commit 34325c5

Browse files
DanielEScherzerDanielEScherzer
authored
zend_assert_valid_class_name(): use double quotes around names (php#15990)
1 parent 957feab commit 34325c5

23 files changed

+25
-25
lines changed

‎Zend/tests/errmsg_028.phpt

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

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

‎Zend/tests/errmsg_029.phpt

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

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

‎Zend/tests/gh15976/alias-names.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ class_alias( 'stdClass', 'bool' );
1010
--EXPECTF--
1111
Deprecated: Using "_" as a type alias is deprecated since 8.4 in %salias-names.php on line 3
1212

13-
Fatal error: Cannot use 'bool' as a type alias as it is reserved in %salias-names.php on line 4
13+
Fatal error: Cannot use "bool" as a type alias as it is reserved in %salias-names.php on line 4

‎Zend/tests/gh15976/class-names.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ class bool {}
1010
--EXPECTF--
1111
Deprecated: Using "_" as a class name is deprecated since 8.4 in %sclass-names.php on line 3
1212

13-
Fatal error: Cannot use 'bool' as a class name as it is reserved in %sclass-names.php on line 4
13+
Fatal error: Cannot use "bool" as a class name as it is reserved in %sclass-names.php on line 4

‎Zend/tests/gh15976/enum-names.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ enum bool {}
1010
--EXPECTF--
1111
Deprecated: Using "_" as an enum name is deprecated since 8.4 in %senum-names.php on line 3
1212

13-
Fatal error: Cannot use 'bool' as an enum name as it is reserved in %senum-names.php on line 4
13+
Fatal error: Cannot use "bool" as an enum name as it is reserved in %senum-names.php on line 4

‎Zend/tests/gh15976/interface-names.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ interface bool {}
1010
--EXPECTF--
1111
Deprecated: Using "_" as an interface name is deprecated since 8.4 in %sinterface-names.php on line 3
1212

13-
Fatal error: Cannot use 'bool' as an interface name as it is reserved in %sinterface-names.php on line 4
13+
Fatal error: Cannot use "bool" as an interface name as it is reserved in %sinterface-names.php on line 4

‎Zend/tests/gh15976/trait-names.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ trait bool {}
1010
--EXPECTF--
1111
Deprecated: Using "_" as a trait name is deprecated since 8.4 in %strait-names.php on line 3
1212

13-
Fatal error: Cannot use 'bool' as a trait name as it is reserved in %strait-names.php on line 4
13+
Fatal error: Cannot use "bool" as a trait name as it is reserved in %strait-names.php on line 4

‎Zend/tests/lazy_objects/unclean_shutdown.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@ $obj = $reflector->newLazyGhost(function ($obj) {
1616

1717
var_dump($obj->a);
1818
--EXPECTF--
19-
Fatal error: Cannot use 'bool' as a class name%s on line %d
19+
Fatal error: Cannot use "bool" as a class name%s on line %d

‎Zend/tests/restore_error_reporting.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ var_dump($undef_var);
1111
Warning: Undefined variable $undef_var in %s on line %d
1212
NULL
1313

14-
Fatal error: Cannot use 'self' as a class name as it is reserved in %s on line %d
14+
Fatal error: Cannot use "self" as a class name as it is reserved in %s on line %d

‎Zend/tests/special_name_error3.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ trait self {}
77

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

‎Zend/tests/type_declarations/mixed/syntax/mixed_class_error.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ class mixed
99

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

‎Zend/tests/type_declarations/scalar_relative_typehint_disallowed.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ foo(10);
1111

1212
?>
1313
--EXPECTF--
14-
Fatal error: Cannot use 'bar\int' as a type name as it is reserved in %s on line %d
14+
Fatal error: Cannot use "bar\int" as a type name as it is reserved in %s on line %d

‎Zend/tests/type_declarations/scalar_reserved2.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ Scalar type names cannot be used as class, trait or interface names (2)
66
class int {}
77
?>
88
--EXPECTF--
9-
Fatal error: Cannot use 'int' as a class name as it is reserved in %s on line %d
9+
Fatal error: Cannot use "int" as a class name as it is reserved in %s on line %d

‎Zend/tests/type_declarations/scalar_reserved2_class_alias.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ class foobar {}
77
class_alias("foobar", "int");
88
?>
99
--EXPECTF--
10-
Fatal error: Cannot use 'int' as a type alias as it is reserved in %s on line %d
10+
Fatal error: Cannot use "int" as a type alias as it is reserved in %s on line %d

‎Zend/tests/type_declarations/scalar_reserved3.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ Scalar type names cannot be used as class, trait or interface names (3)
66
class float {}
77
?>
88
--EXPECTF--
9-
Fatal error: Cannot use 'float' as a class name as it is reserved in %s on line %d
9+
Fatal error: Cannot use "float" as a class name as it is reserved in %s on line %d

‎Zend/tests/type_declarations/scalar_reserved3_class_alias.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ class foobar {}
77
class_alias("foobar", "float");
88
?>
99
--EXPECTF--
10-
Fatal error: Cannot use 'float' as a type alias as it is reserved in %s on line %d
10+
Fatal error: Cannot use "float" as a type alias as it is reserved in %s on line %d

‎Zend/tests/type_declarations/scalar_reserved4.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ Scalar type names cannot be used as class, trait or interface names (4)
66
class string {}
77
?>
88
--EXPECTF--
9-
Fatal error: Cannot use 'string' as a class name as it is reserved in %s on line %d
9+
Fatal error: Cannot use "string" as a class name as it is reserved in %s on line %d

‎Zend/tests/type_declarations/scalar_reserved4_class_alias.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ class foobar {}
77
class_alias("foobar", "string");
88
?>
99
--EXPECTF--
10-
Fatal error: Cannot use 'string' as a type alias as it is reserved in %s on line %d
10+
Fatal error: Cannot use "string" as a type alias as it is reserved in %s on line %d

‎Zend/tests/type_declarations/scalar_reserved6.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ Scalar type names cannot be used as class, trait or interface names (6)
66
class bool {}
77
?>
88
--EXPECTF--
9-
Fatal error: Cannot use 'bool' as a class name as it is reserved in %s on line %d
9+
Fatal error: Cannot use "bool" as a class name as it is reserved in %s on line %d

‎Zend/tests/type_declarations/scalar_reserved6_class_alias.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ class foobar {}
77
class_alias("foobar", "bool");
88
?>
99
--EXPECTF--
10-
Fatal error: Cannot use 'bool' as a type alias as it is reserved in %s on line %d
10+
Fatal error: Cannot use "bool" as a type alias as it is reserved in %s on line %d

‎Zend/tests/type_declarations/scalar_reserved7.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ namespace foo;
77
class int {}
88
?>
99
--EXPECTF--
10-
Fatal error: Cannot use 'int' as a class name as it is reserved in %s on line %d
10+
Fatal error: Cannot use "int" as a class name as it is reserved in %s on line %d

‎Zend/zend_compile.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ void zend_assert_valid_class_name(const zend_string *name, const char *type) /*
241241
{
242242
if (zend_is_reserved_class_name(name)) {
243243
zend_error_noreturn(E_COMPILE_ERROR,
244-
"Cannot use '%s' as %s as it is reserved", ZSTR_VAL(name), type);
244+
"Cannot use \"%s\" as %s as it is reserved", ZSTR_VAL(name), type);
245245
}
246246
if (zend_string_equals_literal(name, "_")) {
247247
zend_error(E_DEPRECATED, "Using \"_\" as %s is deprecated since 8.4", type);

‎ext/spl/tests/RecursiveIteratorIterator_dtor_order.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ foreach ($it as $v) {
1111
}
1212
?>
1313
--EXPECTF--
14-
Fatal error: Cannot use 'self' as a class name as it is reserved in %s on line %d
14+
Fatal error: Cannot use "self" as a class name as it is reserved in %s on line %d

0 commit comments

Comments
 (0)