From eb570f29daa42fd8b90ecfff75382846e51b3a15 Mon Sep 17 00:00:00 2001
From: jvoisin
Date: Sat, 10 Dec 2022 12:00:36 +0100
Subject: Add support for PHP8.2

---
 .../disabled_functions_callback_called_file_r.phpt          |  5 -----
 .../disable_function/disabled_functions_called_file_r.phpt  |  5 -----
 .../disable_function/disabled_functions_include_once.phpt   | 13 ++++++-------
 .../disabled_functions_include_simulation.phpt              | 13 ++++++-------
 src/tests/disable_function/disabled_functions_require.phpt  | 13 ++++++-------
 .../disable_function/disabled_functions_require_allow.phpt  | 11 +++++------
 .../disable_function/disabled_functions_require_once.phpt   | 12 +++++-------
 .../disabled_functions_require_simulation.phpt              | 12 +++++-------
 src/tests/disable_function/disabled_functions_runtime.phpt  | 11 +++++------
 9 files changed, 38 insertions(+), 57 deletions(-)

(limited to 'src/tests/disable_function')

diff --git a/src/tests/disable_function/disabled_functions_callback_called_file_r.phpt b/src/tests/disable_function/disabled_functions_callback_called_file_r.phpt
index ec75d74..d977733 100644
--- a/src/tests/disable_function/disabled_functions_callback_called_file_r.phpt
+++ b/src/tests/disable_function/disabled_functions_callback_called_file_r.phpt
@@ -29,11 +29,6 @@ include "$dir/myfunc_callback.php";
 
 echo test('test_callback');
 
-?>
---CLEAN--
-<?php
-$dir = __DIR__;
-@unlink("$dir/myfunc_callback.php");
 ?>
 --EXPECTF--
 Fatal error: [snuffleupagus][0.0.0.0][disabled_function][drop] Aborted execution on call of the function 'test_callback' in %a/myfunc_callback.php on line 4
diff --git a/src/tests/disable_function/disabled_functions_called_file_r.phpt b/src/tests/disable_function/disabled_functions_called_file_r.phpt
index dde26f7..2ba06d4 100644
--- a/src/tests/disable_function/disabled_functions_called_file_r.phpt
+++ b/src/tests/disable_function/disabled_functions_called_file_r.phpt
@@ -24,11 +24,6 @@ include "$dir/myfunc.php";
 
 test();
 
-?>
---CLEAN--
-<?php
-$dir = __DIR__;
-@unlink("$dir/myfunc.php");
 ?>
 --EXPECTF--
 Fatal error: [snuffleupagus][0.0.0.0][disabled_function][drop] Aborted execution on call of the function 'test' in %a/myfunc.php on line 3
diff --git a/src/tests/disable_function/disabled_functions_include_once.phpt b/src/tests/disable_function/disabled_functions_include_once.phpt
index 57cb5a1..8b1bec8 100644
--- a/src/tests/disable_function/disabled_functions_include_once.phpt
+++ b/src/tests/disable_function/disabled_functions_include_once.phpt
@@ -7,21 +7,20 @@ sp.configuration_file={PWD}/config/config_disabled_functions_include.ini
 --FILE--
 <?php 
 $dir = __DIR__;
+
+// Just inc ase
+@unlink($dir . '/test.bla');
+@unlink($dir . '/test.sim');
+
 file_put_contents($dir . '/test.bla', "BLA\n");
 file_put_contents($dir . '/test.sim', "MEH\n");
 include_once $dir . '/test.bla';
 include_once $dir . '/test.sim';
 echo "1337\n";
 ?>
---CLEAN--
-<?php
-$dir = __DIR__;
-unlink($dir . '/test.bla');
-unlink($dir . '/test.sim');
-?>
 --EXPECTF--
 BLA
 
-Warning: [snuffleupagus][0.0.0.0][disabled_function][simulation] Aborted execution on call of the function 'include_once', because its argument 'inclusion path' content (%a/test.sim) matched a rule in %a/disabled_functions_include_once.php on line 6
+Warning: [snuffleupagus][0.0.0.0][disabled_function][simulation] Aborted execution on call of the function 'include_once', because its argument 'inclusion path' content (%a/test.sim) matched a rule in %a/disabled_functions_include_once.php on line %d
 MEH
 1337
