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
|
Description: Adapt to PHPUnit 8.x and 9.x API.
Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
--- a/Horde_HashTable-1.2.6/test/Horde/HashTable/Driver/MemcacheTest.php
+++ b/Horde_HashTable-1.2.6/test/Horde/HashTable/Driver/MemcacheTest.php
@@ -24,7 +24,7 @@
*/
class Horde_HashTable_Driver_MemcacheTest extends Horde_HashTable_Driver_TestBase
{
- public static function setUpBeforeClass()
+ public static function setUpBeforeClass(): void
{
if ((extension_loaded('memcache') || extension_loaded('memcached')) &&
($config = self::getConfig('HASHTABLE_MEMCACHE_TEST_CONFIG', __DIR__ . '/..')) &&
--- a/Horde_HashTable-1.2.6/test/Horde/HashTable/Driver/MemoryTest.php
+++ b/Horde_HashTable-1.2.6/test/Horde/HashTable/Driver/MemoryTest.php
@@ -24,7 +24,7 @@
*/
class Horde_HashTable_Driver_MemoryTest extends Horde_HashTable_Driver_TestBase
{
- public static function setUpBeforeClass()
+ public static function setUpBeforeClass(): void
{
self::$_driver = new Horde_HashTable_Memory();
}
--- a/Horde_HashTable-1.2.6/test/Horde/HashTable/Driver/PredisTest.php
+++ b/Horde_HashTable-1.2.6/test/Horde/HashTable/Driver/PredisTest.php
@@ -24,15 +24,18 @@
*/
class Horde_HashTable_Driver_PredisTest extends Horde_HashTable_Driver_TestBase
{
- public static function setUpBeforeClass()
+ public static function setUpBeforeClass(): void
{
- if (class_exists('Predis\Client') &&
- ($config = self::getConfig('HASHTABLE_PREDIS_TEST_CONFIG', __DIR__ . '/..')) &&
- isset($config['hashtable']['predis'])) {
- $predis = new Predis\Client($config['hashtable']['predis']);
- self::$_driver = new Horde_HashTable_Predis(array('predis' => $predis));
+ if (class_exists('Predis\\Client')) {
+ if (($config = self::getConfig('HASHTABLE_PREDIS_TEST_CONFIG', __DIR__ . '/..')) &&
+ isset($config['hashtable']['predis'])) {
+ $predis = new Predis\Client($config['hashtable']['predis']);
+ self::$_driver = new Horde_HashTable_Predis(array('predis' => $predis));
+ } else {
+ self::$_skip = 'Predis configuration not available.';
+ }
} else {
- self::$_skip = 'Predis or configuration not available.';
+ self::$_skip = 'Predis\\Client class not available.';
}
}
}
--- a/Horde_HashTable-1.2.6/test/Horde/HashTable/Driver/TestBase.php
+++ b/Horde_HashTable-1.2.6/test/Horde/HashTable/Driver/TestBase.php
@@ -29,14 +29,14 @@
protected static $_skip = false;
- public function setUp()
+ public function setUp(): void
{
if (self::$_skip) {
$this->markTestSkipped(self::$_skip);
}
}
- public static function tearDownAfterClass()
+ public static function tearDownAfterClass(): void
{
if (self::$_driver) {
self::$_driver->clear();
|
