From 3224ec4128a804da0555c2d44f7748e7c12db1e6 Mon Sep 17 00:00:00 2001 From: Daniel Scherzer Date: Sun, 22 Sep 2024 15:11:36 -0700 Subject: [PATCH] GH-15976: don't say "type alias" Follow-up to #15977 --- Zend/tests/gh15976/alias-names.phpt | 4 ++-- .../tests/type_declarations/scalar_reserved2_class_alias.phpt | 2 +- .../tests/type_declarations/scalar_reserved3_class_alias.phpt | 2 +- .../tests/type_declarations/scalar_reserved4_class_alias.phpt | 2 +- .../tests/type_declarations/scalar_reserved6_class_alias.phpt | 2 +- Zend/zend_API.c | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Zend/tests/gh15976/alias-names.phpt b/Zend/tests/gh15976/alias-names.phpt index d98727d69dbc5..7656c1b71c57f 100644 --- a/Zend/tests/gh15976/alias-names.phpt +++ b/Zend/tests/gh15976/alias-names.phpt @@ -8,6 +8,6 @@ class_alias( 'stdClass', 'bool' ); ?> --EXPECTF-- -Deprecated: Using "_" as a type alias is deprecated since 8.4 in %salias-names.php on line 3 +Deprecated: Using "_" as a class alias is deprecated since 8.4 in %salias-names.php on line 3 -Fatal error: Cannot use "bool" as a type alias as it is reserved in %salias-names.php on line 4 +Fatal error: Cannot use "bool" as a class alias as it is reserved in %salias-names.php on line 4 diff --git a/Zend/tests/type_declarations/scalar_reserved2_class_alias.phpt b/Zend/tests/type_declarations/scalar_reserved2_class_alias.phpt index 3e67f24ca3abb..d5a6b5030ab76 100644 --- a/Zend/tests/type_declarations/scalar_reserved2_class_alias.phpt +++ b/Zend/tests/type_declarations/scalar_reserved2_class_alias.phpt @@ -7,4 +7,4 @@ class foobar {} class_alias("foobar", "int"); ?> --EXPECTF-- -Fatal error: Cannot use "int" as a type alias as it is reserved in %s on line %d +Fatal error: Cannot use "int" as a class alias as it is reserved in %s on line %d diff --git a/Zend/tests/type_declarations/scalar_reserved3_class_alias.phpt b/Zend/tests/type_declarations/scalar_reserved3_class_alias.phpt index ad51edde8a07c..a784982a19452 100644 --- a/Zend/tests/type_declarations/scalar_reserved3_class_alias.phpt +++ b/Zend/tests/type_declarations/scalar_reserved3_class_alias.phpt @@ -7,4 +7,4 @@ class foobar {} class_alias("foobar", "float"); ?> --EXPECTF-- -Fatal error: Cannot use "float" as a type alias as it is reserved in %s on line %d +Fatal error: Cannot use "float" as a class alias as it is reserved in %s on line %d diff --git a/Zend/tests/type_declarations/scalar_reserved4_class_alias.phpt b/Zend/tests/type_declarations/scalar_reserved4_class_alias.phpt index bd1ab6c8ec10b..b57d696d3d4e0 100644 --- a/Zend/tests/type_declarations/scalar_reserved4_class_alias.phpt +++ b/Zend/tests/type_declarations/scalar_reserved4_class_alias.phpt @@ -7,4 +7,4 @@ class foobar {} class_alias("foobar", "string"); ?> --EXPECTF-- -Fatal error: Cannot use "string" as a type alias as it is reserved in %s on line %d +Fatal error: Cannot use "string" as a class alias as it is reserved in %s on line %d diff --git a/Zend/tests/type_declarations/scalar_reserved6_class_alias.phpt b/Zend/tests/type_declarations/scalar_reserved6_class_alias.phpt index 1c7f9c0e15f7b..76410bb4e6e1f 100644 --- a/Zend/tests/type_declarations/scalar_reserved6_class_alias.phpt +++ b/Zend/tests/type_declarations/scalar_reserved6_class_alias.phpt @@ -7,4 +7,4 @@ class foobar {} class_alias("foobar", "bool"); ?> --EXPECTF-- -Fatal error: Cannot use "bool" as a type alias as it is reserved in %s on line %d +Fatal error: Cannot use "bool" as a class alias as it is reserved in %s on line %d diff --git a/Zend/zend_API.c b/Zend/zend_API.c index 0068aba3c1460..35d093ff42bfe 100644 --- a/Zend/zend_API.c +++ b/Zend/zend_API.c @@ -3571,7 +3571,7 @@ ZEND_API zend_result zend_register_class_alias_ex(const char *name, size_t name_ zend_str_tolower_copy(ZSTR_VAL(lcname), name, name_len); } - zend_assert_valid_class_name(lcname, "a type alias"); + zend_assert_valid_class_name(lcname, "a class alias"); lcname = zend_new_interned_string(lcname);