feat: impove zend_class_use_internal_traits naming.

Author: khaledalam

Zend/zend_API.h

@@ -392,7 +392,7 @@ ZEND_API zend_class_entry *zend_register_internal_class_ex(const zend_class_entr
 ZEND_API zend_class_entry *zend_register_internal_class_with_flags(const zend_class_entry *class_entry, zend_class_entry *parent_ce, uint32_t flags);
 ZEND_API zend_class_entry *zend_register_internal_interface(const zend_class_entry *orig_class_entry);
 ZEND_API void zend_class_implements(zend_class_entry *class_entry, int num_interfaces, ...);
-ZEND_API void zend_class_use_traits(zend_class_entry *class_entry, int num_traits, ...);
+ZEND_API void zend_class_use_internal_traits(zend_class_entry *class_entry, int num_traits, ...);
 
 ZEND_API zend_result zend_register_class_alias_ex(const char *name, size_t name_len, zend_class_entry *ce, bool persistent);
 

Zend/zend_inheritance.c

@@ -2247,66 +2247,6 @@ ZEND_API void zend_do_implement_interface(zend_class_entry *ce, zend_class_entry
 }
 /* }}} */
 
-static void zend_do_traits_method_binding(zend_class_entry *ce, zend_class_entry **traits, HashTable **exclude_tables, zend_class_entry **aliases, bool verify_abstract, bool *contains_abstract_methods);
-static void zend_do_traits_constant_binding(zend_class_entry *ce, zend_class_entry **traits);
-static void zend_do_traits_property_binding(zend_class_entry *ce, zend_class_entry **traits);
-static void zend_fixup_trait_method(zend_function *fn, zend_class_entry *ce);
-
-ZEND_API void zend_class_use_traits(zend_class_entry *class_entry, int num_traits, ...) /* {{{ */
-{
-	zend_class_entry *trait_entry;
-	va_list trait_list;
-	zend_class_entry **traits;
-	zend_function *fn;
-	bool contains_abstract_methods = false;
-
-	ZEND_ASSERT(class_entry->ce_flags & ZEND_ACC_LINKED);
-
-	if (num_traits == 0) {
-		return;
-	}
-
-	traits = safe_emalloc(num_traits, sizeof(zend_class_entry *), 0);
-	class_entry->trait_names = safe_pemalloc(num_traits, sizeof(zend_class_name), 0, 1);
-	class_entry->num_traits = num_traits;
-
-	va_start(trait_list, num_traits);
-	for (int i = 0; i < num_traits; i++) {
-		trait_entry = va_arg(trait_list, zend_class_entry *);
-		class_entry->trait_names[i].name = zend_string_copy(trait_entry->name);
-		class_entry->trait_names[i].lc_name = zend_string_tolower_ex(zend_string_copy(trait_entry->name), 1);
-
-		if (UNEXPECTED(!(trait_entry->ce_flags & ZEND_ACC_TRAIT))) {
-			efree(traits);
-			zend_error_noreturn(E_ERROR, "Class %s cannot use %s - it is not a trait",
-				ZSTR_VAL(class_entry->name), ZSTR_VAL(trait_entry->name));
-			return;
-		}
-		traits[i] = trait_entry;
-	}
-	va_end(trait_list);
-
-	zend_do_traits_method_binding(class_entry, traits, NULL, NULL, false, &contains_abstract_methods);
-
-	zend_do_traits_constant_binding(class_entry, traits);
-
-	zend_do_traits_property_binding(class_entry, traits);
-
-	ZEND_HASH_MAP_FOREACH_PTR(&class_entry->function_table, fn) {
-		zend_fixup_trait_method(fn, class_entry);
-	} ZEND_HASH_FOREACH_END();
-
-	if (contains_abstract_methods) {
-		zend_do_traits_method_binding(class_entry, traits, NULL, NULL, true, &contains_abstract_methods);
-		ZEND_HASH_MAP_FOREACH_PTR(&class_entry->function_table, fn) {
-			zend_fixup_trait_method(fn, class_entry);
-		} ZEND_HASH_FOREACH_END();
-	}
-
-	efree(traits);
-}
-/* }}} */
-
 static void zend_do_implement_interfaces(zend_class_entry *ce, zend_class_entry **interfaces) /* {{{ */
 {
 	uint32_t num_parent_interfaces = ce->parent ? ce->parent->num_interfaces : 0;
@@ -3072,6 +3012,61 @@ static void zend_do_traits_property_binding(zend_class_entry *ce, zend_class_ent
 }
 /* }}} */
 
+ZEND_API void zend_class_use_internal_traits(zend_class_entry *class_entry, int num_traits, ...) /* {{{ */
+{
+	zend_class_entry *trait_entry;
+	va_list trait_list;
+	zend_class_entry **traits;
+	zend_function *fn;
+	bool contains_abstract_methods = false;
+
+	ZEND_ASSERT(class_entry->ce_flags & ZEND_ACC_LINKED);
+
+	if (num_traits == 0) {
+		return;
+	}
+
+	traits = safe_emalloc(num_traits, sizeof(zend_class_entry *), 0);
+	class_entry->trait_names = safe_pemalloc(num_traits, sizeof(zend_class_name), 0, 1);
+	class_entry->num_traits = num_traits;
+
+	va_start(trait_list, num_traits);
+	for (int i = 0; i < num_traits; i++) {
+		trait_entry = va_arg(trait_list, zend_class_entry *);
+		class_entry->trait_names[i].name = zend_string_copy(trait_entry->name);
+		class_entry->trait_names[i].lc_name = zend_string_tolower_ex(zend_string_copy(trait_entry->name), 1);
+
+		if (UNEXPECTED(!(trait_entry->ce_flags & ZEND_ACC_TRAIT))) {
+			efree(traits);
+			zend_error_noreturn(E_ERROR, "Class %s cannot use %s - it is not a trait",
+				ZSTR_VAL(class_entry->name), ZSTR_VAL(trait_entry->name));
+			return;
+		}
+		traits[i] = trait_entry;
+	}
+	va_end(trait_list);
+
+	zend_do_traits_method_binding(class_entry, traits, NULL, NULL, false, &contains_abstract_methods);
+
+	zend_do_traits_constant_binding(class_entry, traits);
+
+	zend_do_traits_property_binding(class_entry, traits);
+
+	ZEND_HASH_MAP_FOREACH_PTR(&class_entry->function_table, fn) {
+		zend_fixup_trait_method(fn, class_entry);
+	} ZEND_HASH_FOREACH_END();
+
+	if (contains_abstract_methods) {
+		zend_do_traits_method_binding(class_entry, traits, NULL, NULL, true, &contains_abstract_methods);
+		ZEND_HASH_MAP_FOREACH_PTR(&class_entry->function_table, fn) {
+			zend_fixup_trait_method(fn, class_entry);
+		} ZEND_HASH_FOREACH_END();
+	}
+
+	efree(traits);
+}
+/* }}} */
+
 #define MAX_ABSTRACT_INFO_CNT 3
 #define MAX_ABSTRACT_INFO_FMT "%s%s%s%s"
 #define DISPLAY_ABSTRACT_FN(idx) \

build/gen_stub.php

@@ -3601,7 +3601,7 @@ function (Name $item) {
         );
 
         if (!empty($traits)) {
-            $code .= "\tzend_class_use_traits(class_entry, " . count($traits) . ", " . implode(", ", $traits) . ");\n";
+            $code .= "\tzend_class_use_internal_traits(class_entry, " . count($traits) . ", " . implode(", ", $traits) . ");\n";
         }
 
         if ($this->alias) {

ext/zend_test/test_arginfo.h

@@ -1,5 +1,5 @@
 --TEST--
-Test internal class using trait via zend_class_use_traits
+Test internal class using trait via zend_class_use_internal_traits
 --EXTENSIONS--
 zend_test
 --FILE--