diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2019-04-09 17:27:22 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-04-09 17:27:22 +0200 |
| commit | e640f64008237a9470344b84d5b2fc85470fee9d (patch) | |
| tree | babe3bf7894705d982d1b659bdc881fd49f88c4a | |
| parent | 6cec79595160744e524838123b5dd5f3fc36a3e7 (diff) | |
| parent | cb145e18b230b59f235855ba976fed14ca531755 (diff) | |
| download | php-git-e640f64008237a9470344b84d5b2fc85470fee9d.tar.gz | |
Merge branch 'PHP-7.4'
| -rw-r--r-- | ext/standard/tests/serialize/__serialize_002.phpt | 2 | ||||
| -rw-r--r-- | ext/standard/var.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ext/standard/tests/serialize/__serialize_002.phpt b/ext/standard/tests/serialize/__serialize_002.phpt index 143ee933ed..72851eed4b 100644 --- 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 index 12834e0fca..de9de3202f 100644 --- 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; } |