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
|
Description: Adapt to PHPUnit 8.x and 9.x API.
Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
--- a/content-2.0.6/test/Content/Sql/Base.php
+++ b/content-2.0.6/test/Content/Sql/Base.php
@@ -31,13 +31,13 @@
$this->assertEquals(4, count($objects));
// If these aren't strings, then ids were taken as names.
foreach ($objects as $object) {
- $this->assertInternalType('string', $object['object_name']);
+ $this->assertIsString($object['object_name']);
}
$types = self::$db->selectAll('SELECT * FROM rampage_types');
$this->assertEquals(2, count($types));
foreach ($types as $type) {
- $this->assertInternalType('string', $type['type_name']);
+ $this->assertIsString($type['type_name']);
}
}
@@ -175,7 +175,7 @@
$this->_testUntag();
}
- public static function setUpBeforeClass()
+ public static function setUpBeforeClass(): void
{
self::$injector = new Horde_Injector(new Horde_Injector_TopLevel());
self::$injector->setInstance('Horde_Db_Adapter', self::$db);
@@ -192,7 +192,7 @@
self::$type_mgr = self::$injector->createInstance('Content_Types_Manager');
}
- public static function tearDownAfterClass()
+ public static function tearDownAfterClass(): void
{
if (self::$migrator) {
self::$migrator->down();
@@ -201,7 +201,7 @@
parent::tearDownAfterClass();
}
- public function setUp()
+ public function setUp(): void
{
if (!self::$db) {
$this->markTestSkipped(self::$reason);
--- a/content-2.0.6/test/Content/Sql/MysqlTest.php
+++ b/content-2.0.6/test/Content/Sql/MysqlTest.php
@@ -15,7 +15,7 @@
*/
class Content_Sql_MysqlTest extends Content_Test_Sql_Base
{
- public static function setUpBeforeClass()
+ public static function setUpBeforeClass(): void
{
if (!extension_loaded('mysql')) {
self::$reason = 'No mysql extension';
--- a/content-2.0.6/test/Content/Sql/MysqliTest.php
+++ b/content-2.0.6/test/Content/Sql/MysqliTest.php
@@ -15,7 +15,7 @@
*/
class Content_Sql_MysqliTest extends Content_Test_Sql_Base
{
- public static function setUpBeforeClass()
+ public static function setUpBeforeClass(): void
{
if (!extension_loaded('mysqli')) {
self::$reason = 'No mysqli extension';
--- a/content-2.0.6/test/Content/Sql/Oci8Test.php
+++ b/content-2.0.6/test/Content/Sql/Oci8Test.php
@@ -15,7 +15,7 @@
*/
class Content_Sql_Oci8Test extends Content_Test_Sql_Base
{
- public static function setUpBeforeClass()
+ public static function setUpBeforeClass(): void
{
if (!extension_loaded('oci8')) {
self::$reason = 'No oci8 extension';
--- a/content-2.0.6/test/Content/Sql/Pdo/MysqlTest.php
+++ b/content-2.0.6/test/Content/Sql/Pdo/MysqlTest.php
@@ -6,7 +6,7 @@
class Content_Sql_Pdo_MysqlTest extends Content_Test_Sql_Base
{
- public static function setUpBeforeClass()
+ public static function setUpBeforeClass(): void
{
if (!extension_loaded('pdo') ||
!in_array('mysql', PDO::getAvailableDrivers())) {
--- a/content-2.0.6/test/Content/Sql/Pdo/PgsqlTest.php
+++ b/content-2.0.6/test/Content/Sql/Pdo/PgsqlTest.php
@@ -6,7 +6,7 @@
class Content_Sql_Pdo_PgsqlTest extends Content_Test_Sql_Base
{
- public static function setUpBeforeClass()
+ public static function setUpBeforeClass(): void
{
if (!extension_loaded('pdo') ||
!in_array('pgsql', PDO::getAvailableDrivers())) {
--- a/content-2.0.6/test/Content/Sql/Pdo/SqliteTest.php
+++ b/content-2.0.6/test/Content/Sql/Pdo/SqliteTest.php
@@ -15,7 +15,7 @@
*/
class Content_Sql_Pdo_SqliteTest extends Content_Test_Sql_Base
{
- public static function setUpBeforeClass()
+ public static function setUpBeforeClass(): void
{
$factory_db = new Horde_Test_Factory_Db();
--- a/content-2.0.6/test/Content/Base.php
+++ b/content-2.0.6/test/Content/Base.php
@@ -210,7 +210,8 @@
$this->assertEquals(4, $recent[0]['tag_id']);
$this->assertEquals('personal', $recent[0]['tag_name']);
$date = new Horde_Date($recent[0]['created']);
- $this->assertEquals(1230764760, $date->timestamp());
+ // date --date="2009-01-01 00:06:00 UTC" +%s gives: 1230768360
+ $this->assertEquals(1230768360, $date->timestamp());
}
protected function _testGetRecentTagsByUser()
@@ -237,7 +238,8 @@
$this->assertEquals(4, count($recent));
$this->assertEquals(4, $recent[0]['object_id']);
$date = new Horde_Date($recent[0]['created'], 'UTC');
- $this->assertEquals(1230764760, $date->timestamp());
+ // date --date="2009-01-01 00:06:00 UTC" +%s gives: 1230768360
+ $this->assertEquals(1230768360, $date->timestamp());
}
protected function _testUntag()
|
