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
|
Description: Adapt to PHPUnit 8.x and 9.x API.
Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Index: php-horde-token/Horde_Token-2.0.9/test/Horde/Token/BackendTestCase.php
===================================================================
--- php-horde-token.orig/Horde_Token-2.0.9/test/Horde/Token/BackendTestCase.php
+++ php-horde-token/Horde_Token-2.0.9/test/Horde/Token/BackendTestCase.php
@@ -103,29 +103,23 @@ abstract class Horde_Token_BackendTestCa
$this->assertEquals(6, strlen($t->getNonce()));
}
- /**
- * @expectedException Horde_Token_Exception_Invalid
- */
public function testInvalidTokenException()
{
+ $this->expectException('Horde_Token_Exception_Invalid');
$t = $this->_getBackend();
$t->validate('something');
}
- /**
- * @expectedException Horde_Token_Exception_Invalid
- */
public function testInvalidSeedException()
{
+ $this->expectException('Horde_Token_Exception_Invalid');
$t = $this->_getBackend();
$t->validate($t->get('a'), 'b');
}
- /**
- * @expectedException Horde_Token_Exception_Expired
- */
public function testTimeoutException()
{
+ $this->expectException('Horde_Token_Exception_Expired');
$t = $this->_getBackend(array('token_lifetime' => 1));
$token = $t->get('a');
sleep(1);
@@ -137,7 +131,7 @@ abstract class Horde_Token_BackendTestCa
$t = $this->_getBackend(array('token_lifetime' => 1));
$token = $t->get('a');
sleep(1);
- $this->assertInternalType('array', $t->validate($token, 'a', 2));
+ $this->assertIsArray($t->validate($token, 'a', 2));
}
public function testDisableTimeoutException()
@@ -145,7 +139,7 @@ abstract class Horde_Token_BackendTestCa
$t = $this->_getBackend(array('token_lifetime' => 1));
$token = $t->get('a');
sleep(1);
- $this->assertInternalType('array', $t->validate($token, 'a', -1));
+ $this->assertIsArray($t->validate($token, 'a', -1));
}
public function testIsValidUnique()
@@ -155,22 +149,18 @@ abstract class Horde_Token_BackendTestCa
$this->assertNull($t->validateUnique($token, 'a'));
}
- /**
- * @expectedException Horde_Token_Exception_Used
- */
public function testIsValidAndUnusedException()
{
+ $this->expectException('Horde_Token_Exception_Used');
$t = $this->_getBackend();
$token = $t->get('a');
$t->validateUnique($token, 'a');
$t->validateUnique($token, 'a');
}
- /**
- * @expectedException Horde_Token_Exception_Used
- */
public function testIsValidAndValidateException()
{
+ $this->expectException('Horde_Token_Exception_Used');
$t = $this->_getBackend();
$token = $t->get('a');
$t->isValid($token, 'a', null, true);
Index: php-horde-token/Horde_Token-2.0.9/test/Horde/Token/Unit/FileTest.php
===================================================================
--- php-horde-token.orig/Horde_Token-2.0.9/test/Horde/Token/Unit/FileTest.php
+++ php-horde-token/Horde_Token-2.0.9/test/Horde/Token/Unit/FileTest.php
@@ -27,7 +27,7 @@
*/
class Horde_Token_Unit_FileTest extends Horde_Token_BackendTestCase
{
- public function tearDown()
+ public function tearDown(): void
{
if (!empty($this->_temp_dir)) {
$this->_rrmdir($this->_temp_dir);
Index: php-horde-token/Horde_Token-2.0.9/test/Horde/Token/Unit/MongoTest.php
===================================================================
--- php-horde-token.orig/Horde_Token-2.0.9/test/Horde/Token/Unit/MongoTest.php
+++ php-horde-token/Horde_Token-2.0.9/test/Horde/Token/Unit/MongoTest.php
@@ -48,7 +48,7 @@ class Horde_Token_Unit_MongoTest extends
)));
}
- public function tearDown()
+ public function tearDown(): void
{
if (!empty($this->_mongo)) {
$this->_mongo->selectDB(null)->drop();
Index: php-horde-token/Horde_Token-2.0.9/test/Horde/Token/Unit/SqlTest.php
===================================================================
--- php-horde-token.orig/Horde_Token-2.0.9/test/Horde/Token/Unit/SqlTest.php
+++ php-horde-token/Horde_Token-2.0.9/test/Horde/Token/Unit/SqlTest.php
@@ -29,7 +29,7 @@ class Horde_Token_Unit_SqlTest extends H
{
private static $_db;
- public static function setUpBeforeClass()
+ public static function setUpBeforeClass(): void
{
$factory_db = new Horde_Test_Factory_Db();
@@ -44,7 +44,7 @@ class Horde_Token_Unit_SqlTest extends H
}
}
- public function setUp()
+ public function setUp(): void
{
if (!isset(self::$_db)) {
$this->markTestSkipped('Sqlite not available.');
|
