29 files changed, 39 insertions, 37 deletions

diff --git a/src/tests/cookies_encryption/encrypt_cookies4.phpt b/src/tests/cookies_encryption/encrypt_cookies4.phpt
index fa36756..60e335b 100644
--- a/src/tests/cookies_encryption/encrypt_cookies4.phpt
+++ b/src/tests/cookies_encryption/encrypt_cookies4.phpt
@@ -2,7 +2,7 @@
 Cookie encryption in ipv6
 --SKIPIF--
 <?php if (!extension_loaded("snuffleupagus")) print "skip"; ?>
-<?php if (PHP_VERSION_ID >= 80000) print "skip"; ?>
+<?php if (PHP_VERSION_ID >= 80000) print "skip Not implemented for PHP 8+"; ?>
 --INI--
 sp.configuration_file={PWD}/config/config_encrypted_cookies.ini
 --COOKIE--
diff --git a/src/tests/cookies_encryption/setcookie.phpt b/src/tests/cookies_encryption/setcookie.phpt
index 4e86984..86596de 100644
--- a/src/tests/cookies_encryption/setcookie.phpt
+++ b/src/tests/cookies_encryption/setcookie.phpt
@@ -2,7 +2,7 @@
 Set cookies.
 --SKIPIF--
 <?php if (!extension_loaded("snuffleupagus")) print "skip"; ?>
-<?php if (PHP_VERSION_ID >= 80000) print "skip"; ?>
+<?php if (PHP_VERSION_ID >= 80000) print "skip Not implemented for PHP 8+"; ?>
 --INI--
 sp.configuration_file={PWD}/config/config_encrypted_cookies.ini
 --COOKIE--
diff --git a/src/tests/cookies_php8/encrypt_cookies4.phpt b/src/tests/cookies_php8/encrypt_cookies4.phpt
index b6acb73..2ab20ae 100644
--- a/src/tests/cookies_php8/encrypt_cookies4.phpt
+++ b/src/tests/cookies_php8/encrypt_cookies4.phpt
@@ -2,7 +2,7 @@
 Cookie encryption in ipv6
 --SKIPIF--
 <?php if (!extension_loaded("snuffleupagus")) print "skip"; ?>
-<?php if (PHP_VERSION_ID < 80000 || PHP_VERSION_ID >= 80200) print "skip"; ?>
+<?php if (PHP_VERSION_ID < 80000 || PHP_VERSION_ID >= 80200) print "skip Not implemented for PHP 8-8.2"; ?>
 --INI--
 sp.configuration_file={PWD}/config/config_encrypted_cookies.ini
 --COOKIE--
diff --git a/src/tests/deny_writable/deny_writable_execution.phpt b/src/tests/deny_writable/deny_writable_execution.phpt
index 383ffa5..c6ece7a 100644
--- a/src/tests/deny_writable/deny_writable_execution.phpt
+++ b/src/tests/deny_writable/deny_writable_execution.phpt
@@ -11,7 +11,7 @@ $filename = __DIR__ . '/test.txt';
 file_put_contents($filename, 'a');
 chmod($filename, 0400);
 
-if (is_writable($filename)) print "skip";
+if (is_writable($filename)) print "skip chmod did not remove write access";
 @unlink($filename);
  ?>
 --INI--
diff --git a/src/tests/deny_writable/deny_writable_execution_simulation.phpt b/src/tests/deny_writable/deny_writable_execution_simulation.phpt
index 39dab32..4986a62 100644
--- a/src/tests/deny_writable/deny_writable_execution_simulation.phpt
+++ b/src/tests/deny_writable/deny_writable_execution_simulation.phpt
@@ -7,11 +7,11 @@ if (!extension_loaded("snuffleupagus")) { print "skip"; };
 // root has write privileges on any file
 if (TRUE == function_exists("posix_getuid")) {
         if (0 == posix_getuid()) {
-                print "skip";
+                print "skip Running as root";
         }
 } elseif (TRUE == function_exists("shell_exec")) {
         if ("root" == trim(shell_exec("whoami"))) {
-                print "skip";
+                print "skip Running as root";
         }
 }
  ?>
