Resolve "static" to class name in error message

Author: nikic

Zend/tests/type_declarations/static_type_return.phpt

@@ -75,7 +75,7 @@ object(B)#3 (0) {
 
 object(A)#3 (0) {
 }
-Return value of A::test2() must be an instance of static, instance of A returned
+Return value of A::test2() must be an instance of B, instance of A returned
 
 object(A)#3 (0) {
 }
@@ -84,7 +84,7 @@ object(C)#3 (0) {
 
 object(A)#3 (0) {
 }
-Return value of A::test4() must be of type static|array, instance of A returned
+Return value of A::test4() must be of type B|array, instance of A returned
 
 Return value of {closure}() must be an instance of static, instance of stdClass returned
 object(A)#1 (0) {

Zend/zend_compile.c

@@ -1197,7 +1197,14 @@ zend_string *zend_type_to_string_resolved(zend_type type, zend_class_entry *scop
 
 	uint32_t type_mask = ZEND_TYPE_FULL_MASK(type);
 	if (type_mask & MAY_BE_STATIC) {
-		str = add_type_string(str, ZSTR_KNOWN(ZEND_STR_STATIC));
+		zend_string *name = ZSTR_KNOWN(ZEND_STR_STATIC);
+		if (scope) {
+			zend_class_entry *called_scope = zend_get_called_scope(EG(current_execute_data));
+			if (called_scope) {
+				name = called_scope->name;
+			}
+		}
+		str = add_type_string(str, name);
 	}
 	if (type_mask & MAY_BE_CALLABLE) {
 		str = add_type_string(str, ZSTR_KNOWN(ZEND_STR_CALLABLE));

Zend/zend_execute.c

@@ -674,7 +674,7 @@ static ZEND_COLD void zend_verify_type_error_common(
 	}
 
 	if (is_union_type(arg_info->type)) {
-		zend_string *type_str = zend_type_to_string(arg_info->type);
+		zend_string *type_str = zend_type_to_string_resolved(arg_info->type, zf->common.scope);
 		smart_str_appends(&str, "be of type ");
 		smart_str_append(&str, type_str);
 		zend_string_release(type_str);
@@ -714,9 +714,16 @@ static ZEND_COLD void zend_verify_type_error_common(
 			case MAY_BE_ITERABLE:
 				smart_str_appends(&str, "be iterable");
 				break;
-			case MAY_BE_STATIC:
-				smart_str_appends(&str, "be an instance of static");
+			case MAY_BE_STATIC: {
+				zend_class_entry *called_scope = zend_get_called_scope(EG(current_execute_data));
+				smart_str_appends(&str, "be an instance of ");
+				if (called_scope) {
+					smart_str_append(&str, called_scope->name);
+				} else {
+					smart_str_appends(&str, "static");
+				}
 				break;
+			}
 			default:
 			{
 				/* Hack to print the type without null */