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
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
|
Description: Adapt to PHPUnit 8.x and 9.x API.
Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
diff --git a/Horde_Alarm-2.2.10/test/Horde/Alarm/HandlerTest.php b/Horde_Alarm-2.2.10/test/Horde/Alarm/HandlerTest.php
index bd761de..e7e8b7e 100644
--- a/Horde_Alarm-2.2.10/test/Horde/Alarm/HandlerTest.php
+++ b/Horde_Alarm-2.2.10/test/Horde/Alarm/HandlerTest.php
@@ -7,13 +7,13 @@
* @subpackage UnitTests
*/
-class Horde_Alarm_HandlerTest extends PHPUnit_Framework_TestCase
+class Horde_Alarm_HandlerTest extends Horde_Test_Case
{
protected static $alarm;
protected static $storage;
protected static $mail;
- public function setUp()
+ public function setUp(): void
{
if (!class_exists('Horde_Notification')) {
$this->markTestSkipped('Horde_Notification not installed');
diff --git a/Horde_Alarm-2.2.10/test/Horde/Alarm/Storage/Base.php b/Horde_Alarm-2.2.10/test/Horde/Alarm/Storage/Base.php
index 9d57802..808bb21 100644
--- a/Horde_Alarm-2.2.10/test/Horde/Alarm/Storage/Base.php
+++ b/Horde_Alarm-2.2.10/test/Horde/Alarm/Storage/Base.php
@@ -12,7 +12,7 @@ abstract class Horde_Alarm_Storage_Base extends Horde_Test_Case
protected static $date;
protected static $end;
- public static function setUpBeforeClass()
+ public static function setUpBeforeClass(): void
{
$now = time();
self::$date = new Horde_Date($now);
@@ -34,6 +34,7 @@ abstract class Horde_Alarm_Storage_Base extends Horde_Test_Case
'params' => array('foo' => str_repeat('X', 5000)),
'title' => 'This is a personal alarm.');
self::$alarm->set($hash);
+ $this->assertIsObject(self::$alarm);
}
/**
@@ -50,7 +51,7 @@ abstract class Horde_Alarm_Storage_Base extends Horde_Test_Case
public function testGet()
{
$alarm = self::$alarm->get('personalalarm', 'john');
- $this->assertInternalType('array', $alarm);
+ $this->assertIsArray($alarm);
$this->assertEquals('personalalarm', $alarm['id']);
$this->assertEquals('john', $alarm['user']);
$this->assertEquals(array(), $alarm['methods']);
@@ -72,6 +73,8 @@ abstract class Horde_Alarm_Storage_Base extends Horde_Test_Case
{
$alarm['title'] = 'Changed alarm text';
self::$alarm->set($alarm);
+ // dummy assertion to silence PHPUnit
+ $this->assertTrue(true);
}
/**
@@ -106,10 +109,10 @@ abstract class Horde_Alarm_Storage_Base extends Horde_Test_Case
/**
* @depends testDelete
- * @expectedException Horde_Alarm_Exception
*/
public function testSnoozeException()
{
+ $this->expectException('Horde_Alarm_Exception');
self::$alarm->snooze('personalalarm', 'jane', 30);
}
@@ -160,5 +163,7 @@ abstract class Horde_Alarm_Storage_Base extends Horde_Test_Case
{
self::$alarm->delete('noend', 'john');
self::$alarm->delete('personalalarm', 'john');
+ // dummy assertion to silence PHPUnit
+ $this->assertTrue(true);
}
}
diff --git a/Horde_Alarm-2.2.10/test/Horde/Alarm/Storage/NullTest.php b/Horde_Alarm-2.2.10/test/Horde/Alarm/Storage/NullTest.php
index d01f304..d39e68d 100644
--- a/Horde_Alarm-2.2.10/test/Horde/Alarm/Storage/NullTest.php
+++ b/Horde_Alarm-2.2.10/test/Horde/Alarm/Storage/NullTest.php
@@ -11,6 +11,7 @@ class Horde_Alarm_Storage_NullTest extends Horde_Alarm_Storage_Base
public function testFactory()
{
self::$alarm = new Horde_Alarm_Null();
+ $this->assertIsObject(self::$alarm);
}
/**
@@ -23,10 +24,10 @@ class Horde_Alarm_Storage_NullTest extends Horde_Alarm_Storage_Base
/**
* @depends testFactory
- * @expectedException Horde_Alarm_Exception
*/
public function testGet()
{
+ $this->expectException('Horde_Alarm_Exception');
$alarm = self::$alarm->get('personalalarm', 'john');
}
@@ -35,6 +36,7 @@ class Horde_Alarm_Storage_NullTest extends Horde_Alarm_Storage_Base
*/
public function testUpdate($alarm)
{
+ $this->assertTrue(true);
}
/**
diff --git a/Horde_Alarm-2.2.10/test/Horde/Alarm/Storage/ObjectTest.php b/Horde_Alarm-2.2.10/test/Horde/Alarm/Storage/ObjectTest.php
index 0383af5..6d2a183 100644
--- a/Horde_Alarm-2.2.10/test/Horde/Alarm/Storage/ObjectTest.php
+++ b/Horde_Alarm-2.2.10/test/Horde/Alarm/Storage/ObjectTest.php
@@ -11,5 +11,6 @@ class Horde_Alarm_Storage_ObjectTest extends Horde_Alarm_Storage_Base
public function testFactory()
{
self::$alarm = new Horde_Alarm_Object();
+ $this->assertIsObject(self::$alarm);
}
}
diff --git a/Horde_Alarm-2.2.10/test/Horde/Alarm/Storage/Sql/Base.php b/Horde_Alarm-2.2.10/test/Horde/Alarm/Storage/Sql/Base.php
index beb1739..d829cee 100644
--- a/Horde_Alarm-2.2.10/test/Horde/Alarm/Storage/Sql/Base.php
+++ b/Horde_Alarm-2.2.10/test/Horde/Alarm/Storage/Sql/Base.php
@@ -12,7 +12,7 @@ abstract class Horde_Alarm_Storage_Sql_Base extends Horde_Alarm_Storage_Base
protected static $migrator;
protected static $reason;
- public static function setUpBeforeClass()
+ public static function setUpBeforeClass(): void
{
parent::setUpBeforeClass();
@@ -34,7 +34,7 @@ abstract class Horde_Alarm_Storage_Sql_Base extends Horde_Alarm_Storage_Base
self::$migrator->up();
}
- public static function tearDownAfterClass()
+ public static function tearDownAfterClass(): void
{
if (self::$migrator) {
self::$migrator->down();
@@ -45,7 +45,7 @@ abstract class Horde_Alarm_Storage_Sql_Base extends Horde_Alarm_Storage_Base
self::$db = self::$migrator = null;
}
- public function setUp()
+ public function setUp(): void
{
if (!self::$db) {
$this->markTestSkipped(self::$reason);
@@ -56,6 +56,7 @@ abstract class Horde_Alarm_Storage_Sql_Base extends Horde_Alarm_Storage_Base
public function testFactory()
{
self::$alarm = new Horde_Alarm_Sql(array('db' => self::$db, 'charset' => 'UTF-8'));
+ $this->assertIsObject(self::$alarm);
self::$alarm->initialize();
self::$alarm->gc(true);
}
diff --git a/Horde_Alarm-2.2.10/test/Horde/Alarm/Storage/Sql/MysqlTest.php b/Horde_Alarm-2.2.10/test/Horde/Alarm/Storage/Sql/MysqlTest.php
index 72b5f35..1c5aec8 100644
--- a/Horde_Alarm-2.2.10/test/Horde/Alarm/Storage/Sql/MysqlTest.php
+++ b/Horde_Alarm-2.2.10/test/Horde/Alarm/Storage/Sql/MysqlTest.php
@@ -8,7 +8,7 @@
*/
class Horde_Alarm_Storage_Sql_MysqlTest extends Horde_Alarm_Storage_Sql_Base
{
- public static function setUpBeforeClass()
+ public static function setUpBeforeClass(): void
{
if (!extension_loaded('mysql')) {
self::$reason = 'No mysql extension';
diff --git a/Horde_Alarm-2.2.10/test/Horde/Alarm/Storage/Sql/MysqliTest.php b/Horde_Alarm-2.2.10/test/Horde/Alarm/Storage/Sql/MysqliTest.php
index 20bdb29..cce7ad2 100644
--- a/Horde_Alarm-2.2.10/test/Horde/Alarm/Storage/Sql/MysqliTest.php
+++ b/Horde_Alarm-2.2.10/test/Horde/Alarm/Storage/Sql/MysqliTest.php
@@ -8,7 +8,7 @@
*/
class Horde_Alarm_Storage_Sql_MysqliTest extends Horde_Alarm_Storage_Sql_Base
{
- public static function setUpBeforeClass()
+ public static function setUpBeforeClass(): void
{
if (!extension_loaded('mysqli')) {
self::$reason = 'No mysqli extension';
diff --git a/Horde_Alarm-2.2.10/test/Horde/Alarm/Storage/Sql/Oci8Test.php b/Horde_Alarm-2.2.10/test/Horde/Alarm/Storage/Sql/Oci8Test.php
index c9707bf..14d5f70 100644
--- a/Horde_Alarm-2.2.10/test/Horde/Alarm/Storage/Sql/Oci8Test.php
+++ b/Horde_Alarm-2.2.10/test/Horde/Alarm/Storage/Sql/Oci8Test.php
@@ -8,7 +8,7 @@
*/
class Horde_Alarm_Storage_Sql_Oci8Test extends Horde_Alarm_Storage_Sql_Base
{
- public static function setUpBeforeClass()
+ public static function setUpBeforeClass(): void
{
if (!extension_loaded('oci8')) {
self::$reason = 'No oci8 extension';
diff --git a/Horde_Alarm-2.2.10/test/Horde/Alarm/Storage/Sql/Pdo/MysqlTest.php b/Horde_Alarm-2.2.10/test/Horde/Alarm/Storage/Sql/Pdo/MysqlTest.php
index dafb8c8..e16c0fe 100644
--- a/Horde_Alarm-2.2.10/test/Horde/Alarm/Storage/Sql/Pdo/MysqlTest.php
+++ b/Horde_Alarm-2.2.10/test/Horde/Alarm/Storage/Sql/Pdo/MysqlTest.php
@@ -8,7 +8,7 @@
*/
class Horde_Alarm_Storage_Sql_Pdo_MysqlTest extends Horde_Alarm_Storage_Sql_Base
{
- public static function setUpBeforeClass()
+ public static function setUpBeforeClass(): void
{
if (!extension_loaded('pdo') ||
!in_array('mysql', PDO::getAvailableDrivers())) {
diff --git a/Horde_Alarm-2.2.10/test/Horde/Alarm/Storage/Sql/Pdo/PgsqlTest.php b/Horde_Alarm-2.2.10/test/Horde/Alarm/Storage/Sql/Pdo/PgsqlTest.php
index 0cee910..c283c13 100644
--- a/Horde_Alarm-2.2.10/test/Horde/Alarm/Storage/Sql/Pdo/PgsqlTest.php
+++ b/Horde_Alarm-2.2.10/test/Horde/Alarm/Storage/Sql/Pdo/PgsqlTest.php
@@ -8,7 +8,7 @@
*/
class Horde_Alarm_Storage_Sql_Pdo_PgsqlTest extends Horde_Alarm_Storage_Sql_Base
{
- public static function setUpBeforeClass()
+ public static function setUpBeforeClass(): void
{
if (!extension_loaded('pdo') ||
!in_array('pgsql', PDO::getAvailableDrivers())) {
diff --git a/Horde_Alarm-2.2.10/test/Horde/Alarm/Storage/Sql/Pdo/SqliteTest.php b/Horde_Alarm-2.2.10/test/Horde/Alarm/Storage/Sql/Pdo/SqliteTest.php
index 9f8d745..d89f847 100644
--- a/Horde_Alarm-2.2.10/test/Horde/Alarm/Storage/Sql/Pdo/SqliteTest.php
+++ b/Horde_Alarm-2.2.10/test/Horde/Alarm/Storage/Sql/Pdo/SqliteTest.php
@@ -8,7 +8,7 @@
*/
class Horde_Alarm_Storage_Sql_Pdo_SqliteTest extends Horde_Alarm_Storage_Sql_Base
{
- public static function setUpBeforeClass()
+ public static function setUpBeforeClass(): void
{
$factory_db = new Horde_Test_Factory_Db();
|