diff --git a/src/tests/deny_writable/dump_deny_writable_execution.phpt b/src/tests/deny_writable/dump_deny_writable_execution.phpt
index 2e6bca5..efd3694 100644
--- a/src/tests/deny_writable/dump_deny_writable_execution.phpt
+++ b/src/tests/deny_writable/dump_deny_writable_execution.phpt
@@ -7,11 +7,11 @@ if (!extension_loaded("snuffleupagus")) print "skip";
 // root has write privileges on any file
 if (TRUE == function_exists("posix_getuid")) {
         if (0 == posix_getuid()) {
-                print "skip";
+                print "skip Running as root";
         }
 } elseif (TRUE == function_exists("shell_exec")) {
         if ("root" == trim(shell_exec("whoami"))) {
-                print "skip";
+                print "skip Running as root";
         }
 }
 ?>
diff --git a/src/tests/disable_function/disabled_functions_chmod.phpt b/src/tests/disable_function/disabled_functions_chmod.phpt
index 834bc31..b75b877 100644
--- a/src/tests/disable_function/disabled_functions_chmod.phpt
+++ b/src/tests/disable_function/disabled_functions_chmod.phpt
@@ -2,7 +2,7 @@
 Disable functions - chmod
 --SKIPIF--
 <?php if (!extension_loaded("snuffleupagus")) print "skip"; ?>
-<?php if (PHP_VERSION_ID >= 80000) print "skip"; ?>
+<?php if (PHP_VERSION_ID >= 80000) print "skip Not implemented in PHP 8+"; ?>
 --INI--
 sp.configuration_file={PWD}/config/disabled_functions_chmod.ini
 --FILE--
diff --git a/src/tests/disable_function/disabled_functions_name_regexp_type.phpt b/src/tests/disable_function/disabled_functions_name_regexp_type.phpt
index 25ac2b3..20aebf1 100644
--- a/src/tests/disable_function/disabled_functions_name_regexp_type.phpt
+++ b/src/tests/disable_function/disabled_functions_name_regexp_type.phpt
@@ -2,7 +2,7 @@
 Disable functions
 --SKIPIF--
 <?php if (!extension_loaded("snuffleupagus")) print "skip"; ?>
-<?php if (PHP_VERSION_ID >= 80000) print "skip"; ?>
+<?php if (PHP_VERSION_ID >= 80000) print "skip Not implemented in PHP 8+"; ?>
 --INI--
 sp.configuration_file={PWD}/config/config_disabled_functions_name_regexp_type.ini
 --FILE--
diff --git a/src/tests/disable_function/disabled_functions_name_type.phpt b/src/tests/disable_function/disabled_functions_name_type.phpt
index 62a6328..7a2c3ed 100644
--- a/src/tests/disable_function/disabled_functions_name_type.phpt
+++ b/src/tests/disable_function/disabled_functions_name_type.phpt
@@ -2,7 +2,7 @@
 Disable functions
 --SKIPIF--
 <?php if (!extension_loaded("snuffleupagus")) print "skip"; ?>
-<?php if (PHP_VERSION_ID >= 80000) print "skip"; ?>
+<?php if (PHP_VERSION_ID >= 80000) print "skip Not implemented in PHP 8+"; ?>
 --INI--
 sp.configuration_file={PWD}/config/config_disabled_functions_name_type.ini
 --FILE--
diff --git a/src/tests/disable_function/disabled_functions_param_str_representation.phpt b/src/tests/disable_function/disabled_functions_param_str_representation.phpt
index 179ce93..6fc3927 100644
--- a/src/tests/disable_function/disabled_functions_param_str_representation.phpt
+++ b/src/tests/disable_function/disabled_functions_param_str_representation.phpt
@@ -2,7 +2,7 @@
 Disable functions - casting various types to string internally
 --SKIPIF--
 <?php if (!extension_loaded("snuffleupagus")) print "skip"; ?>
-<?php if (PHP_VERSION_ID >= 80000) print "skip"; ?>
+<?php if (PHP_VERSION_ID >= 80000) print "skip Not implemented in PHP 8+"; ?>
 --INI--
 sp.configuration_file={PWD}/config/config_disabled_functions_param_str_representation.ini
 --FILE--
