Unserialize: Migrate "Error at offset %d of %d bytes" to E_WARNING

TimWolla · TimWolla · commit 308f6ddc3a48 · 2022-09-28T19:08:00.000+02:00
diff --git a/Zend/tests/bug70253.phpt b/Zend/tests/bug70253.phpt
@@ -5,4 +5,4 @@ Bug #70253 (segfault at _efree () in zend_alloc.c:1389)
 unserialize('a:2:{i:0;O:9:"000000000":10000000');
 ?>
 --EXPECTF--
-Notice: unserialize(): Error at offset 33 of 33 bytes in %s on line %d
+Warning: unserialize(): Error at offset 33 of 33 bytes in %s on line %d
diff --git a/Zend/tests/enum/unserialize-const.phpt b/Zend/tests/enum/unserialize-const.phpt
@@ -14,5 +14,5 @@ var_dump(unserialize('E:7:"Foo:Baz";'));
 --EXPECTF--
 Warning: unserialize(): Foo::Baz is not an enum case in %s on line %d
 
-Notice: unserialize(): Error at offset 14 of 14 bytes in %s on line %d
+Warning: unserialize(): Error at offset 14 of 14 bytes in %s on line %d
 bool(false)
diff --git a/Zend/tests/enum/unserialize-missing-colon.phpt b/Zend/tests/enum/unserialize-missing-colon.phpt
@@ -13,5 +13,5 @@ var_dump(unserialize('E:6:"FooBar";'));
 --EXPECTF--
 Warning: unserialize(): Invalid enum name 'FooBar' (missing colon) in %s on line %d
 
-Notice: unserialize(): Error at offset 0 of 13 bytes in %s on line %d
+Warning: unserialize(): Error at offset 0 of 13 bytes in %s on line %d
 bool(false)
diff --git a/Zend/tests/enum/unserialize-non-enum.phpt b/Zend/tests/enum/unserialize-non-enum.phpt
@@ -11,5 +11,5 @@ var_dump(unserialize('E:7:"Foo:Bar";'));
 --EXPECTF--
 Warning: unserialize(): Class 'Foo' is not an enum in %s on line %d
 
-Notice: unserialize(): Error at offset 0 of 14 bytes in %s on line %d
+Warning: unserialize(): Error at offset 0 of 14 bytes in %s on line %d
 bool(false)
diff --git a/Zend/tests/enum/unserialize-non-existent-case.phpt b/Zend/tests/enum/unserialize-non-existent-case.phpt
@@ -13,5 +13,5 @@ var_dump(unserialize('E:7:"Foo:Baz";'));
 --EXPECTF--
 Warning: unserialize(): Undefined constant Foo::Baz in %s on line %d
 
-Notice: unserialize(): Error at offset 14 of 14 bytes in %s on line %d
+Warning: unserialize(): Error at offset 14 of 14 bytes in %s on line %d
 bool(false)
diff --git a/ext/gmp/tests/bug74670.phpt b/ext/gmp/tests/bug74670.phpt
@@ -8,5 +8,5 @@ $str = 'C:3:"GMP":4:{s:6666666666:""}';
 var_dump(unserialize($str));
 ?>
 --EXPECTF--
-Notice: unserialize(): Error at offset 13 of 29 bytes in %s on line %d
+Warning: unserialize(): Error at offset 13 of 29 bytes in %s on line %d
 bool(false)
diff --git a/ext/session/tests/bug72562.phpt b/ext/session/tests/bug72562.phpt
@@ -40,7 +40,7 @@ function ptr2str($ptr)
 --EXPECTF--
 Warning: session_decode(): Failed to decode session object. Session has been destroyed in %s%ebug72562.php on line %d
 
-Notice: unserialize(): Error at offset 0 of 1 bytes in %s%ebug72562.php on line %d
+Warning: unserialize(): Error at offset 0 of 1 bytes in %s on line %d
 
-Notice: unserialize(): Error at offset 4 of 4 bytes in %s%ebug72562.php on line %d
+Warning: unserialize(): Error at offset 4 of 4 bytes in %s on line %d
 bool(false)
diff --git a/ext/standard/tests/serialize/005.phpt b/ext/standard/tests/serialize/005.phpt
@@ -157,7 +157,7 @@ Deprecated: %s implements the Serializable interface, which is deprecated. Imple
 
 Warning: Erroneous data format for unserializing 'TestNANew' in %s005.php on line %d
 
