From 5af38a483817a19f1c56c9e0432117f71a602ad9 Mon Sep 17 00:00:00 2001 From: Jeremy Mikola Date: Fri, 6 Aug 2021 16:58:40 -0400 Subject: [PATCH] Include class name in Serializable deprecation message --- Zend/tests/bug64354.phpt | 2 +- Zend/tests/enum/no-implement-serializable-indirect.phpt | 2 +- Zend/tests/enum/no-implement-serializable.phpt | 2 +- Zend/tests/serializable_deprecation.phpt | 2 +- Zend/tests/traits/interface_003.phpt | 2 +- Zend/zend_interfaces.c | 2 +- ext/pdo/tests/bug_44409.phpt | 2 +- ext/pdo/tests/pdo_018.phpt | 6 +++--- ext/pdo_mysql/tests/pdo_mysql_stmt_fetch_serialize.phpt | 2 +- .../tests/pdo_mysql_stmt_fetch_serialize_simple.phpt | 2 +- ext/standard/tests/serialize/005.phpt | 6 +++--- ext/standard/tests/serialize/bug36424.phpt | 6 +++--- ext/standard/tests/serialize/bug64146.phpt | 2 +- ext/standard/tests/serialize/bug64354_3.phpt | 2 +- ext/standard/tests/serialize/bug65481.phpt | 2 +- ext/standard/tests/serialize/bug70172.phpt | 2 +- ext/standard/tests/serialize/bug70172_2.phpt | 2 +- ext/standard/tests/serialize/bug70219_1.phpt | 2 +- ext/standard/tests/serialize/bug70436.phpt | 2 +- ext/standard/tests/serialize/bug71940.phpt | 2 +- ext/standard/tests/serialize/bug72663_2.phpt | 2 +- ext/standard/tests/serialize/bug80411.phpt | 2 +- ext/standard/tests/serialize/max_depth.phpt | 4 ++-- ext/standard/tests/serialize/ref_to_failed_serialize.phpt | 2 +- ext/standard/tests/serialize/serialization_objects_010.phpt | 2 +- ext/standard/tests/strings/bug72663.phpt | 2 +- tests/classes/serialize_001.phpt | 2 +- 27 files changed, 34 insertions(+), 34 deletions(-) diff --git a/Zend/tests/bug64354.phpt b/Zend/tests/bug64354.phpt index 79f08e48c0de5..455bab4d7d839 100644 --- a/Zend/tests/bug64354.phpt +++ b/Zend/tests/bug64354.phpt @@ -21,5 +21,5 @@ try { } ?> --EXPECTF-- -Deprecated: The Serializable interface is deprecated. Implement __serialize() and __unserialize() instead (or in addition, if support for old PHP versions is necessary) in %s on line %d +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) in %s on line %d string(9) "serialize" diff --git a/Zend/tests/enum/no-implement-serializable-indirect.phpt b/Zend/tests/enum/no-implement-serializable-indirect.phpt index a93325a34a85a..efd9229d9edc9 100644 --- a/Zend/tests/enum/no-implement-serializable-indirect.phpt +++ b/Zend/tests/enum/no-implement-serializable-indirect.phpt @@ -21,6 +21,6 @@ var_dump(unserialize(serialize(Foo::Bar))); ?> --EXPECTF-- -Deprecated: The Serializable interface is deprecated. Implement __serialize() and __unserialize() instead (or in addition, if support for old PHP versions is necessary) in %s on line %d +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) in %s on line %d Fatal error: Enums may not implement the Serializable interface in %s on line %d diff --git a/Zend/tests/enum/no-implement-serializable.phpt b/Zend/tests/enum/no-implement-serializable.phpt index 66b1505d51e57..355d62b71ba53 100644 --- a/Zend/tests/enum/no-implement-serializable.phpt +++ b/Zend/tests/enum/no-implement-serializable.phpt @@ -19,6 +19,6 @@ var_dump(unserialize(serialize(Foo::Bar))); ?> --EXPECTF-- -Deprecated: The Serializable interface is deprecated. Implement __serialize() and __unserialize() instead (or in addition, if support for old PHP versions is necessary) in %s on line %d +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) in %s on line %d Fatal error: Enums may not implement the Serializable interface in %s on line %d diff --git a/Zend/tests/serializable_deprecation.phpt b/Zend/tests/serializable_deprecation.phpt index 6f5b2883b2a20..9d98a2cdf549c 100644 --- a/Zend/tests/serializable_deprecation.phpt +++ b/Zend/tests/serializable_deprecation.phpt @@ -20,4 +20,4 @@ class D extends A implements I { ?> --EXPECTF-- -Deprecated: The Serializable interface is deprecated. Implement __serialize() and __unserialize() instead (or in addition, if support for old PHP versions is necessary) in %s on line %d +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) in %s on line %d diff --git a/Zend/tests/traits/interface_003.phpt b/Zend/tests/traits/interface_003.phpt index c4c3f1e57b7e8..fdd80f0952272 100644 --- a/Zend/tests/traits/interface_003.phpt +++ b/Zend/tests/traits/interface_003.phpt @@ -21,7 +21,7 @@ var_dump(unserialize($o)); ?> --EXPECTF-- -Deprecated: The Serializable interface is deprecated. Implement __serialize() and __unserialize() instead (or in addition, if support for old PHP versions is necessary) in %s on line %d +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) in %s on line %d string(20) "C:3:"bar":6:{foobar}" string(6) "foobar" object(bar)#%d (0) { diff --git a/Zend/zend_interfaces.c b/Zend/zend_interfaces.c index cda5823a38ec4..9079045fbf723 100644 --- a/Zend/zend_interfaces.c +++ b/Zend/zend_interfaces.c @@ -419,7 +419,7 @@ 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, "The Serializable interface is deprecated. Implement __serialize() and __unserialize() instead (or in addition, if support for old PHP versions is necessary)"); + 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)", class_type->name->val); } return SUCCESS; } diff --git a/ext/pdo/tests/bug_44409.phpt b/ext/pdo/tests/bug_44409.phpt index b80e63398f722..6d2f2218d65ef 100644 --- a/ext/pdo/tests/bug_44409.phpt +++ b/ext/pdo/tests/bug_44409.phpt @@ -42,7 +42,7 @@ print_r($stmt->fetchAll(PDO::FETCH_CLASS|PDO::FETCH_SERIALIZE, "bug44409")); ?> --EXPECTF-- -Deprecated: The Serializable interface is deprecated. Implement __serialize() and __unserialize() instead (or in addition, if support for old PHP versions is necessary) in %s on line %d +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) in %s on line %d Deprecated: PDOStatement::fetchAll(): The PDO::FETCH_SERIALIZE mode is deprecated in %s on line %d Method called: bug44409::unserialize('Data from DB') diff --git a/ext/pdo/tests/pdo_018.phpt b/ext/pdo/tests/pdo_018.phpt index 3ca8f43a36c42..2b512b1f3f583 100644 --- a/ext/pdo/tests/pdo_018.phpt +++ b/ext/pdo/tests/pdo_018.phpt @@ -184,11 +184,11 @@ var_dump($stmt->fetchAll(PDO::FETCH_CLASS|PDO::FETCH_CLASSTYPE|PDO::FETCH_SERIAL ?> --EXPECTF-- -Deprecated: The Serializable interface is deprecated. Implement __serialize() and __unserialize() instead (or in addition, if support for old PHP versions is necessary) in %s on line %d +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) in %s on line %d -Deprecated: The Serializable interface is deprecated. Implement __serialize() and __unserialize() instead (or in addition, if support for old PHP versions is necessary) in %s on line %d +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) in %s on line %d -Deprecated: The Serializable interface is deprecated. Implement __serialize() and __unserialize() instead (or in addition, if support for old PHP versions is necessary) in %s on line %d +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) in %s on line %d string(1) "3" array(3) { [0]=> diff --git a/ext/pdo_mysql/tests/pdo_mysql_stmt_fetch_serialize.phpt b/ext/pdo_mysql/tests/pdo_mysql_stmt_fetch_serialize.phpt index ed1d108b6391b..9cff31ffea6f4 100644 --- a/ext/pdo_mysql/tests/pdo_mysql_stmt_fetch_serialize.phpt +++ b/ext/pdo_mysql/tests/pdo_mysql_stmt_fetch_serialize.phpt @@ -121,7 +121,7 @@ $db = MySQLPDOTest::factory(); $db->exec('DROP TABLE IF EXISTS test'); ?> --EXPECTF-- -Deprecated: The Serializable interface is deprecated. Implement __serialize() and __unserialize() instead (or in addition, if support for old PHP versions is necessary) in %s on line %d +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) in %s on line %d Creating an object, serializing it and writing it to DB... myclass::singleton(Creating object) myclass::__construct(Creating object) diff --git a/ext/pdo_mysql/tests/pdo_mysql_stmt_fetch_serialize_simple.phpt b/ext/pdo_mysql/tests/pdo_mysql_stmt_fetch_serialize_simple.phpt index 02897dbbadf1a..b70e81f3da335 100644 --- a/ext/pdo_mysql/tests/pdo_mysql_stmt_fetch_serialize_simple.phpt +++ b/ext/pdo_mysql/tests/pdo_mysql_stmt_fetch_serialize_simple.phpt @@ -70,7 +70,7 @@ MySQLPDOTest::skip(); print "done!\n"; ?> --EXPECTF-- -Deprecated: The Serializable interface is deprecated. Implement __serialize() and __unserialize() instead (or in addition, if support for old PHP versions is necessary) in %s on line %d +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) in %s on line %d Lets see what the Serializeable interface makes our object behave like... myclass::__construct('Called by script') - note that it must not be called when unserializing myclass::serialize() diff --git a/ext/standard/tests/serialize/005.phpt b/ext/standard/tests/serialize/005.phpt index 1ce0071060734..5c8ad636aeff6 100644 --- a/ext/standard/tests/serialize/005.phpt +++ b/ext/standard/tests/serialize/005.phpt @@ -128,7 +128,7 @@ echo "===AutoNA===\n"; var_dump(unserialize('O:22:"autoload_not_available":0:{}')); ?> --EXPECTF-- -Deprecated: The Serializable interface is deprecated. Implement __serialize() and __unserialize() instead (or in addition, if support for old PHP versions is necessary) in %s on line %d +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) in %s on line %d ===O1=== TestOld::__sleep() string(18) "O:7:"TestOld":0:{}" @@ -153,7 +153,7 @@ object(TestNAOld)#%d (0) { ===NANew=== unserializer(TestNANew) -Deprecated: The Serializable interface is deprecated. Implement __serialize() and __unserialize() instead (or in addition, if support for old PHP versions is necessary) in %s on line %d +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) in %s on line %d Warning: Erroneous data format for unserializing 'TestNANew' in %s005.php on line %d @@ -162,7 +162,7 @@ bool(false) ===NANew2=== unserializer(TestNANew2) -Deprecated: The Serializable interface is deprecated. Implement __serialize() and __unserialize() instead (or in addition, if support for old PHP versions is necessary) in %s on line %d +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) in %s on line %d TestNew::unserialize() object(TestNANew2)#%d (0) { } diff --git a/ext/standard/tests/serialize/bug36424.phpt b/ext/standard/tests/serialize/bug36424.phpt index 06bd52e353ada..55bc38e94c23c 100644 --- a/ext/standard/tests/serialize/bug36424.phpt +++ b/ext/standard/tests/serialize/bug36424.phpt @@ -42,11 +42,11 @@ echo "Done\n"; ?> --EXPECTF-- -Deprecated: The Serializable interface is deprecated. Implement __serialize() and __unserialize() instead (or in addition, if support for old PHP versions is necessary) in %s on line %d +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) in %s on line %d -Deprecated: The Serializable interface is deprecated. Implement __serialize() and __unserialize() instead (or in addition, if support for old PHP versions is necessary) in %s on line %d +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) in %s on line %d -Deprecated: The Serializable interface is deprecated. Implement __serialize() and __unserialize() instead (or in addition, if support for old PHP versions is necessary) in %s on line %d +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) in %s on line %d C:1:"c":108:{a:1:{s:1:"a";C:1:"a":81:{a:3:{s:1:"b";C:1:"b":30:{a:2:{s:1:"c";r:1;s:1:"a";r:3;}}s:1:"c";r:1;s:1:"a";r:3;}}}} bool(true) bool(true) diff --git a/ext/standard/tests/serialize/bug64146.phpt b/ext/standard/tests/serialize/bug64146.phpt index cd12544988b13..e602b14336fe7 100644 --- a/ext/standard/tests/serialize/bug64146.phpt +++ b/ext/standard/tests/serialize/bug64146.phpt @@ -52,7 +52,7 @@ print $a->a[1]->b->c . "\n"; ?> Done --EXPECTF-- -Deprecated: The Serializable interface is deprecated. Implement __serialize() and __unserialize() instead (or in addition, if support for old PHP versions is necessary) in %s on line %d +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) in %s on line %d 1 2 Done diff --git a/ext/standard/tests/serialize/bug64354_3.phpt b/ext/standard/tests/serialize/bug64354_3.phpt index 2c844806622bc..e3832e653bbfb 100644 --- a/ext/standard/tests/serialize/bug64354_3.phpt +++ b/ext/standard/tests/serialize/bug64354_3.phpt @@ -26,5 +26,5 @@ try { } ?> --EXPECTF-- -Deprecated: The Serializable interface is deprecated. Implement __serialize() and __unserialize() instead (or in addition, if support for old PHP versions is necessary) in %s on line %d +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) in %s on line %d string(6) "Failed" diff --git a/ext/standard/tests/serialize/bug65481.phpt b/ext/standard/tests/serialize/bug65481.phpt index f7929d903d343..2a1a0c18ebb8b 100644 --- a/ext/standard/tests/serialize/bug65481.phpt +++ b/ext/standard/tests/serialize/bug65481.phpt @@ -35,5 +35,5 @@ $token = serialize($token); ?> Done --EXPECTF-- -Deprecated: The Serializable interface is deprecated. Implement __serialize() and __unserialize() instead (or in addition, if support for old PHP versions is necessary) in %s on line %d +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) in %s on line %d Done diff --git a/ext/standard/tests/serialize/bug70172.phpt b/ext/standard/tests/serialize/bug70172.phpt index 9533cf4d52cd1..0ed6597885574 100644 --- a/ext/standard/tests/serialize/bug70172.phpt +++ b/ext/standard/tests/serialize/bug70172.phpt @@ -41,7 +41,7 @@ function ptr2str($ptr) } ?> --EXPECTF-- -Deprecated: The Serializable interface is deprecated. Implement __serialize() and __unserialize() instead (or in addition, if support for old PHP versions is necessary) in %s on line %d +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) in %s on line %d array(2) { [0]=> int(1) diff --git a/ext/standard/tests/serialize/bug70172_2.phpt b/ext/standard/tests/serialize/bug70172_2.phpt index a0f3e2fda7ea6..27e77951fe37c 100644 --- a/ext/standard/tests/serialize/bug70172_2.phpt +++ b/ext/standard/tests/serialize/bug70172_2.phpt @@ -48,7 +48,7 @@ function ptr2str($ptr) } ?> --EXPECTF-- -Deprecated: The Serializable interface is deprecated. Implement __serialize() and __unserialize() instead (or in addition, if support for old PHP versions is necessary) in %s on line %d +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) in %s on line %d array(2) { [0]=> object(obj2)#%d (1) { diff --git a/ext/standard/tests/serialize/bug70219_1.phpt b/ext/standard/tests/serialize/bug70219_1.phpt index 9ad6fca15f4d4..846c147a3f2ad 100644 --- a/ext/standard/tests/serialize/bug70219_1.phpt +++ b/ext/standard/tests/serialize/bug70219_1.phpt @@ -30,7 +30,7 @@ var_dump($data); var_dump($_SESSION); ?> --EXPECTF-- -Deprecated: The Serializable interface is deprecated. Implement __serialize() and __unserialize() instead (or in addition, if support for old PHP versions is necessary) in %s on line %d +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) in %s on line %d array(2) { [0]=> object(obj)#%d (1) { diff --git a/ext/standard/tests/serialize/bug70436.phpt b/ext/standard/tests/serialize/bug70436.phpt index 9b575e01bd2d6..46b3db763230c 100644 --- a/ext/standard/tests/serialize/bug70436.phpt +++ b/ext/standard/tests/serialize/bug70436.phpt @@ -46,7 +46,7 @@ function ptr2str($ptr) ?> DONE --EXPECTF-- -Deprecated: The Serializable interface is deprecated. Implement __serialize() and __unserialize() instead (or in addition, if support for old PHP versions is necessary) in %s on line %d +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) in %s on line %d Notice: unserialize(): Error at offset 0 of 3 bytes in %sbug70436.php on line %d diff --git a/ext/standard/tests/serialize/bug71940.phpt b/ext/standard/tests/serialize/bug71940.phpt index acbe726a073b2..4a840d3e772d8 100644 --- a/ext/standard/tests/serialize/bug71940.phpt +++ b/ext/standard/tests/serialize/bug71940.phpt @@ -44,7 +44,7 @@ print_r(unserialize($serialized)); ?> --EXPECTF-- -Deprecated: The Serializable interface is deprecated. Implement __serialize() and __unserialize() instead (or in addition, if support for old PHP versions is necessary) in %s on line %d +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) in %s on line %d Array ( [0] => Entry Object diff --git a/ext/standard/tests/serialize/bug72663_2.phpt b/ext/standard/tests/serialize/bug72663_2.phpt index df7ae9a05099d..4911465e50acf 100644 --- a/ext/standard/tests/serialize/bug72663_2.phpt +++ b/ext/standard/tests/serialize/bug72663_2.phpt @@ -19,7 +19,7 @@ var_dump(unserialize($exploit)); ?> --EXPECTF-- -Deprecated: The Serializable interface is deprecated. Implement __serialize() and __unserialize() instead (or in addition, if support for old PHP versions is necessary) in %s on line %d +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) in %s on line %d Notice: unserialize(): Unexpected end of serialized data in %s on line %d diff --git a/ext/standard/tests/serialize/bug80411.phpt b/ext/standard/tests/serialize/bug80411.phpt index 85147e94a26ff..0df53136bcf20 100644 --- a/ext/standard/tests/serialize/bug80411.phpt +++ b/ext/standard/tests/serialize/bug80411.phpt @@ -22,7 +22,7 @@ var_export($recovered); ?> --EXPECTF-- -Deprecated: The Serializable interface is deprecated. Implement __serialize() and __unserialize() instead (or in addition, if support for old PHP versions is necessary) in %s on line %d +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) in %s on line %d a:4:{i:0;N;i:1;N;i:2;s:6:"endcap";i:3;R:4;} array ( 0 => NULL, diff --git a/ext/standard/tests/serialize/max_depth.phpt b/ext/standard/tests/serialize/max_depth.phpt index 0bd42a41af8d7..1767239637c0e 100644 --- a/ext/standard/tests/serialize/max_depth.phpt +++ b/ext/standard/tests/serialize/max_depth.phpt @@ -139,7 +139,7 @@ Warning: unserialize(): Maximum depth of 256 exceeded. The depth limit can be ch Notice: unserialize(): Error at offset 2309 of 2574 bytes in %s on line %d bool(false) -Deprecated: The Serializable interface is deprecated. Implement __serialize() and __unserialize() instead (or in addition, if support for old PHP versions is necessary) in %s on line %d +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) in %s on line %d Nested unserialize combined depth limit: Warning: unserialize(): Maximum depth of 256 exceeded. The depth limit can be changed using the max_depth unserialize() option or the unserialize_max_depth ini setting in %s on line %d @@ -149,7 +149,7 @@ bool(false) bool(true) bool(true) -Deprecated: The Serializable interface is deprecated. Implement __serialize() and __unserialize() instead (or in addition, if support for old PHP versions is necessary) in %s on line %d +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) in %s on line %d Nested unserialize overridden depth limit: Warning: unserialize(): Maximum depth of 256 exceeded. The depth limit can be changed using the max_depth unserialize() option or the unserialize_max_depth ini setting in %s on line %d diff --git a/ext/standard/tests/serialize/ref_to_failed_serialize.phpt b/ext/standard/tests/serialize/ref_to_failed_serialize.phpt index 6d6cd206becb0..294f30b7b6c12 100644 --- a/ext/standard/tests/serialize/ref_to_failed_serialize.phpt +++ b/ext/standard/tests/serialize/ref_to_failed_serialize.phpt @@ -19,7 +19,7 @@ var_dump(unserialize($s)); ?> --EXPECTF-- -Deprecated: The Serializable interface is deprecated. Implement __serialize() and __unserialize() instead (or in addition, if support for old PHP versions is necessary) in %s on line %d +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) in %s on line %d string(18) "a:2:{i:0;N;i:1;N;}" array(2) { [0]=> diff --git a/ext/standard/tests/serialize/serialization_objects_010.phpt b/ext/standard/tests/serialize/serialization_objects_010.phpt index dcb152889f88a..bf980325945e7 100644 --- a/ext/standard/tests/serialize/serialization_objects_010.phpt +++ b/ext/standard/tests/serialize/serialization_objects_010.phpt @@ -20,6 +20,6 @@ try { echo "Done"; ?> --EXPECTF-- -Deprecated: The Serializable interface is deprecated. Implement __serialize() and __unserialize() instead (or in addition, if support for old PHP versions is necessary) in %s on line %d +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) in %s on line %d C::serialize() must return a string or NULL Done diff --git a/ext/standard/tests/strings/bug72663.phpt b/ext/standard/tests/strings/bug72663.phpt index 7ccb022fba7d0..d85fb7db1b67e 100644 --- a/ext/standard/tests/strings/bug72663.phpt +++ b/ext/standard/tests/strings/bug72663.phpt @@ -19,7 +19,7 @@ var_dump(unserialize($exploit)); ?> DONE --EXPECTF-- -Deprecated: The Serializable interface is deprecated. Implement __serialize() and __unserialize() instead (or in addition, if support for old PHP versions is necessary) in %s on line %d +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) in %s on line %d Notice: unserialize(): Unexpected end of serialized data in %sbug72663.php on line %d diff --git a/tests/classes/serialize_001.phpt b/tests/classes/serialize_001.phpt index 2a8fab42bff0b..0e1cc18b997f2 100644 --- a/tests/classes/serialize_001.phpt +++ b/tests/classes/serialize_001.phpt @@ -46,7 +46,7 @@ foreach($tests as $data) ?> --EXPECTF-- -Deprecated: The Serializable interface is deprecated. Implement __serialize() and __unserialize() instead (or in addition, if support for old PHP versions is necessary) in %s on line %d +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) in %s on line %d ========== string(6) "String" Test::__construct(String)