aboutsummaryrefslogtreecommitdiffstats
path: root/tests/version
diff options
context:
space:
mode:
authorMaat <maat-pub@mageia.biz>2020-05-09 01:15:08 +0200
committerMaat <maat-pub@mageia.biz>2020-05-09 01:15:08 +0200
commit6985226b17e8a0ef0a720bf1d12fe0c216e13dab (patch)
tree116d2565ac02c40abe0548863c6badf8ec3e1d1e /tests/version
parent8ea437e30605e0f66b5220bf904a61d7c1d11ddd (diff)
parent8d00784dfe2c8bcb10843ff70b4cfa998d703285 (diff)
downloadforums-master.tar
forums-master.tar.gz
forums-master.tar.bz2
forums-master.tar.xz
forums-master.zip
Merge remote-tracking branch 'upstream/prep-release-3.3.0'HEADmaster
Diffstat (limited to 'tests/version')
-rw-r--r--tests/version/version_fetch_test.php4
-rw-r--r--tests/version/version_helper_remote_test.php8
-rw-r--r--tests/version/version_test.php2
3 files changed, 9 insertions, 5 deletions
diff --git a/tests/version/version_fetch_test.php b/tests/version/version_fetch_test.php
index c44bd5514a..4e8e82567a 100644
--- a/tests/version/version_fetch_test.php
+++ b/tests/version/version_fetch_test.php
@@ -16,7 +16,7 @@
*/
class phpbb_version_helper_fetch_test extends phpbb_test_case
{
- public function setUp()
+ public function setUp(): void
{
parent::setUp();
@@ -42,7 +42,7 @@ class phpbb_version_helper_fetch_test extends phpbb_test_case
global $phpbb_root_path, $phpEx;
include_once($phpbb_root_path . 'includes/functions.' . $phpEx);
- if (!phpbb_checkdnsrr('version.phpbb.com', 'A'))
+ if (!checkdnsrr('version.phpbb.com', 'A'))
{
$this->markTestSkipped(sprintf(
'Could not find a DNS record for hostname %s. ' .
diff --git a/tests/version/version_helper_remote_test.php b/tests/version/version_helper_remote_test.php
index 35c3d92a3a..e15ff897b0 100644
--- a/tests/version/version_helper_remote_test.php
+++ b/tests/version/version_helper_remote_test.php
@@ -17,7 +17,7 @@ class version_helper_remote_test extends \phpbb_test_case
protected $cache;
protected $version_helper;
- public function setUp()
+ public function setUp(): void
{
parent::setUp();
@@ -30,7 +30,11 @@ class version_helper_remote_test extends \phpbb_test_case
));
$container = new \phpbb_mock_container_builder();
$db = new \phpbb\db\driver\factory($container);
- $this->cache = $this->getMock('\phpbb\cache\service', array('get'), array(new \phpbb\cache\driver\dummy(), $config, $db, '../../', 'php'));
+ $this->cache = $this->getMockBuilder('\phpbb\cache\service')
+ ->setMethods(array('get'))
+ ->setConstructorArgs(array(new \phpbb\cache\driver\dummy(), $config, $db, '../../', 'php'))
+ ->getMock();
+
$this->cache->expects($this->any())
->method('get')
->with($this->anything())
diff --git a/tests/version/version_test.php b/tests/version/version_test.php
index 2a0240f847..3298213487 100644
--- a/tests/version/version_test.php
+++ b/tests/version/version_test.php
@@ -13,7 +13,7 @@
class phpbb_version_helper_test extends phpbb_test_case
{
- public function setUp()
+ public function setUp(): void
{
parent::setUp();