summaryrefslogtreecommitdiffstats
path: root/apps/settings/tests/Controller
diff options
context:
space:
mode:
authorRoeland Jago Douma <roeland@famdouma.nl>2019-11-21 16:40:38 +0100
committerRoeland Jago Douma <roeland@famdouma.nl>2019-11-27 13:34:41 +0100
commitc007ca624f4a95e1a491221d425fcb2fa6e5589a (patch)
treeb60aa133b438eb116ac3579283aa8a7967efd12b /apps/settings/tests/Controller
parente0f32814e33f9ebb8c42744611048cbfac1eb588 (diff)
downloadnextcloud-server-c007ca624f4a95e1a491221d425fcb2fa6e5589a.tar.gz
nextcloud-server-c007ca624f4a95e1a491221d425fcb2fa6e5589a.zip
Make phpunit8 compatible
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Diffstat (limited to 'apps/settings/tests/Controller')
-rw-r--r--apps/settings/tests/Controller/AdminSettingsControllerTest.php4
-rw-r--r--apps/settings/tests/Controller/AppSettingsControllerTest.php2
-rw-r--r--apps/settings/tests/Controller/AuthSettingsControllerTest.php2
-rw-r--r--apps/settings/tests/Controller/CertificateControllerTest.php2
-rw-r--r--apps/settings/tests/Controller/CheckSetupControllerTest.php2
-rw-r--r--apps/settings/tests/Controller/MailSettingsControllerTest.php2
-rw-r--r--apps/settings/tests/Controller/TwoFactorSettingsControllerTest.php2
-rw-r--r--apps/settings/tests/Controller/UsersControllerTest.php2
8 files changed, 9 insertions, 9 deletions
diff --git a/apps/settings/tests/Controller/AdminSettingsControllerTest.php b/apps/settings/tests/Controller/AdminSettingsControllerTest.php
index 2789fe00974..d3591c6d67a 100644
--- a/apps/settings/tests/Controller/AdminSettingsControllerTest.php
+++ b/apps/settings/tests/Controller/AdminSettingsControllerTest.php
@@ -62,7 +62,7 @@ class AdminSettingsControllerTest extends TestCase {
/** @var string */
private $adminUid = 'lololo';
- public function setUp() {
+ public function setUp(): void {
parent::setUp();
$this->request = $this->createMock(IRequest::class);
@@ -87,7 +87,7 @@ class AdminSettingsControllerTest extends TestCase {
\OC::$server->getGroupManager()->createGroup('admin')->addUser($user);
}
- public function tearDown() {
+ public function tearDown(): void {
\OC::$server->getUserManager()->get($this->adminUid)->delete();
parent::tearDown();
diff --git a/apps/settings/tests/Controller/AppSettingsControllerTest.php b/apps/settings/tests/Controller/AppSettingsControllerTest.php
index 9b09631226f..508a39642a5 100644
--- a/apps/settings/tests/Controller/AppSettingsControllerTest.php
+++ b/apps/settings/tests/Controller/AppSettingsControllerTest.php
@@ -76,7 +76,7 @@ class AppSettingsControllerTest extends TestCase {
/** @var ILogger|MockObject */
private $logger;
- public function setUp() {
+ public function setUp(): void {
parent::setUp();
$this->request = $this->createMock(IRequest::class);
diff --git a/apps/settings/tests/Controller/AuthSettingsControllerTest.php b/apps/settings/tests/Controller/AuthSettingsControllerTest.php
index ff698ffe225..435cd390f86 100644
--- a/apps/settings/tests/Controller/AuthSettingsControllerTest.php
+++ b/apps/settings/tests/Controller/AuthSettingsControllerTest.php
@@ -61,7 +61,7 @@ class AuthSettingsControllerTest extends TestCase {
private $remoteWipe;
private $uid = 'jane';
- protected function setUp() {
+ protected function setUp(): void {
parent::setUp();
$this->request = $this->createMock(IRequest::class);
diff --git a/apps/settings/tests/Controller/CertificateControllerTest.php b/apps/settings/tests/Controller/CertificateControllerTest.php
index ed0e7775dc1..270e986e307 100644
--- a/apps/settings/tests/Controller/CertificateControllerTest.php
+++ b/apps/settings/tests/Controller/CertificateControllerTest.php
@@ -48,7 +48,7 @@ class CertificateControllerTest extends \Test\TestCase {
/** @var ICertificateManager */
private $systemCertificateManager;
- public function setUp() {
+ public function setUp(): void {
parent::setUp();
$this->request = $this->getMockBuilder(IRequest::class)->getMock();
diff --git a/apps/settings/tests/Controller/CheckSetupControllerTest.php b/apps/settings/tests/Controller/CheckSetupControllerTest.php
index 4d6a4c21f00..b038cf2af34 100644
--- a/apps/settings/tests/Controller/CheckSetupControllerTest.php
+++ b/apps/settings/tests/Controller/CheckSetupControllerTest.php
@@ -87,7 +87,7 @@ class CheckSetupControllerTest extends TestCase {
*/
private $dirsToRemove = [];
- public function setUp() {
+ public function setUp(): void {
parent::setUp();
$this->request = $this->getMockBuilder(IRequest::class)
diff --git a/apps/settings/tests/Controller/MailSettingsControllerTest.php b/apps/settings/tests/Controller/MailSettingsControllerTest.php
index 1607926219e..8440df6ec4e 100644
--- a/apps/settings/tests/Controller/MailSettingsControllerTest.php
+++ b/apps/settings/tests/Controller/MailSettingsControllerTest.php
@@ -41,7 +41,7 @@ class MailSettingsControllerTest extends \Test\TestCase {
/** @var MailSettingsController */
private $mailController;
- protected function setUp() {
+ protected function setUp(): void {
parent::setUp();
$this->l = $this->createMock(IL10N::class);
diff --git a/apps/settings/tests/Controller/TwoFactorSettingsControllerTest.php b/apps/settings/tests/Controller/TwoFactorSettingsControllerTest.php
index 58b82bc0930..d77f2303a6c 100644
--- a/apps/settings/tests/Controller/TwoFactorSettingsControllerTest.php
+++ b/apps/settings/tests/Controller/TwoFactorSettingsControllerTest.php
@@ -41,7 +41,7 @@ class TwoFactorSettingsControllerTest extends TestCase {
/** @var TwoFactorSettingsController */
private $controller;
- protected function setUp() {
+ protected function setUp(): void {
parent::setUp();
$this->request = $this->createMock(IRequest::class);
diff --git a/apps/settings/tests/Controller/UsersControllerTest.php b/apps/settings/tests/Controller/UsersControllerTest.php
index 5ca45297c58..eb5790a0401 100644
--- a/apps/settings/tests/Controller/UsersControllerTest.php
+++ b/apps/settings/tests/Controller/UsersControllerTest.php
@@ -74,7 +74,7 @@ class UsersControllerTest extends \Test\TestCase {
/** @var IEncryptionModule | \PHPUnit_Framework_MockObject_MockObject */
private $encryptionModule;
- protected function setUp() {
+ protected function setUp(): void {
parent::setUp();
$this->userManager = $this->createMock(IUserManager::class);