From 80228c69c19b131764cd5848071d25f7ba0ad249 Mon Sep 17 00:00:00 2001
From: Ben Fuhrmannek
Date: Wed, 12 Jan 2022 19:51:09 +0100
Subject: removed redundant tests + minor fixes

---
 .../crypt_session_corrupted_session.phpt           |  5 ++--
 .../session_encryption/crypt_session_invalid.phpt  |  5 ++--
 .../crypt_session_invalid_simul.phpt               |  8 ++++--
 .../crypt_session_invalid_simul_php8.phpt          | 33 ----------------------
 .../crypt_session_read_uncrypt.phpt                |  3 ++
 .../session_encryption/crypt_session_valid.phpt    |  3 ++
 .../crypt_session_valid_simul.phpt                 |  3 ++
 .../set_custom_session_handler.phpt                |  3 ++
 .../set_custom_session_handler2.phpt               |  3 ++
 .../set_custom_session_handler_ini.phpt            |  3 ++
 10 files changed, 29 insertions(+), 40 deletions(-)
 delete mode 100644 src/tests/session_encryption/crypt_session_invalid_simul_php8.phpt

(limited to 'src/tests/session_encryption')

diff --git a/src/tests/session_encryption/crypt_session_corrupted_session.phpt b/src/tests/session_encryption/crypt_session_corrupted_session.phpt
index db3f949..eca43b4 100644
--- a/src/tests/session_encryption/crypt_session_corrupted_session.phpt
+++ b/src/tests/session_encryption/crypt_session_corrupted_session.phpt
@@ -2,8 +2,9 @@
 Set a custom session handler
 --SKIPIF--
 <?php if (!extension_loaded("snuffleupagus")) print "skip"; ?>
-<?php if (PHP_VERSION_ID >= 80000) print "skip"; ?>
-<?php if (PHP_VERSION_ID >= 70400) print "skip"; ?>
+<?php if (!extension_loaded("session")) print "skip"; ?>
+--EXTENSIONS--
+session
 --INI--
 sp.configuration_file={PWD}/config/config_crypt_session.ini
 session.save_path="/tmp"
diff --git a/src/tests/session_encryption/crypt_session_invalid.phpt b/src/tests/session_encryption/crypt_session_invalid.phpt
index 967d9d1..a71a601 100644
--- a/src/tests/session_encryption/crypt_session_invalid.phpt
+++ b/src/tests/session_encryption/crypt_session_invalid.phpt
@@ -2,8 +2,9 @@
 SESSION crypt and bad decrypt
 --SKIPIF--
 <?php if (!extension_loaded("snuffleupagus")) print "skip"; ?>
-<?php if (PHP_VERSION_ID >= 80000) print "skip"; ?>
-<?php if (PHP_VERSION_ID >= 70400) print "skip"; ?>
+<?php if (!extension_loaded("session")) print "skip"; ?>
+--EXTENSIONS--
+session
 --INI--
 sp.configuration_file={PWD}/config/config_crypt_session.ini
 --ENV--
diff --git a/src/tests/session_encryption/crypt_session_invalid_simul.phpt b/src/tests/session_encryption/crypt_session_invalid_simul.phpt
index 02db524..3eb619c 100644
--- a/src/tests/session_encryption/crypt_session_invalid_simul.phpt
+++ b/src/tests/session_encryption/crypt_session_invalid_simul.phpt
@@ -1,7 +1,10 @@
 --TEST--
 SESSION crypt and bad decrypt
 --SKIPIF--
-<?php if (!extension_loaded("snuffleupagus") || PHP_VERSION_ID < 80000) print "skip"; ?>
+<?php if (!extension_loaded("snuffleupagus")) print "skip"; ?>
+<?php if (!extension_loaded("session")) print "skip"; ?>
+--EXTENSIONS--
+session
 --INI--
 sp.configuration_file={PWD}/config/config_crypt_session_simul.ini
 display_errors=0
@@ -30,5 +33,4 @@ unlink(dirname(__FILE__) . "/crypt_session_invalid_simul.tmp");
 --EXPECTF--
 array(0) {
 }