diff --git a/src/tests/dump_request/dump_request_nonwriteable_folder.phpt b/src/tests/dump_request/dump_request_nonwriteable_folder.phpt
index fc70341..25b4c47 100644
--- a/src/tests/dump_request/dump_request_nonwriteable_folder.phpt
+++ b/src/tests/dump_request/dump_request_nonwriteable_folder.phpt
@@ -8,11 +8,11 @@ if ("ubuntu" == getenv("CI_JOB_IMAGE")) { print "skip"; }
 // root has write privileges "any" folders
 if (TRUE == function_exists("posix_getuid")) {
         if (0 == posix_getuid()) {
-                print "skip";
+                print "skip Running as root";
         }
 } elseif (TRUE == function_exists("shell_exec")) {
         if ("root" == trim(shell_exec("whoami"))) {
-                print "skip";
+                print "skip Running as root";
         }
 }
 
diff --git a/src/tests/global_strict/global_strict.phpt b/src/tests/global_strict/global_strict.phpt
index 07dc979..8f746d7 100644
--- a/src/tests/global_strict/global_strict.phpt
+++ b/src/tests/global_strict/global_strict.phpt
@@ -2,7 +2,7 @@
 Global strict mode
 --SKIPIF--
 <?php if (!extension_loaded("snuffleupagus")) print "skip"; ?>
-<?php if (PHP_VERSION_ID >= 80000) print "skip"; ?>
+<?php if (PHP_VERSION_ID >= 80000) print "skip Not implemented in PHP 8+"; ?>
 --INI--
 sp.configuration_file={PWD}/config/global_strict.ini
 --FILE--
diff --git a/src/tests/global_strict/global_strict_disabled.phpt b/src/tests/global_strict/global_strict_disabled.phpt
index c948444..2ab6889 100644
--- a/src/tests/global_strict/global_strict_disabled.phpt
+++ b/src/tests/global_strict/global_strict_disabled.phpt
@@ -2,7 +2,7 @@
 Global strict mode
 --SKIPIF--
 <?php if (!extension_loaded("snuffleupagus")) print "skip"; ?>
-<?php if (PHP_VERSION_ID >= 80000) print "skip"; ?>
+<?php if (PHP_VERSION_ID >= 80000) print "skip Not implemented in PHP 8+"; ?>
 --INI--
 sp.configuration_file={PWD}/config/global_strict_disabled.ini
 --FILE--
diff --git a/src/tests/harden_rand/harden_rand_noargs.phpt b/src/tests/harden_rand/harden_rand_noargs.phpt
index 9abbffa..dab043b 100644
--- a/src/tests/harden_rand/harden_rand_noargs.phpt
+++ b/src/tests/harden_rand/harden_rand_noargs.phpt
@@ -2,7 +2,7 @@
 Harden rand without any arguments
 --SKIPIF--
 <?php if (!extension_loaded("snuffleupagus")) print "skip"; ?>
-<?php if (PHP_VERSION_ID >= 80000) print "skip"; ?>
+<?php if (PHP_VERSION_ID >= 80000) print "skip Not applicable for PHP 8+"; ?>
 --INI--
 sp.configuration_file={PWD}/config/harden_rand.ini
 We should fix this
diff --git a/src/tests/regressions/issue_479.phpt b/src/tests/regressions/issue_479.phpt
index 47e24d3..fa38c2b 100644
--- a/src/tests/regressions/issue_479.phpt
+++ b/src/tests/regressions/issue_479.phpt
@@ -1,7 +1,8 @@
 --TEST--
 Regression test for https://github.com/jvoisin/snuffleupagus/issues/479
 --SKIPIF--
-<?php if (!extension_loaded("snuffleupagus") || !extension_loaded("simplexml")) print("skip"); ?>
+<?php if (!extension_loaded("snuffleupagus")) print("skip"); ?>
+<?php if (!extension_loaded("simplexml")) print("skip Required extension missing: simplexml"); ?>
 --INI--
 sp.configuration_file={PWD}/../config/issue_479.ini
 --FILE--
