Skip to content

Commit 98cbab2

Browse files
committed
Unserialize: Migrate "%s is returned from __sleep() multiple times" to E_WARNING
1 parent 06acb20 commit 98cbab2

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

ext/standard/tests/serialize/bug71995.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ var_dump($s);
1818
var_dump(unserialize($s));
1919
?>
2020
--EXPECTF--
21-
Notice: serialize(): "b" is returned from __sleep() multiple times in %s on line %d
21+
Warning: serialize(): "b" is returned from __sleep() multiple times in %s on line %d
2222
string(39) "O:1:"A":1:{s:1:"b";O:8:"stdClass":0:{}}"
2323
object(A)#%d (1) {
2424
["b"]=>

ext/standard/tests/serialize/sleep_mangled_name_clash.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@ $s = serialize(new Test);
1212
var_dump(str_replace("\0", '\0', $s));
1313
?>
1414
--EXPECTF--
15-
Notice: serialize(): "priv" is returned from __sleep() multiple times in %s on line %d
15+
Warning: serialize(): "priv" is returned from __sleep() multiple times in %s on line %d
1616
string(37) "O:4:"Test":1:{s:10:"\0Test\0priv";N;}"

ext/standard/var.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -842,7 +842,7 @@ static int php_var_serialize_try_add_sleep_prop(
842842
}
843843

844844
if (!zend_hash_add(ht, name, val)) {
845-
php_error_docref(NULL, E_NOTICE,
845+
php_error_docref(NULL, E_WARNING,
846846
"\"%s\" is returned from __sleep() multiple times", ZSTR_VAL(error_name));
847847
return SUCCESS;
848848
}

0 commit comments

Comments
 (0)