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

DanielEScherzer · web-flow · commit 8e6d8cf1fab8 · 2024-09-23T09:59:12.000+01:00
Follow-up to GH-15977
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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);
 

Original file line number	Diff line number	Diff line change
`@@ -3571,7 +3571,7 @@ ZEND_API zend_result zend_register_class_alias_ex(const char *name, size_t name_`
`3571`	`3571`	`zend_str_tolower_copy(ZSTR_VAL(lcname), name, name_len);`
`3572`	`3572`	`}`
`3573`	`3573`
`3574`		`- zend_assert_valid_class_name(lcname, "a type alias");`
	`3574`	`+ zend_assert_valid_class_name(lcname, "a class alias");`
`3575`	`3575`
`3576`	`3576`	`lcname = zend_new_interned_string(lcname);`
`3577`	`3577`