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

GH-15976: don't say "type alias" (#15996)

Browse source 
Follow-up to GH-15977
This commit is contained in:
DanielEScherzer 2024-09-23 01:59:12 -07:00 • committed by GitHub
parent 34325c5e3a
commit 8e6d8cf1fa
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Zend/tests/gh15976/alias-names.phpt
View file

@ -8,6 +8,6 @@ class_alias( 'stdClass', 'bool' );
?> ?>
--EXPECTF-- --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

2
Zend/tests/type_declarations/scalar_reserved2_class_alias.phpt
View file

@ -7,4 +7,4 @@ class foobar {}
class_alias("foobar", "int"); class_alias("foobar", "int");
?> ?>
--EXPECTF-- --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

2
Zend/tests/type_declarations/scalar_reserved3_class_alias.phpt
View file

@ -7,4 +7,4 @@ class foobar {}
class_alias("foobar", "float"); class_alias("foobar", "float");
?> ?>
--EXPECTF-- --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

2
Zend/tests/type_declarations/scalar_reserved4_class_alias.phpt
View file

@ -7,4 +7,4 @@ class foobar {}
class_alias("foobar", "string"); class_alias("foobar", "string");
?> ?>
--EXPECTF-- --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

2
Zend/tests/type_declarations/scalar_reserved6_class_alias.phpt
View file

@ -7,4 +7,4 @@ class foobar {}
class_alias("foobar", "bool"); class_alias("foobar", "bool");
?> ?>
--EXPECTF-- --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

2
Zend/zend_API.c
View file

@ -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_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); lcname = zend_new_interned_string(lcname);