diff --git a/src/tests/disable_function/disabled_functions_include_simulation.phpt b/src/tests/disable_function/disabled_functions_include_simulation.phpt
index 53ea2a4..cf2c693 100644
--- a/src/tests/disable_function/disabled_functions_include_simulation.phpt
+++ b/src/tests/disable_function/disabled_functions_include_simulation.phpt
@@ -7,21 +7,20 @@ sp.configuration_file={PWD}/config/config_disabled_functions_include.ini
 --FILE--
 <?php 
 $dir = __DIR__;
+
+// Just in case
+@unlink($dir . '/test.bla');
+@unlink($dir . '/test.sim');
+
 file_put_contents($dir . '/test.bla', "BLA\n");
 file_put_contents($dir . '/test.sim', "MEH\n");
 include $dir . '/test.bla';
 include $dir . '/test.sim';
 echo "1337\n";
 ?>
---CLEAN--
-<?php
-$dir = __DIR__;
-unlink($dir . '/test.bla');
-unlink($dir . '/test.sim');
-?>
 --EXPECTF--
 BLA
 
-Warning: [snuffleupagus][0.0.0.0][disabled_function][simulation] Aborted execution on call of the function 'include', because its argument 'inclusion path' content (%a/test.sim) matched a rule in %a/disabled_functions_include_simulation.php on line 6
+Warning: [snuffleupagus][0.0.0.0][disabled_function][simulation] Aborted execution on call of the function 'include', because its argument 'inclusion path' content (%a/test.sim) matched a rule in %a/disabled_functions_include_simulation.php on line %d
 MEH
 1337
diff --git a/src/tests/disable_function/disabled_functions_require.phpt b/src/tests/disable_function/disabled_functions_require.phpt
index df2b2f0..bf59b58 100644
--- a/src/tests/disable_function/disabled_functions_require.phpt
+++ b/src/tests/disable_function/disabled_functions_require.phpt
@@ -7,18 +7,17 @@ sp.configuration_file={PWD}/config/config_disabled_functions_require.ini
 --FILE--
 <?php 
 $dir = __DIR__;
+
+// Just in case
+@unlink($dir . '/test.bla');
+@unlink($dir . '/test.meh');
+
 file_put_contents($dir . '/test.bla', "BLA");
 file_put_contents($dir . '/test.meh', "MEH");
 require $dir . '/test.bla';
 require $dir . '/test.meh';
 echo "1337";
 ?>
---CLEAN--
-<?php
-$dir = __DIR__;
-unlink($dir . '/test.bla');
-unlink($dir . '/test.meh');
-?>
 --EXPECTF--
 BLA
-Fatal error: [snuffleupagus][0.0.0.0][disabled_function][drop] Aborted execution on call of the function 'require', because its argument 'inclusion path' content (%a/test.meh) matched a rule in %a/disabled_functions_require.php on line 6
+Fatal error: [snuffleupagus][0.0.0.0][disabled_function][drop] Aborted execution on call of the function 'require', because its argument 'inclusion path' content (%a/test.meh) matched a rule in %a/disabled_functions_require.php on line %d
diff --git a/src/tests/disable_function/disabled_functions_require_allow.phpt b/src/tests/disable_function/disabled_functions_require_allow.phpt
index 7ab29aa..37a7e33 100644
--- a/src/tests/disable_function/disabled_functions_require_allow.phpt
+++ b/src/tests/disable_function/disabled_functions_require_allow.phpt
@@ -7,6 +7,11 @@ sp.configuration_file={PWD}/config/config_disabled_functions_require_allow.ini
 --FILE--
 <?php 
 $dir = __DIR__;
+
+// Just in case
+unlink($dir . '/test.bla');
+unlink($dir . '/test.meh');
+
 file_put_contents($dir . '/test.bla', "BLA\n");
 file_put_contents($dir . '/test.meh', "MEH\n");
 require $dir . '/test.bla';
@@ -17,9 +22,3 @@ echo "1337";
 BLA
 MEH
 1337