-Notice: unserialize(): Error at offset 19 of 20 bytes in %s005.php on line %d
+Warning: unserialize(): Error at offset 19 of 20 bytes in %s on line %d
 bool(false)
 ===NANew2===
 unserializer(TestNANew2)
diff --git a/ext/standard/tests/serialize/__serialize_006.phpt b/ext/standard/tests/serialize/__serialize_006.phpt
@@ -13,5 +13,5 @@ var_dump(unserialize('O:4:"Test":1:{}'));
 --EXPECTF--
 Warning: unserialize(): Unexpected end of serialized data in %s on line %d
 
-Notice: unserialize(): Error at offset 14 of 15 bytes in %s on line %d
+Warning: unserialize(): Error at offset 14 of 15 bytes in %s on line %d
 bool(false)
diff --git a/ext/standard/tests/serialize/bug25378.phpt b/ext/standard/tests/serialize/bug25378.phpt
@@ -17,41 +17,41 @@ var_dump(unserialize("s:3:\"123;"));
 var_dump(unserialize("s:0:\"123\";"));
 ?>
 --EXPECTF--
-Notice: unserialize(): Error at offset 0 of 8 bytes in %sbug25378.php on line %d
+Warning: unserialize(): Error at offset 0 of 8 bytes in %s on line %d
 bool(false)
 
-Notice: unserialize(): Error at offset 0 of 5 bytes in %sbug25378.php on line %d
+Warning: unserialize(): Error at offset 0 of 5 bytes in %s on line %d
 bool(false)
 
-Notice: unserialize(): Error at offset 13 of 19 bytes in %sbug25378.php on line %d
+Warning: unserialize(): Error at offset 13 of 19 bytes in %s on line %d
 bool(false)
 
-Notice: unserialize(): Error at offset 14 of 19 bytes in %sbug25378.php on line %d
+Warning: unserialize(): Error at offset 14 of 19 bytes in %s on line %d
 bool(false)
 
-Notice: unserialize(): Error at offset 2 of 22 bytes in %sbug25378.php on line %d
+Warning: unserialize(): Error at offset 2 of 22 bytes in %s on line %d
 bool(false)
 
-Notice: unserialize(): Error at offset 17 of 18 bytes in %sbug25378.php on line %d
+Warning: unserialize(): Error at offset 17 of 18 bytes in %s on line %d
 bool(false)
 
-Notice: unserialize(): Error at offset 24 of 33 bytes in %sbug25378.php on line %d
+Warning: unserialize(): Error at offset 24 of 33 bytes in %s on line %d
 bool(false)
 
-Notice: unserialize(): Error at offset 17 of 33 bytes in %sbug25378.php on line %d
+Warning: unserialize(): Error at offset 17 of 33 bytes in %s on line %d
 bool(false)
 
-Notice: unserialize(): Error at offset 32 of 32 bytes in %sbug25378.php on line %d
+Warning: unserialize(): Error at offset 32 of 32 bytes in %s on line %d
 bool(false)
 
-Notice: unserialize(): Error at offset 2 of 13 bytes in %sbug25378.php on line %d
+Warning: unserialize(): Error at offset 2 of 13 bytes in %s on line %d
 bool(false)
 
-Notice: unserialize(): Error at offset 2 of 11 bytes in %sbug25378.php on line %d
+Warning: unserialize(): Error at offset 2 of 11 bytes in %s on line %d
 bool(false)
 
-Notice: unserialize(): Error at offset 8 of 9 bytes in %sbug25378.php on line %d
+Warning: unserialize(): Error at offset 8 of 9 bytes in %s on line %d
 bool(false)
 
-Notice: unserialize(): Error at offset 5 of 10 bytes in %sbug25378.php on line %d
+Warning: unserialize(): Error at offset 5 of 10 bytes in %s on line %d
 bool(false)
diff --git a/ext/standard/tests/serialize/bug68044.phpt b/ext/standard/tests/serialize/bug68044.phpt
@@ -10,5 +10,5 @@ Warning: unserialize(): %s in %sbug68044.php on line %d
 
 Warning: Insufficient data for unserializing - %d required, 1 present in %s%ebug68044.php on line 2
 
-Notice: unserialize(): Error at offset 32 of 33 bytes in %s%ebug68044.php on line 2
+Warning: unserialize(): Error at offset 32 of 33 bytes in %s on line %d
 ===DONE==
