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
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
|
Description: Adapt to PHPUnit 8.x and 9.x API.
Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Index: php-horde-share/Horde_Share-2.2.0/test/Horde/Share/Kolab/MockTest.php
===================================================================
--- php-horde-share.orig/Horde_Share-2.2.0/test/Horde/Share/Kolab/MockTest.php
+++ php-horde-share/Horde_Share-2.2.0/test/Horde/Share/Kolab/MockTest.php
@@ -35,7 +35,7 @@ class Horde_Share_Kolab_MockTest extends
protected static $cache;
- public static function setUpBeforeClass()
+ public static function setUpBeforeClass(): void
{
if (!class_exists('Horde_Kolab_Storage_Driver_Mock_Data')) {
return;
@@ -91,7 +91,7 @@ class Horde_Share_Kolab_MockTest extends
}
}
- public function setUp()
+ public function setUp(): void
{
if (!interface_exists('Horde_Kolab_Storage')) {
$this->markTestSkipped('The Kolab_Storage package seems to be unavailable.');
@@ -221,6 +221,7 @@ class Horde_Share_Kolab_MockTest extends
*/
public function testRemoveShare()
{
+ $this->expectNotToPerformAssertions();
$this->removeShare();
}
Index: php-horde-share/Horde_Share-2.2.0/test/Horde/Share/Kolab/UnitTest.php
===================================================================
--- php-horde-share.orig/Horde_Share-2.2.0/test/Horde/Share/Kolab/UnitTest.php
+++ php-horde-share/Horde_Share-2.2.0/test/Horde/Share/Kolab/UnitTest.php
@@ -28,9 +28,9 @@
* @link http://pear.horde.org/index.php?package=Share
*/
class Horde_Share_Kolab_UnitTest
-extends PHPUnit_Framework_TestCase
+extends Horde_Test_Case
{
- public function setUp()
+ public function setUp(): void
{
if (!interface_exists('Horde_Kolab_Storage')) {
$this->markTestSkipped('The Kolab_Storage package seems to be unavailable.');
@@ -39,8 +39,10 @@ extends PHPUnit_Framework_TestCase
public function testGetStorage()
{
- $storage = $this->getMock('Horde_Kolab_Storage');
- $list = $this->getMock('Horde_Kolab_Storage_List');
+ $storage = $this->getMockBuilder('Horde_Kolab_Storage')
+ ->getMock();
+ $list = $this->getMockBuilder('Horde_Kolab_Storage_List')
+ ->getMock();
$storage->expects($this->once())
->method('getList')
->will($this->returnValue($list));
@@ -49,19 +51,16 @@ extends PHPUnit_Framework_TestCase
$this->assertSame($list, $driver->getList());
}
- /**
- * @expectedException Horde_Share_Exception
- */
public function testStorageMissing()
{
+ $this->expectException('Horde_Share_Exception');
$driver = $this->_getDriver();
$driver->getStorage();
}
public function testListArray()
{
- $this->assertInternalType(
- 'array',
+ $this->assertIsArray(
$this->_getCompleteDriver()->listShares('john')
);
}
@@ -71,7 +70,7 @@ extends PHPUnit_Framework_TestCase
$driver = new Horde_Share_Kolab(
'mnemo', 'john', new Horde_Perms_Null(), new Horde_Share_Stub_Group()
);
- $this->assertInternalType('string', $driver->getType());
+ $this->assertIsString($driver->getType());
}
public function testMnemoSupport()
@@ -106,11 +105,9 @@ extends PHPUnit_Framework_TestCase
$this->assertEquals('task', $driver->getType());
}
- /**
- * @expectedException Horde_Share_Exception
- */
public function testSupportException()
{
+ $this->expectException('Horde_Share_Exception');
$driver = new Horde_Share_Kolab(
'NOTSUPPORTED', 'john', new Horde_Perms_Null(), new Horde_Share_Stub_Group()
);
@@ -126,20 +123,16 @@ extends PHPUnit_Framework_TestCase
);
}
- /**
- * @expectedException Horde_Share_Exception
- */
public function testUndefinedId()
{
+ $this->expectException('Horde_Share_Exception');
$object = new Horde_Share_Object_Kolab(null, new Horde_Group_Mock());
$object->getId();
}
- /**
- * @expectedException Horde_Share_Exception
- */
public function testUndefinedName()
{
+ $this->expectException('Horde_Share_Exception');
$object = new Horde_Share_Object_Kolab(null, new Horde_Group_Mock());
$object->getName();
}
@@ -147,8 +140,7 @@ extends PHPUnit_Framework_TestCase
public function testUndefinedPermissionId()
{
$object = new Horde_Share_Object_Kolab(null, new Horde_Group_Mock());
- $this->assertInternalType(
- 'string',
+ $this->assertIsString(
$object->getPermissionId()
);
}
@@ -231,11 +223,9 @@ extends PHPUnit_Framework_TestCase
);
}
- /**
- * @expectedException Horde_Exception_NotFound
- */
public function testMissingShare()
{
+ $this->expectException('Horde_Exception_NotFound');
$this->_getPrefilledDriver()->getShareById('DOES_NOT_EXIST');
}
@@ -482,11 +472,9 @@ extends PHPUnit_Framework_TestCase
$this->assertEquals('INBOX/test', $share->constructFolderName('john', 'test'));
}
- /**
- * @expectedException Horde_Share_Exception
- */
public function testConstructFolderNameInComplexNamespace()
{
+ $this->expectException('Horde_Share_Exception');
$share = $this->_getComplexNamespaceDriver();
$this->assertEquals('INBOX/test', $share->constructFolderName('john', 'test'));
}
@@ -533,9 +521,14 @@ extends PHPUnit_Framework_TestCase
public function testListShareCache()
{
- $storage = $this->getMock('Horde_Kolab_Storage');
- $list = $this->getMock('Horde_Kolab_Storage_List_Tools', array(), array(), '', false, false);
- $query = $this->getMock('Horde_Kolab_Storage_List_Query_List');
+ $storage = $this->getMockBuilder('Horde_Kolab_Storage')
+ ->getMock();
+ $list = $this->getMockBuilder('Horde_Kolab_Storage_List_Tools')
+ ->disableOriginalConstructor()
+ ->disableOriginalClone()
+ ->getMock();
+ $query = $this->getMockBuilder('Horde_Kolab_Storage_List_Query_List')
+ ->getMock();
$query->expects($this->once())
->method('listByType')
->will($this->returnValue(array()));
Index: php-horde-share/Horde_Share-2.2.0/test/Horde/Share/Sql/Base.php
===================================================================
--- php-horde-share.orig/Horde_Share-2.2.0/test/Horde/Share/Sql/Base.php
+++ php-horde-share/Horde_Share-2.2.0/test/Horde/Share/Sql/Base.php
@@ -102,7 +102,7 @@ class Horde_Share_Test_Sql_Base extends
public function testListOwners()
{
$owners = self::$share->listOwners();
- $this->assertInternalType('array', $owners);
+ $this->assertIsArray($owners);
$this->assertTrue(in_array('john', $owners));
}
@@ -168,6 +168,7 @@ class Horde_Share_Test_Sql_Base extends
*/
public function testRemoveShare()
{
+ $this->expectNotToPerformAssertions();
$this->removeShare();
}
@@ -184,7 +185,7 @@ class Horde_Share_Test_Sql_Base extends
$this->callbackSetShareOb(new Horde_Share_Object_Sql(array()));
}
- public static function setUpBeforeClass()
+ public static function setUpBeforeClass(): void
{
require_once __DIR__ . '/../migration/sql.php';
migrate_sql(self::$db);
@@ -198,7 +199,7 @@ class Horde_Share_Test_Sql_Base extends
$GLOBALS['injector']->setInstance('Horde_Group', $group);
}
- public static function tearDownAfterClass()
+ public static function tearDownAfterClass(): void
{
if (self::$db) {
$migration = new Horde_Db_Migration_Base(self::$db);
@@ -210,7 +211,7 @@ class Horde_Share_Test_Sql_Base extends
}
}
- public function setUp()
+ public function setUp(): void
{
if (!self::$db) {
$this->markTestSkipped(self::$reason);
Index: php-horde-share/Horde_Share-2.2.0/test/Horde/Share/Sql/MysqlTest.php
===================================================================
--- php-horde-share.orig/Horde_Share-2.2.0/test/Horde/Share/Sql/MysqlTest.php
+++ php-horde-share/Horde_Share-2.2.0/test/Horde/Share/Sql/MysqlTest.php
@@ -15,7 +15,7 @@ require_once __DIR__ . '/Base.php';
*/
class Horde_Share_Sql_MysqlTest extends Horde_Share_Test_Sql_Base
{
- public static function setUpBeforeClass()
+ public static function setUpBeforeClass(): void
{
if (!extension_loaded('mysql')) {
self::$reason = 'No mysql extension';
Index: php-horde-share/Horde_Share-2.2.0/test/Horde/Share/Sql/MysqliTest.php
===================================================================
--- php-horde-share.orig/Horde_Share-2.2.0/test/Horde/Share/Sql/MysqliTest.php
+++ php-horde-share/Horde_Share-2.2.0/test/Horde/Share/Sql/MysqliTest.php
@@ -15,7 +15,7 @@ require_once __DIR__ . '/Base.php';
*/
class Horde_Share_Sql_MysqliTest extends Horde_Share_Test_Sql_Base
{
- public static function setUpBeforeClass()
+ public static function setUpBeforeClass(): void
{
if (!extension_loaded('mysqli')) {
self::$reason = 'No mysqli extension';
Index: php-horde-share/Horde_Share-2.2.0/test/Horde/Share/Sql/Oci8Test.php
===================================================================
--- php-horde-share.orig/Horde_Share-2.2.0/test/Horde/Share/Sql/Oci8Test.php
+++ php-horde-share/Horde_Share-2.2.0/test/Horde/Share/Sql/Oci8Test.php
@@ -15,7 +15,7 @@ require_once __DIR__ . '/Base.php';
*/
class Horde_Share_Sql_Oci8Test extends Horde_Share_Test_Sql_Base
{
- public static function setUpBeforeClass()
+ public static function setUpBeforeClass(): void
{
if (!extension_loaded('oci8')) {
self::$reason = 'No oci8 extension';
Index: php-horde-share/Horde_Share-2.2.0/test/Horde/Share/Sql/Pdo/MysqlTest.php
===================================================================
--- php-horde-share.orig/Horde_Share-2.2.0/test/Horde/Share/Sql/Pdo/MysqlTest.php
+++ php-horde-share/Horde_Share-2.2.0/test/Horde/Share/Sql/Pdo/MysqlTest.php
@@ -15,7 +15,7 @@ require_once __DIR__ . '/../Base.php';
*/
class Horde_Share_Sql_Pdo_MysqlTest extends Horde_Share_Test_Sql_Base
{
- public static function setUpBeforeClass()
+ public static function setUpBeforeClass(): void
{
if (!extension_loaded('pdo') ||
!in_array('mysql', PDO::getAvailableDrivers())) {
Index: php-horde-share/Horde_Share-2.2.0/test/Horde/Share/Sql/Pdo/PgsqlTest.php
===================================================================
--- php-horde-share.orig/Horde_Share-2.2.0/test/Horde/Share/Sql/Pdo/PgsqlTest.php
+++ php-horde-share/Horde_Share-2.2.0/test/Horde/Share/Sql/Pdo/PgsqlTest.php
@@ -15,7 +15,7 @@ require_once __DIR__ . '/../Base.php';
*/
class Horde_Share_Sql_Pdo_PgsqlTest extends Horde_Share_Test_Sql_Base
{
- public static function setUpBeforeClass()
+ public static function setUpBeforeClass(): void
{
if (!extension_loaded('pdo') ||
!in_array('pgsql', PDO::getAvailableDrivers())) {
Index: php-horde-share/Horde_Share-2.2.0/test/Horde/Share/Sql/Pdo/SqliteTest.php
===================================================================
--- php-horde-share.orig/Horde_Share-2.2.0/test/Horde/Share/Sql/Pdo/SqliteTest.php
+++ php-horde-share/Horde_Share-2.2.0/test/Horde/Share/Sql/Pdo/SqliteTest.php
@@ -15,7 +15,7 @@ require_once __DIR__ . '/../Base.php';
*/
class Horde_Share_Sql_Pdo_SqliteTest extends Horde_Share_Test_Sql_Base
{
- public static function setUpBeforeClass()
+ public static function setUpBeforeClass(): void
{
$factory_db = new Horde_Test_Factory_Db();
Index: php-horde-share/Horde_Share-2.2.0/test/Horde/Share/Sqlng/Base.php
===================================================================
--- php-horde-share.orig/Horde_Share-2.2.0/test/Horde/Share/Sqlng/Base.php
+++ php-horde-share/Horde_Share-2.2.0/test/Horde/Share/Sqlng/Base.php
@@ -103,7 +103,7 @@ class Horde_Share_Test_Sqlng_Base extend
public function testListOwners()
{
$owners = self::$share->listOwners();
- $this->assertInternalType('array', $owners);
+ $this->assertIsArray($owners);
$this->assertTrue(in_array('john', $owners));
}
@@ -169,6 +169,7 @@ class Horde_Share_Test_Sqlng_Base extend
*/
public function testRemoveShare()
{
+ $this->expectNotToPerformAssertions();
parent::removeShare();
}
@@ -185,7 +186,7 @@ class Horde_Share_Test_Sqlng_Base extend
$this->callbackSetShareOb(new Horde_Share_Object_Sqlng(array()));
}
- public static function setUpBeforeClass()
+ public static function setUpBeforeClass(): void
{
require_once __DIR__ . '/../migration/sqlng.php';
migrate_sqlng(self::$db);
@@ -199,11 +200,11 @@ class Horde_Share_Test_Sqlng_Base extend
$GLOBALS['injector']->setInstance('Horde_Group', $group);
}
- public static function tearDownAfterClass()
+ public static function tearDownAfterClass(): void
{
if (self::$db) {
$migration = new Horde_Db_Migration_Base(self::$db);
- $migration->dropTable('test_shares');
+ #$migration->dropTable('test_shares');
$migration->dropTable('test_shares_groups');
$migration->dropTable('test_shares_users');
self::$db->disconnect();
@@ -211,7 +212,7 @@ class Horde_Share_Test_Sqlng_Base extend
}
}
- public function setUp()
+ public function setUp(): void
{
if (!self::$db) {
$this->markTestSkipped(self::$reason);
Index: php-horde-share/Horde_Share-2.2.0/test/Horde/Share/Sqlng/MysqlTest.php
===================================================================
--- php-horde-share.orig/Horde_Share-2.2.0/test/Horde/Share/Sqlng/MysqlTest.php
+++ php-horde-share/Horde_Share-2.2.0/test/Horde/Share/Sqlng/MysqlTest.php
@@ -15,7 +15,7 @@ require_once __DIR__ . '/Base.php';
*/
class Horde_Share_Sqlng_MysqlTest extends Horde_Share_Test_Sqlng_Base
{
- public static function setUpBeforeClass()
+ public static function setUpBeforeClass(): void
{
if (!extension_loaded('mysql')) {
self::$reason = 'No mysql extension';
Index: php-horde-share/Horde_Share-2.2.0/test/Horde/Share/Sqlng/MysqliTest.php
===================================================================
--- php-horde-share.orig/Horde_Share-2.2.0/test/Horde/Share/Sqlng/MysqliTest.php
+++ php-horde-share/Horde_Share-2.2.0/test/Horde/Share/Sqlng/MysqliTest.php
@@ -15,7 +15,7 @@ require_once __DIR__ . '/Base.php';
*/
class Horde_Share_Sqlng_MysqliTest extends Horde_Share_Test_Sqlng_Base
{
- public static function setUpBeforeClass()
+ public static function setUpBeforeClass(): void
{
if (!extension_loaded('mysqli')) {
self::$reason = 'No mysqli extension';
Index: php-horde-share/Horde_Share-2.2.0/test/Horde/Share/Sqlng/Oci8Test.php
===================================================================
--- php-horde-share.orig/Horde_Share-2.2.0/test/Horde/Share/Sqlng/Oci8Test.php
+++ php-horde-share/Horde_Share-2.2.0/test/Horde/Share/Sqlng/Oci8Test.php
@@ -15,7 +15,7 @@ require_once __DIR__ . '/Base.php';
*/
class Horde_Share_Sqlng_Oci8Test extends Horde_Share_Test_Sqlng_Base
{
- public static function setUpBeforeClass()
+ public static function setUpBeforeClass(): void
{
if (!extension_loaded('oci8')) {
self::$reason = 'No oci8 extension';
Index: php-horde-share/Horde_Share-2.2.0/test/Horde/Share/Sqlng/Pdo/MysqlTest.php
===================================================================
--- php-horde-share.orig/Horde_Share-2.2.0/test/Horde/Share/Sqlng/Pdo/MysqlTest.php
+++ php-horde-share/Horde_Share-2.2.0/test/Horde/Share/Sqlng/Pdo/MysqlTest.php
@@ -15,7 +15,7 @@ require_once __DIR__ . '/../Base.php';
*/
class Horde_Share_Sqlng_Pdo_MysqlTest extends Horde_Share_Test_Sqlng_Base
{
- public static function setUpBeforeClass()
+ public static function setUpBeforeClass(): void
{
if (!extension_loaded('pdo') ||
!in_array('mysql', PDO::getAvailableDrivers())) {
Index: php-horde-share/Horde_Share-2.2.0/test/Horde/Share/Sqlng/Pdo/PgsqlTest.php
===================================================================
--- php-horde-share.orig/Horde_Share-2.2.0/test/Horde/Share/Sqlng/Pdo/PgsqlTest.php
+++ php-horde-share/Horde_Share-2.2.0/test/Horde/Share/Sqlng/Pdo/PgsqlTest.php
@@ -15,7 +15,7 @@ require_once __DIR__ . '/../Base.php';
*/
class Horde_Share_Sqlng_Pdo_PgsqlTest extends Horde_Share_Test_Sqlng_Base
{
- public static function setUpBeforeClass()
+ public static function setUpBeforeClass(): void
{
if (!extension_loaded('pdo') ||
!in_array('pgsql', PDO::getAvailableDrivers())) {
Index: php-horde-share/Horde_Share-2.2.0/test/Horde/Share/Sqlng/Pdo/SqliteTest.php
===================================================================
--- php-horde-share.orig/Horde_Share-2.2.0/test/Horde/Share/Sqlng/Pdo/SqliteTest.php
+++ php-horde-share/Horde_Share-2.2.0/test/Horde/Share/Sqlng/Pdo/SqliteTest.php
@@ -15,7 +15,7 @@ require_once __DIR__ . '/../Base.php';
*/
class Horde_Share_Sqlng_Pdo_SqliteTest extends Horde_Share_Test_Sqlng_Base
{
- public static function setUpBeforeClass()
+ public static function setUpBeforeClass(): void
{
$factory_db = new Horde_Test_Factory_Db();
Index: php-horde-share/Horde_Share-2.2.0/test/Horde/Share/TestBase.php
===================================================================
--- php-horde-share.orig/Horde_Share-2.2.0/test/Horde/Share/TestBase.php
+++ php-horde-share/Horde_Share-2.2.0/test/Horde/Share/TestBase.php
@@ -277,7 +277,7 @@ class Horde_Share_TestBase extends Horde
{
$this->switchAuth(null);
$shares = self::$share->listAllShares();
- $this->assertInternalType('array', $shares);
+ $this->assertIsArray($shares);
$this->assertEquals(6, count($shares));
$this->assertArrayHasKey('myshare', $shares);
$this->assertArrayHasKey('systemshare', $shares);
@@ -310,7 +310,7 @@ class Horde_Share_TestBase extends Horde
{
// Default listing.
$shares = self::$share->listShares('john');
- $this->assertInternalType('array', $shares);
+ $this->assertIsArray($shares);
$this->assertEquals(5, count($shares));
// Test arguments for default listing.
@@ -371,7 +371,7 @@ class Horde_Share_TestBase extends Horde
$shares
);
$shares = self::$share->listShares('john', array('perm' => Horde_Perms::ALL));
- $this->assertInternalType('array', $shares);
+ $this->assertIsArray($shares);
$this->assertEquals(5, count($shares));
// Paging.
@@ -433,7 +433,7 @@ class Horde_Share_TestBase extends Horde
{
$this->switchAuth(null);
$shares = self::$share->listSystemShares();
- $this->assertInternalType('array', $shares);
+ $this->assertIsArray($shares);
$this->assertEquals(1, count($shares));
$this->assertArrayHasKey('systemshare', $shares);
$this->switchAuth('john');
Index: php-horde-share/Horde_Share-2.2.0/test/Horde/Share/migration/sql.php
===================================================================
--- php-horde-share.orig/Horde_Share-2.2.0/test/Horde/Share/migration/sql.php
+++ php-horde-share/Horde_Share-2.2.0/test/Horde/Share/migration/sql.php
@@ -9,7 +9,7 @@ function migrate_sql($db)
$migration->dropTable('test_shares');
$migration->dropTable('test_shares_groups');
$migration->dropTable('test_shares_users');
- } catch (Horde_Db_Exception $e) {
+ } catch (Exception $e) {
}
$t = $migration->createTable('test_shares', array('autoincrementKey' => 'share_id'));
Index: php-horde-share/Horde_Share-2.2.0/test/Horde/Share/migration/sqlng.php
===================================================================
--- php-horde-share.orig/Horde_Share-2.2.0/test/Horde/Share/migration/sqlng.php
+++ php-horde-share/Horde_Share-2.2.0/test/Horde/Share/migration/sqlng.php
@@ -9,7 +9,7 @@ function migrate_sqlng($db)
$migration->dropTable('test_shares');
$migration->dropTable('test_shares_groups');
$migration->dropTable('test_shares_users');
- } catch (Horde_Db_Exception $e) {
+ } catch (Exception $e) {
}
$t = $migration->createTable('test_shares', array('autoincrementKey' => 'share_id'));
|