---CLEAN--
-<?php
-$dir = __DIR__;
-unlink($dir . '/test.bla');
-unlink($dir . '/test.meh');
-?>
diff --git a/src/tests/disable_function/disabled_functions_require_once.phpt b/src/tests/disable_function/disabled_functions_require_once.phpt
index 7356c08..81049ef 100644
--- a/src/tests/disable_function/disabled_functions_require_once.phpt
+++ b/src/tests/disable_function/disabled_functions_require_once.phpt
@@ -7,18 +7,16 @@ sp.configuration_file={PWD}/config/config_disabled_functions_require.ini
 --FILE--
 <?php 
 $dir = __DIR__;
+// Just in case
+unlink($dir . '/test.bla');
+unlink($dir . '/test.meh');
+
 file_put_contents($dir . '/test.bla', "BLA");
 file_put_contents($dir . '/test.meh', "MEH");
 require_once $dir . '/test.bla';
 require_once $dir . '/test.meh';
 echo "1337";
 ?>
---CLEAN--
-<?php
-$dir = __DIR__;
-unlink($dir . '/test.bla');
-unlink($dir . '/test.meh');
-?>
 --EXPECTF--
 BLA
-Fatal error: [snuffleupagus][0.0.0.0][disabled_function][drop] Aborted execution on call of the function 'require_once', because its argument 'inclusion path' content (%a/test.meh) matched a rule in %a/disabled_functions_require_once.php on line 6
+Fatal error: [snuffleupagus][0.0.0.0][disabled_function][drop] Aborted execution on call of the function 'require_once', because its argument 'inclusion path' content (%a/test.meh) matched a rule in %a/disabled_functions_require_once.php on line %d
diff --git a/src/tests/disable_function/disabled_functions_require_simulation.phpt b/src/tests/disable_function/disabled_functions_require_simulation.phpt
index fa1523c..2c52610 100644
--- a/src/tests/disable_function/disabled_functions_require_simulation.phpt
+++ b/src/tests/disable_function/disabled_functions_require_simulation.phpt
@@ -7,21 +7,19 @@ sp.configuration_file={PWD}/config/config_disabled_functions_require.ini
 --FILE--
 <?php 
 $dir = __DIR__;
+// Just in case
+@unlink($dir . '/test.bla');
+@unlink($dir . '/test.sim');
+
 file_put_contents($dir . '/test.bla', "BLA\n");
 file_put_contents($dir . '/test.sim', "MEH\n");
 require $dir . '/test.bla';
 require $dir . '/test.sim';
 echo "1337\n";
 ?>
---CLEAN--
-<?php
-$dir = __DIR__;
-unlink($dir . '/test.bla');
-unlink($dir . '/test.sim');
-?>
 --EXPECTF--
 BLA
 
-Warning: [snuffleupagus][0.0.0.0][disabled_function][simulation] Aborted execution on call of the function 'require', because its argument 'inclusion path' content (%a/test.sim) matched a rule in %a/disabled_functions_require_simulation.php on line 6
+Warning: [snuffleupagus][0.0.0.0][disabled_function][simulation] Aborted execution on call of the function 'require', because its argument 'inclusion path' content (%a/test.sim) matched a rule in %a/disabled_functions_require_simulation.php on line %d
 MEH
 1337
diff --git a/src/tests/disable_function/disabled_functions_runtime.phpt b/src/tests/disable_function/disabled_functions_runtime.phpt
index 16ecfdb..8175a77 100644
--- a/src/tests/disable_function/disabled_functions_runtime.phpt
+++ b/src/tests/disable_function/disabled_functions_runtime.phpt
@@ -6,8 +6,12 @@ Disable functions - runtime inclusion
 sp.configuration_file={PWD}/config/config_disabled_functions_param_runtime.ini
 --FILE--
 <?php 
-
 $dir = __DIR__;
+
+// Just in case
+@unlink("file_to_include1.php");
+@unlink("file_to_include2.php");
+
 $content = '<?php function test($param) { echo $param . "\n"; }';
 file_put_contents('file_to_include1.php', $content);
 file_put_contents('file_to_include2.php', $content);
@@ -20,11 +24,6 @@ if (rand() % 2) {
 
 test('1338');test('1337');
 
-?>
---CLEAN--
-<?php
-unlink("file_to_include1.php");
-unlink("file_to_include2.php");
 ?>
 --EXPECTF--
 1338
-- 
cgit v1.3