blob: 1bb6e4a53b50967540d6e6a7cf58629aa3e5c881 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
|
From 2a5bc513c6ae065ef43bda71b321bce1b318f03e Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Tue, 8 Apr 2025 14:12:09 +0200
Subject: [PATCH] fix tests with 5.6
---
tests/gnupgt.inc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tests/gnupgt.inc b/tests/gnupgt.inc
index 2b8aa08..7b06a0a 100644
--- a/tests/gnupgt.inc
+++ b/tests/gnupgt.inc
@@ -75,7 +75,7 @@ class gnupgt {
self::reset_key();
$gpg = self::create_instance();
- $gpg->import($privkey ?? $testkey);
+ $gpg->import(is_null($privkey) ? $testkey : $privkey);
}
/**
From ce9e56099fa619f368676ccaa6b005c8d69f6f12 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Tue, 8 Apr 2025 16:59:40 +0200
Subject: [PATCH] clean hidden files
---
tests/gnupgt.inc | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/tests/gnupgt.inc b/tests/gnupgt.inc
index 2b8aa08..7191ec1 100644
--- a/tests/gnupgt.inc
+++ b/tests/gnupgt.inc
@@ -90,9 +90,10 @@ class gnupgt {
if (!is_dir($homeDir)) {
return;
}
- foreach (glob($homeDir . '/*') as $filename) {
- if (!is_dir($filename)) {
- unlink($filename);
+ $dir = opendir($homeDir);
+ while ($filename = readdir($dir)) {
+ if (!is_dir("$homeDir/$filename")) {
+ unlink("$homeDir/$filename");
}
}
$privKeyDir = self::get_priv_key_dir($homeDir);
|
