Skip to content

Commit c07b9cc

Browse files
committed
Merge branch 'PHP-8.5'
2 parents e88765c + fc35396 commit c07b9cc

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+13
-215
lines changed

Zend/tests/enum/__sleep.phpt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,4 @@ enum Foo {
1313

1414
?>
1515
--EXPECTF--
16-
Deprecated: The __sleep() serialization magic method has been deprecated. Implement __serialize() instead (or in addition, if support for old PHP versions is necessary) in %s on line %d
17-
1816
Fatal error: Enum Foo cannot include magic method __sleep in %s on line %d

Zend/tests/enum/__wakeup.phpt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,4 @@ enum Foo {
1313

1414
?>
1515
--EXPECTF--
16-
Deprecated: The __wakeup() serialization magic method has been deprecated. Implement __unserialize() instead (or in addition, if support for old PHP versions is necessary) in %s on line %d
17-
1816
Fatal error: Enum Foo cannot include magic method __wakeup in %s on line %d

Zend/tests/lazy_objects/oss_fuzz_71446.phpt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,3 @@ $obj = $reflector->newLazyProxy(function() {
2020
serialize($obj);
2121
?>
2222
--EXPECTF--
23-
Deprecated: The __sleep() serialization magic method has been deprecated. Implement __serialize() instead (or in addition, if support for old PHP versions is necessary) in %s on line %d

Zend/tests/lazy_objects/serialize___sleep.phpt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ try {
3636

3737
?>
3838
--EXPECTF--
39-
Deprecated: The __sleep() serialization magic method has been deprecated. Implement __serialize() instead (or in addition, if support for old PHP versions is necessary) in %s on line %d
4039
Init on serialize and successful initialization
4140
string(27) "O:1:"C":1:{s:4:"%0C%0b";i:1;}"
4241
Init on serialize and failed initialization

Zend/tests/lazy_objects/serialize___sleep_initializes.phpt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ $obj = $reflector->newLazyProxy(function ($obj) {
3737
test('Proxy', $obj);
3838

3939
--EXPECTF--
40-
Deprecated: The __sleep() serialization magic method has been deprecated. Implement __serialize() instead (or in addition, if support for old PHP versions is necessary) in %s on line %d
4140
# Ghost:
4241
string(11) "initializer"
4342
string(24) "O:1:"C":1:{s:1:"a";i:1;}"

Zend/tests/lazy_objects/serialize___sleep_skip_flag.phpt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ $obj = $reflector->newLazyProxy(function ($obj) {
3535
test('Proxy', $obj);
3636

3737
--EXPECTF--
38-
Deprecated: The __sleep() serialization magic method has been deprecated. Implement __serialize() instead (or in addition, if support for old PHP versions is necessary) in %s on line %d
3938
# Ghost:
4039
string(12) "O:1:"C":0:{}"
4140
object(C)#%d (0) {

Zend/tests/lazy_objects/serialize___sleep_skip_flag_may_initialize.phpt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ $obj = $reflector->newLazyProxy(function ($obj) {
3838
test('Proxy', $obj);
3939

4040
--EXPECTF--
41-
Deprecated: The __sleep() serialization magic method has been deprecated. Implement __serialize() instead (or in addition, if support for old PHP versions is necessary) in %s on line %d
4241
# Ghost:
4342
string(11) "initializer"
4443
int(1)

Zend/tests/serialize/bug34045.phpt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,5 @@ $db_str = serialize($db);
2424
$db2 = unserialize($db_str);
2525
echo "ok\n";
2626
?>
27-
--EXPECTF--
28-
Deprecated: The __wakeup() serialization magic method has been deprecated. Implement __unserialize() instead (or in addition, if support for old PHP versions is necessary) in %s on line %d
27+
--EXPECT--
2928
ok

Zend/zend_compile.c

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9375,15 +9375,6 @@ static void zend_compile_class_decl(znode *result, zend_ast *ast, bool toplevel)
93759375
ce->ce_flags |= ZEND_ACC_TOP_LEVEL;
93769376
}
93779377

9378-
if (ce->__serialize == NULL && zend_hash_exists(&ce->function_table, ZSTR_KNOWN(ZEND_STR_SLEEP))) {
9379-
zend_error(E_DEPRECATED, "The __sleep() serialization magic method has been deprecated."
9380-
" Implement __serialize() instead (or in addition, if support for old PHP versions is necessary)");
9381-
}
9382-
if (ce->__unserialize == NULL && zend_hash_exists(&ce->function_table, ZSTR_KNOWN(ZEND_STR_WAKEUP))) {
9383-
zend_error(E_DEPRECATED, "The __wakeup() serialization magic method has been deprecated."
9384-
" Implement __unserialize() instead (or in addition, if support for old PHP versions is necessary)");
9385-
}
9386-
93879378
/* We currently don't early-bind classes that implement interfaces or use traits */
93889379
if (!ce->num_interfaces && !ce->num_traits && !ce->num_hooked_prop_variance_checks
93899380
#ifdef ZEND_OPCACHE_SHM_REATTACHMENT

ext/date/tests/bug62852_var2.phpt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@ try {
2222
var_dump( $foo );
2323
?>
2424
--EXPECTF--
25-
Deprecated: The __wakeup() serialization magic method has been deprecated. Implement __unserialize() instead (or in addition, if support for old PHP versions is necessary) in %s on line %d
26-
2725
Fatal error: Uncaught Error: Invalid serialization data for DateTime object in %sbug62852_var2.php:%d
2826
Stack trace:
2927
#0 [internal function]: DateTime->__unserialize(Array)

0 commit comments

Comments
 (0)