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

---
 src/tests/dump_request/dump_eval_blacklist.phpt     |  9 ---------
 src/tests/dump_request/dump_eval_whitelist.phpt     |  9 ---------
 src/tests/dump_request/dump_request.phpt            | 16 +++++++---------
 src/tests/dump_request/dump_request_stacktrace.phpt |  9 ---------
 src/tests/dump_request/dump_request_too_big.phpt    | 15 ++++++---------
 5 files changed, 13 insertions(+), 45 deletions(-)

(limited to 'src/tests/dump_request')

diff --git a/src/tests/dump_request/dump_eval_blacklist.phpt b/src/tests/dump_request/dump_eval_blacklist.phpt
index e294703..ae6ffc0 100644
--- a/src/tests/dump_request/dump_eval_blacklist.phpt
+++ b/src/tests/dump_request/dump_eval_blacklist.phpt
@@ -4,15 +4,6 @@ Dump eval blacklist
 <?php 
 if (!extension_loaded("snuffleupagus")) print "skip";
 ?>
---CLEAN--
-<?php
-if (is_dir("/tmp/dump_result/")) {
-  foreach (glob("/tmp/dump_result/sp_dump.*") as $dump) {
-      @unlink($dump);
-  }
-  @rmdir("/tmp/dump_result/");
-}
-?>
 --POST--
 post_a=data_post_a&post_b=data_post_b
 --GET--
diff --git a/src/tests/dump_request/dump_eval_whitelist.phpt b/src/tests/dump_request/dump_eval_whitelist.phpt
index 7385146..09f5523 100644
--- a/src/tests/dump_request/dump_eval_whitelist.phpt
+++ b/src/tests/dump_request/dump_eval_whitelist.phpt
@@ -4,15 +4,6 @@ Dump eval whitelist
 <?php
 if (!extension_loaded("snuffleupagus")) print "skip";
 ?>
---CLEAN--
-<?php
-if (is_dir("/tmp/dump_result/")) {
-  foreach (glob("/tmp/dump_result/sp_dump.*") as $dump) {
-      @unlink($dump);
-  }
-  @rmdir("/tmp/dump_result/");
-}
-?>
 --POST--
 post_a=data_post_a&post_b=data_post_b
 --GET--
diff --git a/src/tests/dump_request/dump_request.phpt b/src/tests/dump_request/dump_request.phpt
index e955776..7ad0323 100644
--- a/src/tests/dump_request/dump_request.phpt
+++ b/src/tests/dump_request/dump_request.phpt
@@ -6,15 +6,6 @@ if (!extension_loaded("snuffleupagus")) {
     print "skip";
 } 
 ?>
---CLEAN--
-<?php
-if (is_dir("/tmp/dump_result/")) {
-  foreach (glob("/tmp/dump_result/sp_dump.*") as $dump) {
-      @unlink($dump);
-  }
-  @rmdir("/tmp/dump_result/");
-}
-?>
 --POST--
 post_a=data_post_a&post_b=data_post_b
 --GET--
@@ -25,6 +16,13 @@ cookie_a=data_cookie_a&cookie_b=data_cookie_b
 sp.configuration_file={PWD}/config/dump_request.ini
 --FILE--
 <?php
+// Just in case
+if (is_dir("/tmp/dump_result/")) {
+  foreach (glob("/tmp/dump_result/sp_dump.*") as $dump) {
+      @unlink($dump);
+  }
+  @rmdir("/tmp/dump_result/");
+}
 echo "1\n";
 system("echo 1337;");
 $filename = glob('/tmp/dump_result/sp_dump.*')[0];
diff --git a/src/tests/dump_request/dump_request_stacktrace.phpt b/src/tests/dump_request/dump_request_stacktrace.phpt
index 9f85044..765e912 100644
--- a/src/tests/dump_request/dump_request_stacktrace.phpt
+++ b/src/tests/dump_request/dump_request_stacktrace.phpt
@@ -6,15 +6,6 @@ if (!extension_loaded("snuffleupagus")) {
     print "skip";
 } 
 ?>
---CLEAN--
-<?php
-if (is_dir("/tmp/dump_result/")) {
-  foreach (glob("/tmp/dump_result/sp_dump.*") as $dump) {
-      @unlink($dump);
-  }
-  @rmdir("/tmp/dump_result/");
-}
-?>
 --POST--
 post_a=data_post_a&post_b=data_post_b
 --GET--
diff --git a/src/tests/dump_request/dump_request_too_big.phpt b/src/tests/dump_request/dump_request_too_big.phpt
index 4fc8f81..b143bd0 100644
--- a/src/tests/dump_request/dump_request_too_big.phpt
+++ b/src/tests/dump_request/dump_request_too_big.phpt
@@ -6,15 +6,6 @@ if (!extension_loaded("snuffleupagus")) {
     print "skip";
 }
 ?>
---CLEAN--
-<?php
-if (is_dir("/tmp/dump_result/")) {
-  foreach (glob("/tmp/dump_result/sp_dump.*") as $dump) {
-      @unlink($dump);
-  }
-  @rmdir("/tmp/dump_result/");
-}
-?>
 --POST--
 post_a=data_post_a&post_b=data_post_b&post_c=c
 --GET--
@@ -29,6 +20,12 @@ END;
 sp.configuration_file={PWD}/config/dump_request.ini
 --FILE--
 <?php
+if (is_dir("/tmp/dump_result/")) {
+  foreach (glob("/tmp/dump_result/sp_dump.*") as $dump) {
+      @unlink($dump);
+  }
+  @rmdir("/tmp/dump_result/");
+}
 echo "1\n";
 system("echo 1337;");
 $filename = glob('/tmp/dump_result/*')[0];
-- 
cgit v1.3