-%aPHP Warning:  [snuffleupagus][127.0.0.2][cookie_encryption][simulation] Something went wrong with the decryption of the session. Using the cookie 'as is' instead of decrypting it in %a/crypt_session_invalid_simul.php on line 9
-%aPHP Warning:  session_start(): Failed to decode session object. Session has been destroyed in %a/crypt_session_invalid_simul.php on line 9
+%sPHP Warning:  [snuffleupagus][127.0.0.2][cookie_encryption][simulation] Something went wrong with the decryption of the session. Using the cookie 'as is' instead of decrypting it in %a/crypt_session_invalid_simul.php on line 9%A
\ No newline at end of file
diff --git a/src/tests/session_encryption/crypt_session_invalid_simul_php8.phpt b/src/tests/session_encryption/crypt_session_invalid_simul_php8.phpt
deleted file mode 100644
index a05b828..0000000
--- a/src/tests/session_encryption/crypt_session_invalid_simul_php8.phpt
+++ /dev/null
@@ -1,33 +0,0 @@
---TEST--
-SESSION crypt and bad decrypt
---SKIPIF--
-<?php if (!extension_loaded("snuffleupagus") || PHP_VERSION_ID >= 80000) print "skip"; ?>
---INI--
-sp.configuration_file={PWD}/config/config_crypt_session_simul.ini
-display_errors=0
-log_errors=1
-error_log="{PWD}"/crypt_session_invalid_simul.tmp
---ENV--
-return <<<EOF
-REMOTE_ADDR=127.0.0.1
-EOF;
---FILE--
-<?php
-// Do it like that to write (encrypt) the session and then to read (decrypt) the session
-session_start();			// Start new_session , it will read an empty session
-$_SESSION["toto"] = "tata"; // Encrypt and write the session
-$id = session_id(); 		// Get the session_id to use it later
-session_write_close(); 		// Close the session
-putenv("REMOTE_ADDR=127.0.0.2");
-session_id($id); 			// Recover the session with the previous session_id
-session_start(); 			// Re start the session, It will read and decrypt the non empty session
-var_dump($_SESSION); 		// Dump the session
-
-echo file_get_contents(dirname(__FILE__) . "/crypt_session_invalid_simul.tmp");
-unlink(dirname(__FILE__) . "/crypt_session_invalid_simul.tmp");
-
-?>
---EXPECTF--
-array(0) {
-}
-%aPHP Warning:  [snuffleupagus][127.0.0.2][cookie_encryption][simulation] Something went wrong with the decryption of the session. Using the cookie 'as is' instead of decrypting it in %a/crypt_session_invalid_simul%a.php on line 9
diff --git a/src/tests/session_encryption/crypt_session_read_uncrypt.phpt b/src/tests/session_encryption/crypt_session_read_uncrypt.phpt
index e2e1737..5966f8e 100644
--- a/src/tests/session_encryption/crypt_session_read_uncrypt.phpt
+++ b/src/tests/session_encryption/crypt_session_read_uncrypt.phpt
@@ -2,6 +2,9 @@
 SESSION crypt/decrypt valid
 --SKIPIF--
 <?php if (!extension_loaded("snuffleupagus")) print "skip"; ?>
+<?php if (!extension_loaded("session")) print "skip"; ?>
+--EXTENSIONS--
+session
 --INI--
 sp.configuration_file={PWD}/config/config_crypt_session_simul.ini
 session.save_path="{PWD}"
diff --git a/src/tests/session_encryption/crypt_session_valid.phpt b/src/tests/session_encryption/crypt_session_valid.phpt
index c272486..a28685b 100644
--- a/src/tests/session_encryption/crypt_session_valid.phpt
+++ b/src/tests/session_encryption/crypt_session_valid.phpt
@@ -2,6 +2,9 @@
 SESSION crypt/decrypt valid
 --SKIPIF--
 <?php if (!extension_loaded("snuffleupagus")) print "skip"; ?>
+<?php if (!extension_loaded("session")) print "skip"; ?>
+--EXTENSIONS--
+session
 --INI--
 sp.configuration_file={PWD}/config/config_crypt_session.ini
 --ENV--
diff --git a/src/tests/session_encryption/crypt_session_valid_simul.phpt b/src/tests/session_encryption/crypt_session_valid_simul.phpt
index d63277d..6af015e 100644
--- a/src/tests/session_encryption/crypt_session_valid_simul.phpt
+++ b/src/tests/session_encryption/crypt_session_valid_simul.phpt
@@ -2,6 +2,9 @@
 SESSION crypt/decrypt valid
 --SKIPIF--
 <?php if (!extension_loaded("snuffleupagus")) print "skip"; ?>
+<?php if (!extension_loaded("session")) print "skip"; ?>
+--EXTENSIONS--
+session
 --INI--
 sp.configuration_file={PWD}/config/config_crypt_session_simul.ini
 --ENV--
diff --git a/src/tests/session_encryption/set_custom_session_handler.phpt b/src/tests/session_encryption/set_custom_session_handler.phpt
index 1b81a04..04edcd0 100644
--- a/src/tests/session_encryption/set_custom_session_handler.phpt
+++ b/src/tests/session_encryption/set_custom_session_handler.phpt
@@ -2,6 +2,9 @@
 Set a custom session handler
 --SKIPIF--
 <?php if (!extension_loaded("snuffleupagus")) print "skip"; ?>
+<?php if (!extension_loaded("session")) print "skip"; ?>
+--EXTENSIONS--
+session
 --INI--
 sp.configuration_file={PWD}/config/config_crypt_session.ini
 session.save_path="/tmp"
diff --git a/src/tests/session_encryption/set_custom_session_handler2.phpt b/src/tests/session_encryption/set_custom_session_handler2.phpt
index 58b6595..0ebf7b6 100644
--- a/src/tests/session_encryption/set_custom_session_handler2.phpt
+++ b/src/tests/session_encryption/set_custom_session_handler2.phpt
@@ -2,6 +2,9 @@
 Set a custom session handler, twice
 --SKIPIF--
 <?php if (!extension_loaded("snuffleupagus")) print "skip"; ?>
+<?php if (!extension_loaded("session")) print "skip"; ?>
+--EXTENSIONS--
+session
 --INI--
 sp.configuration_file={PWD}/config/config_crypt_session.ini
 session.save_path="/tmp"
diff --git a/src/tests/session_encryption/set_custom_session_handler_ini.phpt b/src/tests/session_encryption/set_custom_session_handler_ini.phpt
index f9fbfb2..a454fc6 100644
--- a/src/tests/session_encryption/set_custom_session_handler_ini.phpt
+++ b/src/tests/session_encryption/set_custom_session_handler_ini.phpt
@@ -2,6 +2,9 @@
 Set a custom session handler
 --SKIPIF--
 <?php if (!extension_loaded("snuffleupagus")) print "skip"; ?>
+<?php if (!extension_loaded("session")) print "skip"; ?>
+--EXTENSIONS--
+session
 --INI--
 sp.configuration_file={PWD}/config/config_crypt_session.ini
 session.save_handler = 
-- 
cgit v1.3