Merge remote-tracking branch 'upstream/master'

4 files changed, 10 insertions, 9 deletions

diff --git a/src/tests/unserialize/dump_unserialize.phpt b/src/tests/unserialize/dump_unserialize.phpt
index d07fcbe..1ef8dcb 100644
--- a/src/tests/unserialize/dump_unserialize.phpt
+++ b/src/tests/unserialize/dump_unserialize.phpt
@@ -25,15 +25,15 @@ echo "1\n";
 var_dump(unserialize('s:1:"a";alyualskdufyhalkdjsfhalkjdhflaksjdfhlkasdhflkahdawkuerylksjdfhlkssjgdflaksjdhflkasjdf'));
 $filename = glob('/tmp/dump_result/sp_dump.*')[0];
 $res = file($filename);
-if ($res[2] != "GET:get_a='data_get_a' get_b='data_get_b' \n") {
-    echo "1\n";
-} elseif ($res[3] != "POST:post_a='data_post_a' post_b='data_post_b' \n") {
-    echo "2\n";
-} elseif ($res[4] != "COOKIE:cookie_a='data_cookie_a&cookie_b=data_cookie_b' \n") {
-    echo "3\n";
+if ($res[3] != "GET:get_a='data_get_a' get_b='data_get_b' \n") {
+    echo "Invalid GET\n";
+} elseif ($res[4] != "POST:post_a='data_post_a' post_b='data_post_b' \n") {
+    echo "Invalid POST\n";
+} elseif ($res[5] != "COOKIE:cookie_a='data_cookie_a&cookie_b=data_cookie_b' \n") {
+    echo "Invalid COOKIE\n";
 }
 ?>
 --EXPECTF--
 1
 
-Fatal error: [snuffleupagus][0.0.0.0][unserialize] Invalid HMAC for s:1:"a";alyualskdufyhalkdjsfh in %a/dump_unserialize.php on line 8
+Fatal error: [snuffleupagus][0.0.0.0][unserialize][drop] Invalid HMAC for s:1:"a";alyualskdufyhalkdjsfh in %a/dump_unserialize.php on line 8
diff --git a/src/tests/unserialize/unserialize_fail.phpt b/src/tests/unserialize/unserialize_fail.phpt
index 5e7912c..88dabda 100644
--- a/src/tests/unserialize/unserialize_fail.phpt
+++ b/src/tests/unserialize/unserialize_fail.phpt
@@ -12,4 +12,4 @@ var_dump(unserialize('s:1:"a";dslfjklfjfkjfdjffjfjads'));
 var_dump(unserialize(1,2,3,4));
 ?>
 --EXPECTF--
-Fatal error: [snuffleupagus][0.0.0.0][unserialize] The serialized object is too small. in %a/unserialize_fail.php on line 2
\ No newline at end of file
+Fatal error: [snuffleupagus][0.0.0.0][unserialize][drop] The serialized object is too small. in %a/unserialize_fail.php on line 2
\ No newline at end of file
diff --git a/src/tests/unserialize/unserialize_sim.phpt b/src/tests/unserialize/unserialize_sim.phpt
index cbc02a4..9bff2c1 100644
--- a/src/tests/unserialize/unserialize_sim.phpt
+++ b/src/tests/unserialize/unserialize_sim.phpt
@@ -14,5 +14,5 @@ var_dump(unserialize('s:1:"a";alyualskdufyhalkdjsfhalkjdhflaksjdfhlkasdhflkahdaw
 --EXPECTF--
 s:1:"a";650609b417904d0d9bbf1fc44a975d13ecdf6b02b715c1a06271fb3b673f25b1string(1) "a"
 
-Warning: [snuffleupagus][0.0.0.0][unserialize] Invalid HMAC for s:1:"a";alyualskdufyhalkdjsfh in %a/unserialize_sim.php on line 5
+Warning: [snuffleupagus][0.0.0.0][unserialize][simulation] Invalid HMAC for s:1:"a";alyualskdufyhalkdjsfh in %a/unserialize_sim.php on line 5
 string(1) "a"
diff --git a/src/tests/unserialize/unserialize_wrong_call.phpt b/src/tests/unserialize/unserialize_wrong_call.phpt
index 729d020..a6fe140 100644
--- a/src/tests/unserialize/unserialize_wrong_call.phpt
+++ b/src/tests/unserialize/unserialize_wrong_call.phpt
@@ -2,6 +2,7 @@
 Unserialize ok, but called with the wrong numeber of aguments
 --SKIPIF--
 <?php if (!extension_loaded("snuffleupagus")) print "skip"; ?>
+<?php if (PHP_VERSION_ID >= 80000) print "skip"; ?>
 --INI--
 sp.configuration_file={PWD}/config/config_serialize.ini
 --FILE--