Names in deprecation warnings

Author: DanielEScherzer

Zend/tests/attributes/deprecated/class_alias/access_constant.phpt

@@ -12,5 +12,5 @@ var_dump(MyAlias::TEST);
 
 ?>
 --EXPECTF--
-Deprecated: Alias is deprecated in %s on line %d
+Deprecated: Alias MyAlias for class Clazz is deprecated in %s on line %d
 int(1)

Zend/tests/attributes/deprecated/class_alias/access_static_prop.phpt

@@ -12,4 +12,4 @@ MyAlias::$v = true;
 
 ?>
 --EXPECTF--
-Deprecated: Alias is deprecated in %s on line %d
+Deprecated: Alias MyAlias for class Clazz is deprecated in %s on line %d

Zend/tests/attributes/deprecated/class_alias/call_static_method.phpt

@@ -14,5 +14,5 @@ MyAlias::doNothing();
 
 ?>
 --EXPECTF--
-Deprecated: Alias is deprecated in %s on line %d
+Deprecated: Alias MyAlias for class Clazz is deprecated in %s on line %d
 Clazz::doNothing

Zend/tests/attributes/deprecated/class_alias/messages.phpt

@@ -23,11 +23,11 @@ MyAlias::doNothing();
 
 ?>
 --EXPECTF--
-Deprecated: Alias is deprecated since 8.4, don't use the alias in %s on line %d
+Deprecated: Alias MyAlias for class Clazz is deprecated since 8.4, don't use the alias in %s on line %d
 int(1)
 
-Deprecated: Alias is deprecated since 8.4, don't use the alias in %s on line %d
+Deprecated: Alias MyAlias for class Clazz is deprecated since 8.4, don't use the alias in %s on line %d
 
-Deprecated: Alias is deprecated since 8.4, don't use the alias in %s on line %d
+Deprecated: Alias MyAlias for class Clazz is deprecated since 8.4, don't use the alias in %s on line %d
 
-Deprecated: Alias is deprecated since 8.4, don't use the alias in %s on line %d
+Deprecated: Alias MyAlias for class Clazz is deprecated since 8.4, don't use the alias in %s on line %d

Zend/tests/attributes/deprecated/class_alias/use_constructor.phpt

@@ -14,5 +14,5 @@ $o = new MyAlias();
 
 ?>
 --EXPECTF--
-Deprecated: Alias is deprecated in %s on line %d
+Deprecated: Alias MyAlias for class Clazz is deprecated in %s on line %d
 Clazz::__construct

Zend/zend_API.c

@@ -3603,6 +3603,9 @@ ZEND_API zend_result zend_register_class_alias_ex(const char *name, size_t name_
 	 */
 	zend_class_alias *alias = zend_class_alias_init(ce);
 
+	zend_string *original_name = zend_string_init(name, name_len, persistent);
+	alias->name = original_name;
+
 	ZVAL_ALIAS_PTR(&zv, alias);
 
 	ret = zend_hash_add(CG(class_table), lcname, &zv);

Zend/zend_class_alias.c

@@ -27,6 +27,7 @@ zend_class_alias * zend_class_alias_init(zend_class_entry *ce) {
 	GC_SET_REFCOUNT(alias, 1);
 
 	alias->ce = ce;
+	alias->name = NULL;
 	alias->attributes = NULL;
 	alias->alias_flags = 0;
 
@@ -42,7 +43,9 @@ ZEND_API ZEND_COLD void ZEND_FASTCALL zend_deprecated_class_alias(const zend_cla
 		return;
 	}
 
-	zend_error_unchecked(E_USER_DEPRECATED, "Alias is deprecated%S",
+	zend_error_unchecked(E_USER_DEPRECATED, "Alias %s for class %s is deprecated%S",
+		ZSTR_VAL(alias->name),
+		ZSTR_VAL(alias->ce->name),
 		message_suffix
 	);
 

Zend/zend_class_alias.h

@@ -24,6 +24,7 @@
 struct _zend_class_alias {
     zend_refcounted_h gc;
     zend_class_entry *ce;
+    zend_string *name;
     HashTable *attributes;
     uint32_t alias_flags;
 };

Zend/zend_opcode.c

@@ -303,6 +303,10 @@ ZEND_API void destroy_zend_class(zval *zv)
 			zend_hash_release(class_alias->attributes);
 			class_alias->attributes = NULL;
 		}
+		if (class_alias->name) {
+			zend_string_release(class_alias->name);
+			class_alias->name = NULL;
+		}
 		return;
 	}