Fixed bug #77873

nikic · nikic · commit cb145e18b230 · 2019-04-09T17:27:02.000+02:00
diff --git a/ext/standard/tests/serialize/__serialize_002.phpt b/ext/standard/tests/serialize/__serialize_002.phpt
@@ -17,4 +17,4 @@ try {
 
 ?>
 --EXPECT--
-__serialize() must return an array
+Test::__serialize() must return an array
diff --git a/ext/standard/var.c b/ext/standard/var.c
@@ -763,7 +763,7 @@ static int php_var_serialize_call_magic_serialize(zval *retval, zval *obj) /* {{
 
 	if (Z_TYPE_P(retval) != IS_ARRAY) {
 		zval_ptr_dtor(retval);
-		zend_type_error("__serialize() must return an array");
+		zend_type_error("%s::__serialize() must return an array", ZSTR_VAL(Z_OBJCE_P(obj)->name));
 		return FAILURE;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -763,7 +763,7 @@ static int php_var_serialize_call_magic_serialize(zval retval, zval obj) /* {{`
`763`	`763`
`764`	`764`	`if (Z_TYPE_P(retval) != IS_ARRAY) {`
`765`	`765`	`zval_ptr_dtor(retval);`
`766`		`- zend_type_error("__serialize() must return an array");`
	`766`	`+ zend_type_error("%s::__serialize() must return an array", ZSTR_VAL(Z_OBJCE_P(obj)->name));`
`767`	`767`	`return FAILURE;`
`768`	`768`	`}`
`769`	`769`