From 110daa81c3b11ec102daf4ee634e2f3d2e9c5f36 Mon Sep 17 00:00:00 2001
From: jvoisin
Date: Thu, 8 Dec 2022 21:08:38 +0100
Subject: Portability improvements for PHP8.2

---
 src/tests/dump_request/dump_eval_blacklist.phpt     | 8 +++++---
 src/tests/dump_request/dump_eval_whitelist.phpt     | 8 +++++---
 src/tests/dump_request/dump_request.phpt            | 8 +++++---
 src/tests/dump_request/dump_request_stacktrace.phpt | 8 +++++---
 src/tests/dump_request/dump_request_too_big.phpt    | 8 +++++---
 5 files changed, 25 insertions(+), 15 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 a8c1618..e294703 100644
--- a/src/tests/dump_request/dump_eval_blacklist.phpt
+++ b/src/tests/dump_request/dump_eval_blacklist.phpt
@@ -6,10 +6,12 @@ if (!extension_loaded("snuffleupagus")) print "skip";
 ?>
 --CLEAN--
 <?php
-foreach (glob("/tmp/dump_result/sp_dump.*") as $dump) {
-    @unlink($dump);
+if (is_dir("/tmp/dump_result/")) {
+  foreach (glob("/tmp/dump_result/sp_dump.*") as $dump) {
+      @unlink($dump);
+  }
+  @rmdir("/tmp/dump_result/");
 }
-@rmdir("/tmp/dump_result/");
 ?>
 --POST--
 post_a=data_post_a&post_b=data_post_b
diff --git a/src/tests/dump_request/dump_eval_whitelist.phpt b/src/tests/dump_request/dump_eval_whitelist.phpt
index cc5a824..7385146 100644
--- a/src/tests/dump_request/dump_eval_whitelist.phpt
+++ b/src/tests/dump_request/dump_eval_whitelist.phpt
@@ -6,10 +6,12 @@ if (!extension_loaded("snuffleupagus")) print "skip";
 ?>
 --CLEAN--
 <?php
-foreach (glob("/tmp/dump_result/sp_dump.*") as $dump) {
-    @unlink($dump);
+if (is_dir("/tmp/dump_result/")) {
+  foreach (glob("/tmp/dump_result/sp_dump.*") as $dump) {
+      @unlink($dump);
+  }
+  @rmdir("/tmp/dump_result/");
 }
-@rmdir("/tmp/dump_result/");
 ?>
 --POST--
 post_a=data_post_a&post_b=data_post_b
diff --git a/src/tests/dump_request/dump_request.phpt b/src/tests/dump_request/dump_request.phpt
index f8dee11..e955776 100644
--- a/src/tests/dump_request/dump_request.phpt
+++ b/src/tests/dump_request/dump_request.phpt
@@ -8,10 +8,12 @@ if (!extension_loaded("snuffleupagus")) {
 ?>
 --CLEAN--
 <?php
-foreach (glob("/tmp/dump_result/sp_dump.*") as $dump) {
-    @unlink($dump);
+if (is_dir("/tmp/dump_result/")) {
+  foreach (glob("/tmp/dump_result/sp_dump.*") as $dump) {
+      @unlink($dump);
+  }
+  @rmdir("/tmp/dump_result/");
 }
-@rmdir("/tmp/dump_result/");
 ?>
 --POST--
 post_a=data_post_a&post_b=data_post_b
diff --git a/src/tests/dump_request/dump_request_stacktrace.phpt b/src/tests/dump_request/dump_request_stacktrace.phpt
index 9b02ab5..9f85044 100644
--- a/src/tests/dump_request/dump_request_stacktrace.phpt
+++ b/src/tests/dump_request/dump_request_stacktrace.phpt
@@ -8,10 +8,12 @@ if (!extension_loaded("snuffleupagus")) {
 ?>
 --CLEAN--
 <?php
-foreach (glob("/tmp/dump_result/sp_dump.*") as $dump) {
-    @unlink($dump);
+if (is_dir("/tmp/dump_result/")) {
+  foreach (glob("/tmp/dump_result/sp_dump.*") as $dump) {
+      @unlink($dump);
+  }
+  @rmdir("/tmp/dump_result/");
 }
-@rmdir("/tmp/dump_result/");
 ?>
 --POST--
 post_a=data_post_a&post_b=data_post_b
diff --git a/src/tests/dump_request/dump_request_too_big.phpt b/src/tests/dump_request/dump_request_too_big.phpt
index fd265f2..4fc8f81 100644
--- a/src/tests/dump_request/dump_request_too_big.phpt
+++ b/src/tests/dump_request/dump_request_too_big.phpt
@@ -8,10 +8,12 @@ if (!extension_loaded("snuffleupagus")) {
 ?>
 --CLEAN--
 <?php
-foreach (glob("/tmp/dump_result/sp_dump.*") as $dump) {
-    @unlink($dump);
+if (is_dir("/tmp/dump_result/")) {
+  foreach (glob("/tmp/dump_result/sp_dump.*") as $dump) {
+      @unlink($dump);
+  }
+  @rmdir("/tmp/dump_result/");
 }
-@rmdir("/tmp/dump_result/");
 ?>
 --POST--
 post_a=data_post_a&post_b=data_post_b&post_c=c
-- 
cgit v1.3