diff --git a/ext/standard/tests/serialize/bug68545.phpt b/ext/standard/tests/serialize/bug68545.phpt
@@ -5,5 +5,5 @@ Bug #68545 NULL pointer dereference in unserialize.c:var_push_dtor
 var_dump(unserialize('a:6:{a:6:{s:3:"322";s:3:"bar";s:3:"bar";s:3:"foo";a:6:{a:6:{s:3:"322";s:3:"bar";s:3:"bar";s:3:"foo";s:3:"bar";a:6:{a:6:{s:3:"322";s:3:"bar";s:3:"bar";s:3:"foo";a:6:{a:6:{s:3:"322";s:3:"bar";s:3:"b22";s:3:"bar";s:3:"bar";s:3:"foo";s:3:"bar";a:6:{a:6:{s:3:"322";s:3:"bar";s:3:"bar";s:3:"foo";s:3:"bar";s:3:"bar";'));
 ?>
 --EXPECTF--
-Notice: unserialize(): Error at offset %d of %d bytes in %sbug68545.php on line %d
+Warning: unserialize(): Error at offset 10 of 310 bytes in %s on line %d
 bool(false)
diff --git a/ext/standard/tests/serialize/bug70213.phpt b/ext/standard/tests/serialize/bug70213.phpt
@@ -15,7 +15,7 @@ var_dump(unserialize('a:2:{i:0;i:42;i:1;O:4:"evil":0:{}}'));
 
 ?>
 --EXPECTF--
-Notice: unserialize(): Error at offset 4 of 4 bytes in %s on line %d
+Warning: unserialize(): Error at offset 4 of 4 bytes in %s on line %d
 bool(false)
 
 Warning: unserialize(): Function evil() hasn't defined the class it was called for in %s on line %d
diff --git a/ext/standard/tests/serialize/bug70219.phpt b/ext/standard/tests/serialize/bug70219.phpt
@@ -31,5 +31,5 @@ var_dump($data);
 --EXPECTF--
 Warning: session_decode(): Failed to decode session object. Session has been destroyed in %s on line %d
 
-Notice: unserialize(): Error at offset 55 of 56 bytes in %s on line %d
+Warning: unserialize(): Error at offset 55 of 56 bytes in %s on line %d
 bool(false)
diff --git a/ext/standard/tests/serialize/bug70436.phpt b/ext/standard/tests/serialize/bug70436.phpt
@@ -48,8 +48,8 @@ DONE
 --EXPECTF--
 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
+Warning: unserialize(): Error at offset 0 of 3 bytes in %s on line %d
 
-Notice: unserialize(): Error at offset 93 of 94 bytes in %sbug70436.php on line %d
+Warning: unserialize(): Error at offset 93 of 94 bytes in %s on line %d
 bool(false)
 DONE
diff --git a/ext/standard/tests/serialize/bug71840.phpt b/ext/standard/tests/serialize/bug71840.phpt
@@ -5,5 +5,5 @@ Bug #71840 (Unserialize accepts wrongly data)
 var_dump(unserialize('a:1:{s:0:""0a:0:{}}'));
 ?>
 --EXPECTF--
-Notice: unserialize(): Error at offset 11 of 19 bytes in %sbug71840.php on line %d
+Warning: unserialize(): Error at offset 11 of 19 bytes in %s on line %d
 bool(false)