diff --git a/src/tests/session_encryption/set_custom_session_handler.phpt b/src/tests/session_encryption/set_custom_session_handler.phpt
index 1f3f907..b917f5b 100644
--- a/src/tests/session_encryption/set_custom_session_handler.phpt
+++ b/src/tests/session_encryption/set_custom_session_handler.phpt
@@ -3,7 +3,7 @@ Set a custom session handler
 --SKIPIF--
 <?php if (!extension_loaded("snuffleupagus")) print "skip"; ?>
 <?php if (!extension_loaded("session")) print "skip"; ?>
-<?php if (PHP_VERSION_ID >= 80400) print "skip"; /* Calling session_set_save_handler() with more than 2 arguments is deprecated */ ?>
+<?php if (PHP_VERSION_ID >= 80400) print "skip Not applicable for PHP 8+"; /* Calling session_set_save_handler() with more than 2 arguments is deprecated */ ?>
 --EXTENSIONS--
 session
 --INI--
diff --git a/src/tests/sloppy_comparison/sloppy_comparison_array_disabled.phpt b/src/tests/sloppy_comparison/sloppy_comparison_array_disabled.phpt
index e292f5e..531ed1d 100644
--- a/src/tests/sloppy_comparison/sloppy_comparison_array_disabled.phpt
+++ b/src/tests/sloppy_comparison/sloppy_comparison_array_disabled.phpt
@@ -2,7 +2,7 @@
 Sloppy comparison in_array disabled
 --SKIPIF--
 <?php if (!extension_loaded("snuffleupagus")) print "skip"; ?>
-<?php if (PHP_VERSION_ID >= 80000) print "skip"; ?>
+<?php if (PHP_VERSION_ID >= 80000) print "skip Not applicable for PHP 8+"; ?>
 --INI--
 sp.allow_broken_configuration=On
 --FILE--
diff --git a/src/tests/sloppy_comparison/sloppy_comparison_array_keys_disabled.phpt b/src/tests/sloppy_comparison/sloppy_comparison_array_keys_disabled.phpt
index 3cc02c2..84bbad1 100644
--- a/src/tests/sloppy_comparison/sloppy_comparison_array_keys_disabled.phpt
+++ b/src/tests/sloppy_comparison/sloppy_comparison_array_keys_disabled.phpt
@@ -2,7 +2,7 @@
 Sloppy comparison array_keys disabled
 --SKIPIF--
 <?php if (!extension_loaded("snuffleupagus")) print "skip"; ?>
-<?php if (PHP_VERSION_ID >= 80000) print "skip"; ?>
+<?php if (PHP_VERSION_ID >= 80000) print "skip Not applicable for PHP 8+"; ?>
 --INI--
 sp.allow_broken_configuration=On
 --FILE--
diff --git a/src/tests/sloppy_comparison/sloppy_comparison_array_search_disabled.phpt b/src/tests/sloppy_comparison/sloppy_comparison_array_search_disabled.phpt
index 2da4a17..f49ae4a 100644
--- a/src/tests/sloppy_comparison/sloppy_comparison_array_search_disabled.phpt
+++ b/src/tests/sloppy_comparison/sloppy_comparison_array_search_disabled.phpt
@@ -2,7 +2,7 @@
 Sloppy comparison array_search disabled
 --SKIPIF--
 <?php if (!extension_loaded("snuffleupagus")) print "skip"; ?>
-<?php if (PHP_VERSION_ID >= 80000) print "skip"; ?>
+<?php if (PHP_VERSION_ID >= 80000) print "skip Not applicable for PHP 8+"; ?>
 --INI--
 sp.allow_broken_configuration=On
 --FILE--
diff --git a/src/tests/sloppy_comparison/sloppy_comparison_disable.phpt b/src/tests/sloppy_comparison/sloppy_comparison_disable.phpt
index be615f5..d8f9108 100644
--- a/src/tests/sloppy_comparison/sloppy_comparison_disable.phpt
+++ b/src/tests/sloppy_comparison/sloppy_comparison_disable.phpt
@@ -2,7 +2,7 @@
 Sloppy comparison
 --SKIPIF--
 <?php if (!extension_loaded("snuffleupagus")) print "skip"; ?>
-<?php if (PHP_VERSION_ID >= 80000) print "skip"; ?>
+<?php if (PHP_VERSION_ID >= 80000) print "skip Not applicable for PHP 8+"; ?>
 --INI--
 sp.allow_broken_configuration=On
 --FILE--
