mirror of
https://github.com/php/php-src.git
synced 2024-11-23 01:44:06 +08:00
Merge branch 'PHP-8.3' into PHP-8.4
* PHP-8.3: Fix failed assertion when promoting Serialize deprecation to exception
This commit is contained in:
commit
756435a50c
2
NEWS
2
NEWS
@ -14,6 +14,8 @@ PHP NEWS
|
||||
. Fixed bug GH-16054 (Segmentation fault when resizing hash table iterator
|
||||
list while adding). (nielsdos)
|
||||
. Fixed bug GH-15905 (Assertion failure for TRACK_VARS_SERVER). (cmb)
|
||||
. Fixed bug GH-15907 (Failed assertion when promoting Serialize deprecation to
|
||||
exception). (ilutov)
|
||||
|
||||
- DOM:
|
||||
. Fixed bug GH-16039 (Segmentation fault (access null pointer) in
|
||||
|
18
Zend/tests/gh15907.phpt
Normal file
18
Zend/tests/gh15907.phpt
Normal file
@ -0,0 +1,18 @@
|
||||
--TEST--
|
||||
GH-15907: Failed assertion when promoting inheritance error to exception
|
||||
--FILE--
|
||||
<?php
|
||||
|
||||
set_error_handler(function($errno, $msg) {
|
||||
throw new Exception($msg);
|
||||
});
|
||||
|
||||
class C implements Serializable {
|
||||
public function serialize() {}
|
||||
public function unserialize($serialized) {}
|
||||
}
|
||||
|
||||
?>
|
||||
--EXPECTF--
|
||||
Fatal error: During inheritance of C, while implementing Serializable: Uncaught Exception: C implements the Serializable interface, which is deprecated. Implement __serialize() and __unserialize() instead (or in addition, if support for old PHP versions is necessary) in %s:%d
|
||||
%a
|
@ -478,6 +478,10 @@ static int zend_implement_serializable(zend_class_entry *interface, zend_class_e
|
||||
if (!(class_type->ce_flags & ZEND_ACC_EXPLICIT_ABSTRACT_CLASS)
|
||||
&& (!class_type->__serialize || !class_type->__unserialize)) {
|
||||
zend_error(E_DEPRECATED, "%s implements the Serializable interface, which is deprecated. Implement __serialize() and __unserialize() instead (or in addition, if support for old PHP versions is necessary)", ZSTR_VAL(class_type->name));
|
||||
if (EG(exception)) {
|
||||
zend_exception_uncaught_error(
|
||||
"During inheritance of %s, while implementing Serializable", ZSTR_VAL(class_type->name));
|
||||
}
|
||||
}
|
||||
return SUCCESS;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user