diff --git a/ext/standard/tests/serialize/bug72663.phpt b/ext/standard/tests/serialize/bug72663.phpt
@@ -49,10 +49,10 @@ try {
 
 ?>
 --EXPECTF--
-Notice: unserialize(): Error at offset 17 of 24 bytes in %s on line %d
+Warning: unserialize(): Error at offset 17 of 24 bytes in %s on line %d
 bool(false)
 
-Notice: unserialize(): Error at offset 25 of 32 bytes in %s on line %d
+Warning: unserialize(): Error at offset 25 of 32 bytes in %s on line %d
 bool(false)
 Caught
 Caught
diff --git a/ext/standard/tests/serialize/bug72663_2.phpt b/ext/standard/tests/serialize/bug72663_2.phpt
@@ -23,7 +23,7 @@ Deprecated: %s implements the Serializable interface, which is deprecated. Imple
 
 Warning: unserialize(): Unexpected end of serialized data in %s on line %d
 
-Notice: unserialize(): Error at offset 49 of 50 bytes in %s on line %d
+Warning: unserialize(): Error at offset 49 of 50 bytes in %s on line %d
 
-Notice: unserialize(): Error at offset 82 of 83 bytes in %s on line %d
+Warning: unserialize(): Error at offset 82 of 83 bytes in %s on line %d
 bool(false)
diff --git a/ext/standard/tests/serialize/bug73052.phpt b/ext/standard/tests/serialize/bug73052.phpt
@@ -14,5 +14,5 @@ $poc = 'O:3:"obj":1:{';
 var_dump(unserialize($poc));
 ?>
 --EXPECTF--
-Notice: unserialize(): Error at offset 13 of 13 bytes in %sbug73052.php on line %d
+Warning: unserialize(): Error at offset 13 of 13 bytes in %s on line %d
 bool(false)
diff --git a/ext/standard/tests/serialize/bug73825.phpt b/ext/standard/tests/serialize/bug73825.phpt
@@ -8,5 +8,5 @@ var_dump($obj);
 --EXPECTF--
 Warning: Bad unserialize data in %sbug73825.php on line %d
 
-Notice: unserialize(): Error at offset 13 of 15 bytes in %sbug73825.php on line %d
+Warning: unserialize(): Error at offset 13 of 15 bytes in %s on line %d
 bool(false)
diff --git a/ext/standard/tests/serialize/bug74101.phpt b/ext/standard/tests/serialize/bug74101.phpt
@@ -8,5 +8,5 @@ var_dump(unserialize($s));
 --EXPECTF--
 Warning: unserialize(): %s in %sbug74101.php on line %d
 
-Notice: unserialize(): Error at offset 46 of 74 bytes in %sbug74101.php on line %d
+Warning: unserialize(): Error at offset 46 of 74 bytes in %s on line %d
 bool(false)
diff --git a/ext/standard/tests/serialize/bug74103.phpt b/ext/standard/tests/serialize/bug74103.phpt
@@ -5,5 +5,5 @@ Bug #74103: heap-use-after-free when unserializing invalid array size
 var_dump(unserialize('a:7:{i:0;i:04;s:1:"a";i:2;i:9617006;i:4;s:1:"a";i:4;s:1:"a";R:5;s:1:"7";R:3;s:1:"a";R:5;;s:18;}}'));
 ?>
 --EXPECTF--
-Notice: unserialize(): Error at offset %d of %d bytes in %s on line %d
+Warning: unserialize(): Error at offset 64 of 96 bytes in %s on line %d
 bool(false)
diff --git a/ext/standard/tests/serialize/bug74111.phpt b/ext/standard/tests/serialize/bug74111.phpt
@@ -6,5 +6,5 @@ $s = 'O:8:"stdClass":00000000';
 var_dump(unserialize($s));
 ?>
 --EXPECTF--
-Notice: unserialize(): Error at offset 25 of 23 bytes in %s on line %d
+Warning: unserialize(): Error at offset 25 of 23 bytes in %s on line %d
 bool(false)
diff --git a/ext/standard/tests/serialize/bug74300.phpt b/ext/standard/tests/serialize/bug74300.phpt
@@ -10,5 +10,5 @@ var_dump(unserialize('d:2e++2;'));
 --EXPECTF--
 float(200)
 
-Notice: unserialize(): Error at offset 0 of 8 bytes in %s on line %d
+Warning: unserialize(): Error at offset 0 of 8 bytes in %s on line %d
 bool(false)
diff --git a/ext/standard/tests/serialize/bug74614.phpt b/ext/standard/tests/serialize/bug74614.phpt
@@ -9,4 +9,4 @@ unserialize('a:3020000000000000000000000000000001:{i:0;a:0:{}i:1;i:2;i:2;i:3;i:3
 --EXPECTF--
 Warning: unserialize(): %s in %sbug74614.php on line %d
 
-Notice: unserialize(): Error at offset %d of 113 bytes in %s on line %d
+Warning: unserialize(): Error at offset 38 of 113 bytes in %s on line %d
diff --git a/ext/standard/tests/serialize/bug75054.phpt b/ext/standard/tests/serialize/bug75054.phpt
@@ -8,5 +8,5 @@ $poc .= '000";R:2;s:4:"0000";d:0;s:4:"0000";a:9:{s:4:"0000";';
 var_dump(unserialize($poc));
 ?>
 --EXPECTF--
-Notice: unserialize(): Error at offset 43 of 145 bytes in %s on line %d
+Warning: unserialize(): Error at offset 43 of 145 bytes in %s on line %d
 bool(false)
diff --git a/ext/standard/tests/serialize/bug81111.phpt b/ext/standard/tests/serialize/bug81111.phpt
@@ -50,4 +50,4 @@ Serialization of 'class@anonymous' is not allowed
 Unserialization of 'MySplFileInfo' is not allowed
 Unserialization of 'MySplFileInfo' is not allowed
 
-Notice: unserialize(): Error at offset 0 of %d bytes in %s on line %d
+Warning: unserialize(): Error at offset 0 of 110 bytes in %s on line %d
diff --git a/ext/standard/tests/serialize/invalid_signs_in_lengths.phpt b/ext/standard/tests/serialize/invalid_signs_in_lengths.phpt
@@ -18,38 +18,38 @@ var_dump(unserialize('a:1:{i:0;R:-1;}'));
 
 ?>
 --EXPECTF--
-Notice: unserialize(): Error at offset 0 of 9 bytes in %s on line %d
+Warning: unserialize(): Error at offset 0 of 9 bytes in %s on line %d
 bool(false)
 
-Notice: unserialize(): Error at offset 0 of 9 bytes in %s on line %d
+Warning: unserialize(): Error at offset 0 of 9 bytes in %s on line %d
 bool(false)
 
-Notice: unserialize(): Error at offset 0 of 7 bytes in %s on line %d
+Warning: unserialize(): Error at offset 0 of 7 bytes in %s on line %d
 bool(false)
 
-Notice: unserialize(): Error at offset 0 of 7 bytes in %s on line %d
+Warning: unserialize(): Error at offset 0 of 7 bytes in %s on line %d
 bool(false)
 
-Notice: unserialize(): Error at offset 0 of 20 bytes in %s on line %d
+Warning: unserialize(): Error at offset 0 of 20 bytes in %s on line %d
 bool(false)
 
-Notice: unserialize(): Error at offset 0 of 20 bytes in %s on line %d
+Warning: unserialize(): Error at offset 0 of 20 bytes in %s on line %d
 bool(false)
 
-Notice: unserialize(): Error at offset 0 of 24 bytes in %s on line %d
+Warning: unserialize(): Error at offset 0 of 24 bytes in %s on line %d
 bool(false)
 
-Notice: unserialize(): Error at offset 0 of 24 bytes in %s on line %d
+Warning: unserialize(): Error at offset 0 of 24 bytes in %s on line %d
 bool(false)
 
-Notice: unserialize(): Error at offset 9 of 15 bytes in %s on line %d
+Warning: unserialize(): Error at offset 9 of 15 bytes in %s on line %d
 bool(false)
 
-Notice: unserialize(): Error at offset 9 of 15 bytes in %s on line %d
+Warning: unserialize(): Error at offset 9 of 15 bytes in %s on line %d
 bool(false)
 
-Notice: unserialize(): Error at offset 9 of 15 bytes in %s on line %d
+Warning: unserialize(): Error at offset 9 of 15 bytes in %s on line %d
 bool(false)
 
-Notice: unserialize(): Error at offset 9 of 15 bytes in %s on line %d
+Warning: unserialize(): Error at offset 9 of 15 bytes in %s on line %d
 bool(false)
diff --git a/ext/standard/tests/serialize/max_depth.phpt b/ext/standard/tests/serialize/max_depth.phpt
@@ -115,36 +115,36 @@ bool(true)
 
 Warning: unserialize(): Maximum depth of 128 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
 
-Notice: unserialize(): Error at offset 1157 of 1294 bytes in %s on line %d
+Warning: unserialize(): Error at offset 1157 of 1294 bytes in %s on line %d
 bool(false)
 Object:
 bool(true)
 
 Warning: unserialize(): Maximum depth of 128 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
 
-Notice: unserialize(): Error at offset 2834 of 2971 bytes in %s on line %d
+Warning: unserialize(): Error at offset 2834 of 2971 bytes in %s on line %d
 bool(false)
 Ini setting:
 bool(true)
 
 Warning: unserialize(): Maximum depth of 128 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
 
-Notice: unserialize(): Error at offset 1157 of 1294 bytes in %s on line %d
+Warning: unserialize(): Error at offset 1157 of 1294 bytes in %s on line %d
 bool(false)
 Ini setting overridden:
 bool(true)
 
 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
 
-Notice: unserialize(): Error at offset 2309 of 2574 bytes in %s on line %d
+Warning: unserialize(): Error at offset 2309 of 2574 bytes in %s on line %d
 bool(false)
 
 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
 
-Notice: unserialize(): Error at offset 1157 of 1294 bytes in %s on line %d
+Warning: unserialize(): Error at offset 1157 of 1294 bytes in %s on line %d
 bool(false)
 bool(true)
 bool(true)
@@ -154,7 +154,7 @@ 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
 
-Notice: unserialize(): Error at offset 2309 of 2574 bytes in %s on line %d
+Warning: unserialize(): Error at offset 2309 of 2574 bytes in %s on line %d
 bool(false)
 bool(true)
 bool(true)
diff --git a/ext/standard/tests/serialize/serialization_error_002.phpt b/ext/standard/tests/serialize/serialization_error_002.phpt
@@ -32,7 +32,7 @@ echo "Done";
 *** Testing unserialize() error/boolean distinction ***
 string(4) "b:0;"
 
-Notice: unserialize(): Error at offset 0 of 27 bytes in %s on line %d
+Warning: unserialize(): Error at offset 0 of 27 bytes in %s on line %d
 bool(false)
 bool(false)
 unserialize error and deserialized false are identical? 1
diff --git a/ext/standard/tests/serialize/typed_property_ref_assignment_failure.phpt b/ext/standard/tests/serialize/typed_property_ref_assignment_failure.phpt
@@ -25,5 +25,5 @@ var_dump(unserialize($s));
 --EXPECTF--
 Cannot assign stdClass to property Test::$prop of type int
 
-Notice: unserialize(): Error at offset 38 of 38 bytes in %s on line %d
+Warning: unserialize(): Error at offset 38 of 38 bytes in %s on line %d
 bool(false)
diff --git a/ext/standard/tests/serialize/unserialize_large.phpt b/ext/standard/tests/serialize/unserialize_large.phpt
@@ -10,16 +10,16 @@ var_dump(unserialize("C:1:\"X\":1000000000:{}"));
 
 ?>
 --EXPECTF--
-Notice: unserialize(): Error at offset 14 of 15 bytes in %s on line %d
+Warning: unserialize(): Error at offset 14 of 15 bytes in %s on line %d
 bool(false)
 
-Notice: unserialize(): Error at offset 2 of 20 bytes in %s on line %d
+Warning: unserialize(): Error at offset 2 of 20 bytes in %s on line %d
 bool(false)
 
-Notice: unserialize(): Error at offset 18 of 21 bytes in %s on line %d
+Warning: unserialize(): Error at offset 18 of 21 bytes in %s on line %d
 bool(false)
 
 Warning: Insufficient data for unserializing - 1000000000 required, 1 present in %s on line %d
 
-Notice: unserialize(): Error at offset 20 of 21 bytes in %s on line %d
+Warning: unserialize(): Error at offset 20 of 21 bytes in %s on line %d
 bool(false)
diff --git a/ext/standard/tests/serialize/unserialize_mem_leak.phpt b/ext/standard/tests/serialize/unserialize_mem_leak.phpt
@@ -15,5 +15,5 @@ foo(unserialize($str));
 echo "okey";
 ?>
 --EXPECTF--
-Notice: unserialize(): Error at offset %d of %d bytes in %sunserialize_mem_leak.php on line 9
+Warning: unserialize(): Error at offset 13 of 14 bytes in %s on line %d
 okey
diff --git a/ext/standard/tests/serialize/unserialize_ref_to_overwritten_declared_prop.phpt b/ext/standard/tests/serialize/unserialize_ref_to_overwritten_declared_prop.phpt
diff --git a/ext/standard/tests/strings/bug72433.phpt b/ext/standard/tests/strings/bug72433.phpt
diff --git a/ext/standard/tests/strings/bug72663.phpt b/ext/standard/tests/strings/bug72663.phpt
diff --git a/ext/standard/tests/strings/bug72663_3.phpt b/ext/standard/tests/strings/bug72663_3.phpt
diff --git a/ext/standard/var.c b/ext/standard/var.c
