Review fixes

Author: DanielEScherzer

Zend/zend_attributes.c

@@ -116,21 +116,17 @@ static zend_string *validate_deprecated(
 	zend_class_entry *scope
 ) {
 	if (target != ZEND_ATTRIBUTE_TARGET_CLASS) {
-		// Being used for a method or something, validation does not apply
+		/* Being used for a method or something, validation does not apply */
 		return NULL;
 	}
-	if (scope->ce_flags & ZEND_ACC_TRAIT) {
-		scope->ce_flags |= ZEND_ACC_DEPRECATED;
-		return NULL;
+	if (!(scope->ce_flags & ZEND_ACC_TRAIT)) {
+		const char *type = zend_get_object_type_case(scope, false);
+		return zend_strpprintf(0, "Cannot apply #[Deprecated] to %s %s", type, ZSTR_VAL(scope->name));
 	}
 
-	const char *type = "class";
-	if (scope->ce_flags & ZEND_ACC_INTERFACE) {
-		type = "interface";
-	} else if (scope->ce_flags & ZEND_ACC_ENUM) {
-		type = "enum";
-	}
-	return zend_strpprintf(0, "Cannot apply #[Deprecated] to %s %s", type, ZSTR_VAL(scope->name));
+	scope->ce_flags |= ZEND_ACC_DEPRECATED;
+	return NULL;
+
 }
 
 ZEND_METHOD(Attribute, __construct)

Zend/zend_execute.c

@@ -2006,7 +2006,7 @@ ZEND_API ZEND_COLD void ZEND_FASTCALL zend_deprecated_constant(const zend_consta
 	zend_string_release(message_suffix);
 }
 
-ZEND_API ZEND_COLD void ZEND_FASTCALL zend_deprecated_trait(
+ZEND_API ZEND_COLD void zend_use_of_deprecated_trait(
 	zend_class_entry *trait,
 	const zend_string *used_by
 ) {

Zend/zend_execute.h

@@ -66,7 +66,7 @@ ZEND_API ZEND_COLD void ZEND_FASTCALL zend_deprecated_function(const zend_functi
 ZEND_API ZEND_COLD void ZEND_FASTCALL zend_nodiscard_function(const zend_function *fbc);
 ZEND_API ZEND_COLD void ZEND_FASTCALL zend_deprecated_class_constant(const zend_class_constant *c, const zend_string *constant_name);
 ZEND_API ZEND_COLD void ZEND_FASTCALL zend_deprecated_constant(const zend_constant *c, const zend_string *constant_name);
-ZEND_API ZEND_COLD void ZEND_FASTCALL zend_deprecated_trait(zend_class_entry *trait, const zend_string *used_by);
+ZEND_API ZEND_COLD void zend_use_of_deprecated_trait(zend_class_entry *trait, const zend_string *used_by);
 ZEND_API ZEND_COLD void ZEND_FASTCALL zend_false_to_array_deprecated(void);
 ZEND_COLD void ZEND_FASTCALL zend_param_must_be_ref(const zend_function *func, uint32_t arg_num);
 ZEND_API ZEND_COLD void ZEND_FASTCALL zend_use_resource_as_offset(const zval *dim);

Zend/zend_inheritance.c

@@ -3525,7 +3525,7 @@ ZEND_API zend_class_entry *zend_do_link_class(zend_class_entry *ce, zend_string
 				return NULL;
 			}
 			if (UNEXPECTED(trait->ce_flags & ZEND_ACC_DEPRECATED)) {
-				zend_deprecated_trait(trait, ce->name);
+				zend_use_of_deprecated_trait(trait, ce->name);
 				if (UNEXPECTED(EG(exception))) {
 					free_alloca(traits_and_interfaces, use_heap);
 					return NULL;