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
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
|
From: Athos Ribeiro <athoscribeiro@gmail.com>
Date: Thu, 6 Jul 2023 16:28:53 -0300
Subject: Add support for phpunit 10
In phpunit 10, global states are no longer preserved by default [1].
* https://bugs.debian.org/1039746
[1] https://github.com/sebastianbergmann/phpunit/blob/10.0.0/ChangeLog-10.0.md#changed
Origin: upstream, https://gitlab.com/davical-project/davical/-/commit/0502860a9543567e35bf4a770315c03220672c31
Bug: https://gitlab.com/davical-project/davical/-/merge_requests/115
Bug-Debian: https://bugs.debian.org/1039746
---
testing/phpunit/ExpansionTest.php | 16 ++++++++++++++++
testing/phpunit/RangeTest.php | 16 ++++++++++++++++
2 files changed, 32 insertions(+)
diff --git a/testing/phpunit/ExpansionTest.php b/testing/phpunit/ExpansionTest.php
index 5a71318..7e5bf84 100644
--- a/testing/phpunit/ExpansionTest.php
+++ b/testing/phpunit/ExpansionTest.php
@@ -143,6 +143,10 @@ final class ExpansionTest extends TestCase
'20190124T000000Z/20190124T010000Z',
];
+ /**
+ * @runInSeparateProcess
+ * @preserveGlobalState enabled
+ */
public function testUnmodifiedCal() {
global $base_cal;
@@ -152,6 +156,10 @@ final class ExpansionTest extends TestCase
);
}
+ /**
+ * @runInSeparateProcess
+ * @preserveGlobalState enabled
+ */
public function testTueRenamed() {
global $tuesday_renamed_cal;
@@ -161,6 +169,10 @@ final class ExpansionTest extends TestCase
);
}
+ /**
+ * @runInSeparateProcess
+ * @preserveGlobalState enabled
+ */
public function testTueRenamedSwapped() {
global $tuesday_renamed_cal_order_swapped;
@@ -170,6 +182,10 @@ final class ExpansionTest extends TestCase
);
}
+ /**
+ * @runInSeparateProcess
+ * @preserveGlobalState enabled
+ */
public function testCalWithCount() {
global $count_cal;
diff --git a/testing/phpunit/RangeTest.php b/testing/phpunit/RangeTest.php
index 5b865d5..7c68d7a 100644
--- a/testing/phpunit/RangeTest.php
+++ b/testing/phpunit/RangeTest.php
@@ -12,6 +12,10 @@ $c->rrule_loop_limit = 100;
final class RangeTest extends TestCase
{
+ /**
+ * @runInSeparateProcess
+ * @preserveGlobalState enabled
+ */
public function testGetVCalendarRange() {
$cal = new vCalendar("BEGIN:VCALENDAR
PRODID:-//Mozilla.org/NONSGML Mozilla Calendar V1.1//EN
@@ -48,6 +52,10 @@ END:VCALENDAR");
self::assertEquals("20190102T072000Z", (string) $range->until->UTC());
}
+ /**
+ * @runInSeparateProcess
+ * @preserveGlobalState enabled
+ */
public function testGetVCalendarRangeTwoDayAllDay() {
$cal = new vCalendar("BEGIN:VCALENDAR
PRODID:-//Mozilla.org/NONSGML Mozilla Calendar V1.1//EN
@@ -70,6 +78,10 @@ END:VCALENDAR");
self::assertEquals("20190109T200000Z", (string) $range->until->UTC());
}
+ /**
+ * @runInSeparateProcess
+ * @preserveGlobalState enabled
+ */
public function testGetVCalendarRangeFloating() {
// When interpreted as being in Greece, this event crosses the daylight savings boundary!
// TODO deal with how that affects all-day events...
@@ -94,6 +106,10 @@ END:VCALENDAR");
self::assertEquals("20181210T130000Z", (string) $range->until->UTC());
}
+ /**
+ * @runInSeparateProcess
+ * @preserveGlobalState enabled
+ */
public function testGetVCalendarRangeAllDayAcrossDST() {
// When interpreted as being in Greece, this event crosses the daylight savings boundary!
|