diff --git a/src/tests/stream_wrapper/stream_wrapper_register.phpt b/src/tests/stream_wrapper/stream_wrapper_register.phpt
index 4fa9ea8..3c63d4f 100644
--- a/src/tests/stream_wrapper/stream_wrapper_register.phpt
+++ b/src/tests/stream_wrapper/stream_wrapper_register.phpt
@@ -2,7 +2,7 @@
 Stream wrapper
 --SKIPIF--
 <?php if (!extension_loaded("snuffleupagus")) print "skip"; ?>
-<?php if (PHP_VERSION_ID >= 80200) print "skip"; ?>
+<?php if (PHP_VERSION_ID >= 80200) print "skip Not applicable for PHP 8+"; ?>
 --INI--
 sp.configuration_file={PWD}/config/config_stream_wrapper_register.ini
 --FILE--
diff --git a/src/tests/stream_wrapper/stream_wrapper_restore.phpt b/src/tests/stream_wrapper/stream_wrapper_restore.phpt
index 4f110ee..9d883f5 100644
--- a/src/tests/stream_wrapper/stream_wrapper_restore.phpt
+++ b/src/tests/stream_wrapper/stream_wrapper_restore.phpt
@@ -2,7 +2,7 @@
 Stream wrapper
 --SKIPIF--
 <?php if (!extension_loaded("snuffleupagus")) print "skip"; ?>
-<?php if (PHP_VERSION_ID >= 80000) print "skip"; ?>
+<?php if (PHP_VERSION_ID >= 80000) print "skip Not applicable for PHP 8+"; ?>
 --INI--
 sp.configuration_file={PWD}/config/config_stream_wrapper_register.ini
 --FILE--
diff --git a/src/tests/unserialize/unserialize_noclass_forced.phpt b/src/tests/unserialize/unserialize_noclass_forced.phpt
index 3b1e8d3..4631509 100644
--- a/src/tests/unserialize/unserialize_noclass_forced.phpt
+++ b/src/tests/unserialize/unserialize_noclass_forced.phpt
@@ -1,7 +1,8 @@
 --TEST--
-Unserialize with noclass forced
+Unserialize with noclass forced on PHP7
 --SKIPIF--
-<?php if (!extension_loaded("snuffleupagus") || PHP_VERSION_ID >= 80000) print "skip"; ?>
+<?php if (!extension_loaded("snuffleupagus")) print "skip"; ?>
+<?php if (PHP_VERSION_ID >= 80000) print "skip Not applicable for PHP 8+"; ?>
 --INI--
 sp.configuration_file={PWD}/config/config_serialize_noclass.ini
 --FILE--
diff --git a/src/tests/unserialize/unserialize_wrong_call.phpt b/src/tests/unserialize/unserialize_wrong_call.phpt
index 70d91a5..930095e 100644
--- a/src/tests/unserialize/unserialize_wrong_call.phpt
+++ b/src/tests/unserialize/unserialize_wrong_call.phpt
@@ -2,7 +2,7 @@
 Unserialize ok, but called with the wrong number of arguments
 --SKIPIF--
 <?php if (!extension_loaded("snuffleupagus")) print "skip"; ?>
-<?php if (PHP_VERSION_ID >= 80000) print "skip"; ?>
+<?php if (PHP_VERSION_ID >= 80000) print "skip Not applicable for PHP 8+, as it results in a fatal error"; ?>
 --INI--
 sp.configuration_file={PWD}/config/config_serialize.ini
 --FILE--
