Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/server.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoeland Jago Douma <roeland@famdouma.nl>2019-11-21 18:40:38 +0300
committerRoeland Jago Douma <roeland@famdouma.nl>2019-11-27 15:34:41 +0300
commitc007ca624f4a95e1a491221d425fcb2fa6e5589a (patch)
treeb60aa133b438eb116ac3579283aa8a7967efd12b /apps/federation
parente0f32814e33f9ebb8c42744611048cbfac1eb588 (diff)
Make phpunit8 compatible
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Diffstat (limited to 'apps/federation')
-rw-r--r--apps/federation/tests/BackgroundJob/GetSharedSecretTest.php2
-rw-r--r--apps/federation/tests/BackgroundJob/RequestSharedSecretTest.php2
-rw-r--r--apps/federation/tests/Controller/OCSAuthAPIControllerTest.php2
-rw-r--r--apps/federation/tests/Controller/SettingsControllerTest.php2
-rw-r--r--apps/federation/tests/DbHandlerTest.php4
-rw-r--r--apps/federation/tests/HooksTest.php2
-rw-r--r--apps/federation/tests/Middleware/AddServerMiddlewareTest.php2
-rw-r--r--apps/federation/tests/Settings/AdminTest.php2
-rw-r--r--apps/federation/tests/SyncFederationAddressbooksTest.php2
-rw-r--r--apps/federation/tests/TrustedServersTest.php2
10 files changed, 11 insertions, 11 deletions
diff --git a/apps/federation/tests/BackgroundJob/GetSharedSecretTest.php b/apps/federation/tests/BackgroundJob/GetSharedSecretTest.php
index adc621650af..b4e8365b502 100644
--- a/apps/federation/tests/BackgroundJob/GetSharedSecretTest.php
+++ b/apps/federation/tests/BackgroundJob/GetSharedSecretTest.php
@@ -81,7 +81,7 @@ class GetSharedSecretTest extends TestCase {
/** @var GetSharedSecret */
private $getSharedSecret;
- public function setUp() {
+ public function setUp(): void {
parent::setUp();
$this->httpClientService = $this->createMock(IClientService::class);
diff --git a/apps/federation/tests/BackgroundJob/RequestSharedSecretTest.php b/apps/federation/tests/BackgroundJob/RequestSharedSecretTest.php
index e8f63fb30d3..d97919942af 100644
--- a/apps/federation/tests/BackgroundJob/RequestSharedSecretTest.php
+++ b/apps/federation/tests/BackgroundJob/RequestSharedSecretTest.php
@@ -73,7 +73,7 @@ class RequestSharedSecretTest extends TestCase {
/** @var RequestSharedSecret */
private $requestSharedSecret;
- public function setUp() {
+ public function setUp(): void {
parent::setUp();
$this->httpClientService = $this->createMock(IClientService::class);
diff --git a/apps/federation/tests/Controller/OCSAuthAPIControllerTest.php b/apps/federation/tests/Controller/OCSAuthAPIControllerTest.php
index df9f284d2c9..c625d960e5a 100644
--- a/apps/federation/tests/Controller/OCSAuthAPIControllerTest.php
+++ b/apps/federation/tests/Controller/OCSAuthAPIControllerTest.php
@@ -67,7 +67,7 @@ class OCSAuthAPIControllerTest extends TestCase {
/** @var int simulated timestamp */
private $currentTime = 1234567;
- public function setUp() {
+ public function setUp(): void {
parent::setUp();
$this->request = $this->createMock(IRequest::class);
diff --git a/apps/federation/tests/Controller/SettingsControllerTest.php b/apps/federation/tests/Controller/SettingsControllerTest.php
index 41312b8ef2c..9b283b50903 100644
--- a/apps/federation/tests/Controller/SettingsControllerTest.php
+++ b/apps/federation/tests/Controller/SettingsControllerTest.php
@@ -45,7 +45,7 @@ class SettingsControllerTest extends TestCase {
/** @var \PHPUnit_Framework_MockObject_MockObject | \OCA\Federation\TrustedServers */
private $trustedServers;
- public function setUp() {
+ public function setUp(): void {
parent::setUp();
$this->request = $this->getMockBuilder(IRequest::class)->getMock();
diff --git a/apps/federation/tests/DbHandlerTest.php b/apps/federation/tests/DbHandlerTest.php
index bad02685534..348f5b70308 100644
--- a/apps/federation/tests/DbHandlerTest.php
+++ b/apps/federation/tests/DbHandlerTest.php
@@ -49,7 +49,7 @@ class DbHandlerTest extends TestCase {
/** @var string */
private $dbTable = 'trusted_servers';
- public function setUp() {
+ public function setUp(): void {
parent::setUp();
$this->connection = \OC::$server->getDatabaseConnection();
@@ -65,7 +65,7 @@ class DbHandlerTest extends TestCase {
$this->assertEmpty($result, 'we need to start with a empty trusted_servers table');
}
- public function tearDown() {
+ public function tearDown(): void {
parent::tearDown();
$query = $this->connection->getQueryBuilder()->delete($this->dbTable);
$query->execute();
diff --git a/apps/federation/tests/HooksTest.php b/apps/federation/tests/HooksTest.php
index 34ac8dfd539..ad6e0bf8a77 100644
--- a/apps/federation/tests/HooksTest.php
+++ b/apps/federation/tests/HooksTest.php
@@ -36,7 +36,7 @@ class HooksTest extends TestCase {
/** @var Hooks */
private $hooks;
- public function setUp() {
+ public function setUp(): void {
parent::setUp();
$this->trustedServers = $this->getMockBuilder('OCA\Federation\TrustedServers')
diff --git a/apps/federation/tests/Middleware/AddServerMiddlewareTest.php b/apps/federation/tests/Middleware/AddServerMiddlewareTest.php
index eb063019424..4423233b93e 100644
--- a/apps/federation/tests/Middleware/AddServerMiddlewareTest.php
+++ b/apps/federation/tests/Middleware/AddServerMiddlewareTest.php
@@ -48,7 +48,7 @@ class AddServerMiddlewareTest extends TestCase {
/** @var \PHPUnit_Framework_MockObject_MockObject | SettingsController */
private $controller;
- public function setUp() {
+ public function setUp(): void {
parent::setUp();
$this->logger = $this->getMockBuilder(ILogger::class)->getMock();
diff --git a/apps/federation/tests/Settings/AdminTest.php b/apps/federation/tests/Settings/AdminTest.php
index 758bda6bc5e..0fc1f7c25ab 100644
--- a/apps/federation/tests/Settings/AdminTest.php
+++ b/apps/federation/tests/Settings/AdminTest.php
@@ -34,7 +34,7 @@ class AdminTest extends TestCase {
/** @var TrustedServers */
private $trustedServers;
- public function setUp() {
+ public function setUp(): void {
parent::setUp();
$this->trustedServers = $this->getMockBuilder('\OCA\Federation\TrustedServers')->disableOriginalConstructor()->getMock();
$this->admin = new Admin(
diff --git a/apps/federation/tests/SyncFederationAddressbooksTest.php b/apps/federation/tests/SyncFederationAddressbooksTest.php
index 2148b4b3c00..e1c810bde97 100644
--- a/apps/federation/tests/SyncFederationAddressbooksTest.php
+++ b/apps/federation/tests/SyncFederationAddressbooksTest.php
@@ -38,7 +38,7 @@ class SyncFederationAddressbooksTest extends \Test\TestCase {
/** @var \PHPUnit_Framework_MockObject_MockObject | DiscoveryService */
private $discoveryService;
- public function setUp() {
+ public function setUp(): void {
parent::setUp();
$this->discoveryService = $this->getMockBuilder(DiscoveryService::class)
diff --git a/apps/federation/tests/TrustedServersTest.php b/apps/federation/tests/TrustedServersTest.php
index 209f41322c4..82e5654e63f 100644
--- a/apps/federation/tests/TrustedServersTest.php
+++ b/apps/federation/tests/TrustedServersTest.php
@@ -76,7 +76,7 @@ class TrustedServersTest extends TestCase {
/** @var \PHPUnit_Framework_MockObject_MockObject|ITimeFactory */
private $timeFactory;
- public function setUp() {
+ public function setUp(): void {
parent::setUp();
$this->dbHandler = $this->getMockBuilder(DbHandler::class)