diff --git a/src/tests/upload_validation/upload_validation_real.phpt b/src/tests/upload_validation/upload_validation_real.phpt
index 1c919ec..7f98561 100644
--- a/src/tests/upload_validation/upload_validation_real.phpt
+++ b/src/tests/upload_validation/upload_validation_real.phpt
@@ -3,23 +3,23 @@ Upload a file, validation ok, with our real script, using vld
 --SKIPIF--
 <?php
 if (!extension_loaded("snuffleupagus")) {
-        print "skip";
+        print "skip";
 }
 
 if (PHP_VERSION_ID >= 80000) {
-  print "skip";
+        print "skip Not applicable for PHP 8+";
 }
 
 if (strpos(system(PHP_BINARY . " -d error_log=/dev/null -d extension=vld.so -m 2>/dev/null"), "vld") === FALSE) {
-        print "skip";
+        print "skip Failed to run php command";
 }
 
 if (strpos(system(PHP_BINARY . " -d extension=vld.so -m 2>&1 | grep 'Unable to load'"), "Unable to load dynamic library 'vld.so'") !== FALSE) {
-        print "skip";
+        print "skip Failed to run php command";
 }
 
 if (strpos(phpversion(), '-dev') !== FALSE) {
-        print 'skip';
+        print "skip Detected development version of PHP";
 }
 ?>
 --INI--
diff --git a/src/tests/xxe/disable_xxe_dom_disabled.phpt b/src/tests/xxe/disable_xxe_dom_disabled.phpt
index 20399ec..cd8091c 100644
--- a/src/tests/xxe/disable_xxe_dom_disabled.phpt
+++ b/src/tests/xxe/disable_xxe_dom_disabled.phpt
@@ -2,7 +2,7 @@
 Disable XXE (feature enabled)
 --SKIPIF--
 <?php if (!extension_loaded("snuffleupagus") || !extension_loaded("dom") || !extension_loaded("xml")) print("skip"); ?>
-<?php if (PHP_VERSION_ID >= 80000) print "skip"; ?>
+<?php if (PHP_VERSION_ID >= 80000) print "skip Not applicable for PHP 8+"; ?>
 --INI--
 sp.configuration_file={PWD}/config/disable_xxe.ini
 --EXTENSIONS--
diff --git a/src/tests/xxe/disable_xxe_simplexml.phpt b/src/tests/xxe/disable_xxe_simplexml.phpt
index 6b1e3f5..d33e206 100644
--- a/src/tests/xxe/disable_xxe_simplexml.phpt
+++ b/src/tests/xxe/disable_xxe_simplexml.phpt
@@ -2,7 +2,7 @@
 Disable XXE
 --SKIPIF--
 <?php if (!extension_loaded("snuffleupagus") || !extension_loaded("simplexml")) print("skip"); ?>
-<?php if (PHP_VERSION_ID >= 80000) print "skip"; ?>
+<?php if (PHP_VERSION_ID >= 80000) print "skip Not applicable for PHP 8+"; ?>
 --INI--
 sp.configuration_file={PWD}/config/disable_xxe_disable.ini
 --EXTENSIONS--
diff --git a/src/tests/xxe/disable_xxe_simplexml_oop.phpt b/src/tests/xxe/disable_xxe_simplexml_oop.phpt
index 3da8dc8..89c38dc 100644
--- a/src/tests/xxe/disable_xxe_simplexml_oop.phpt
+++ b/src/tests/xxe/disable_xxe_simplexml_oop.phpt
@@ -2,7 +2,7 @@
 Disable XXE
 --SKIPIF--
 <?php if (!extension_loaded("snuffleupagus") || !extension_loaded("simplexml")) print("skip"); ?>
-<?php if (PHP_VERSION_ID >= 80000) print "skip"; ?>
+<?php if (PHP_VERSION_ID >= 80000) print "skip Not applicable for PHP 8+"; ?>
 --INI--
 sp.configuration_file={PWD}/config/disable_xxe_disable.ini
 --EXTENSIONS--
diff --git a/src/tests/xxe/disable_xxe_xml_parse.phpt b/src/tests/xxe/disable_xxe_xml_parse.phpt
index 4a8292d..00627e7 100644
--- a/src/tests/xxe/disable_xxe_xml_parse.phpt
+++ b/src/tests/xxe/disable_xxe_xml_parse.phpt
@@ -8,7 +8,7 @@ Disable XXE in xml_parse
   echo "skip because the `xml` extension isn't loaded";
 }
  ?>
-<?php if (PHP_VERSION_ID >= 80000) print "skip"; ?>
+<?php if (PHP_VERSION_ID >= 80000) print "skip Not applicable for PHP 8+"; ?>
 --EXTENSIONS--
 xml
 --INI--