summaryrefslogtreecommitdiffstats
path: root/tests/Core/Controller
diff options
context:
space:
mode:
authorRoeland Jago Douma <roeland@famdouma.nl>2019-11-27 15:27:18 +0100
committerRoeland Jago Douma <roeland@famdouma.nl>2019-11-27 15:27:18 +0100
commit3a7cf40aaa678bea1df143d2982d603b7a334eec (patch)
tree63c1e3ad7f7f401d14411a4d44c523632906afc9 /tests/Core/Controller
parent0568b012672d650c6b5a49e72c4028dde5463c60 (diff)
downloadnextcloud-server-3a7cf40aaa678bea1df143d2982d603b7a334eec.tar.gz
nextcloud-server-3a7cf40aaa678bea1df143d2982d603b7a334eec.zip
Mode to modern phpunit
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Diffstat (limited to 'tests/Core/Controller')
-rw-r--r--tests/Core/Controller/AppPasswordControllerTest.php2
-rw-r--r--tests/Core/Controller/AvatarControllerTest.php2
-rw-r--r--tests/Core/Controller/ChangePasswordControllerTest.php2
-rw-r--r--tests/Core/Controller/ClientFlowLoginControllerTest.php2
-rw-r--r--tests/Core/Controller/ClientFlowLoginV2ControllerTest.php2
-rw-r--r--tests/Core/Controller/CssControllerTest.php2
-rw-r--r--tests/Core/Controller/JsControllerTest.php2
-rw-r--r--tests/Core/Controller/LoginControllerTest.php2
-rw-r--r--tests/Core/Controller/NavigationControllerTest.php2
-rw-r--r--tests/Core/Controller/OCSControllerTest.php2
-rw-r--r--tests/Core/Controller/PreviewControllerTest.php2
-rw-r--r--tests/Core/Controller/UserControllerTest.php2
-rw-r--r--tests/Core/Controller/WipeControllerTest.php2
13 files changed, 13 insertions, 13 deletions
diff --git a/tests/Core/Controller/AppPasswordControllerTest.php b/tests/Core/Controller/AppPasswordControllerTest.php
index 00a4dd2b5fa..ceccf912285 100644
--- a/tests/Core/Controller/AppPasswordControllerTest.php
+++ b/tests/Core/Controller/AppPasswordControllerTest.php
@@ -64,7 +64,7 @@ class AppPasswordControllerTest extends TestCase {
/** @var AppPasswordController */
private $controller;
- public function setUp(): void {
+ protected function setUp(): void {
parent::setUp();
$this->session = $this->createMock(ISession::class);
diff --git a/tests/Core/Controller/AvatarControllerTest.php b/tests/Core/Controller/AvatarControllerTest.php
index d7feec28fd2..9135a6bc92f 100644
--- a/tests/Core/Controller/AvatarControllerTest.php
+++ b/tests/Core/Controller/AvatarControllerTest.php
@@ -121,7 +121,7 @@ class AvatarControllerTest extends \Test\TestCase {
$this->avatarFile->method('getEtag')->willReturn('my etag');
}
- public function tearDown(): void {
+ protected function tearDown(): void {
parent::tearDown();
}
diff --git a/tests/Core/Controller/ChangePasswordControllerTest.php b/tests/Core/Controller/ChangePasswordControllerTest.php
index ac9d9d37993..a55b0bc232e 100644
--- a/tests/Core/Controller/ChangePasswordControllerTest.php
+++ b/tests/Core/Controller/ChangePasswordControllerTest.php
@@ -49,7 +49,7 @@ class ChangePasswordControllerTest extends \Test\TestCase {
/** @var ChangePasswordController */
private $controller;
- public function setUp(): void {
+ protected function setUp(): void {
parent::setUp();
$this->userManager = $this->createMock(\OC\User\Manager::class);
diff --git a/tests/Core/Controller/ClientFlowLoginControllerTest.php b/tests/Core/Controller/ClientFlowLoginControllerTest.php
index ebe43ba560f..3932cb9e144 100644
--- a/tests/Core/Controller/ClientFlowLoginControllerTest.php
+++ b/tests/Core/Controller/ClientFlowLoginControllerTest.php
@@ -74,7 +74,7 @@ class ClientFlowLoginControllerTest extends TestCase {
/** @var ClientFlowLoginController */
private $clientFlowLoginController;
- public function setUp(): void {
+ protected function setUp(): void {
parent::setUp();
$this->request = $this->createMock(IRequest::class);
diff --git a/tests/Core/Controller/ClientFlowLoginV2ControllerTest.php b/tests/Core/Controller/ClientFlowLoginV2ControllerTest.php
index d8ce67b18f1..3c39a402f55 100644
--- a/tests/Core/Controller/ClientFlowLoginV2ControllerTest.php
+++ b/tests/Core/Controller/ClientFlowLoginV2ControllerTest.php
@@ -58,7 +58,7 @@ class ClientFlowLoginV2ControllerTest extends TestCase {
/** @var ClientFlowLoginV2Controller */
private $controller;
- public function setUp(): void {
+ protected function setUp(): void {
parent::setUp();
$this->request = $this->createMock(IRequest::class);
diff --git a/tests/Core/Controller/CssControllerTest.php b/tests/Core/Controller/CssControllerTest.php
index edee29cee57..c0d1ea42f41 100644
--- a/tests/Core/Controller/CssControllerTest.php
+++ b/tests/Core/Controller/CssControllerTest.php
@@ -48,7 +48,7 @@ class CssControllerTest extends TestCase {
/** @var CssController */
private $controller;
- public function setUp(): void {
+ protected function setUp(): void {
parent::setUp();
/** @var Factory|\PHPUnit_Framework_MockObject_MockObject $factory */
diff --git a/tests/Core/Controller/JsControllerTest.php b/tests/Core/Controller/JsControllerTest.php
index 503e97d1c53..26df6d181ef 100644
--- a/tests/Core/Controller/JsControllerTest.php
+++ b/tests/Core/Controller/JsControllerTest.php
@@ -48,7 +48,7 @@ class JsControllerTest extends TestCase {
/** @var IRequest|\PHPUnit_Framework_MockObject_MockObject */
private $request;
- public function setUp(): void {
+ protected function setUp(): void {
parent::setUp();
/** @var Factory|\PHPUnit_Framework_MockObject_MockObject $factory */
diff --git a/tests/Core/Controller/LoginControllerTest.php b/tests/Core/Controller/LoginControllerTest.php
index 6a8db74b0d3..b4f3663c0ba 100644
--- a/tests/Core/Controller/LoginControllerTest.php
+++ b/tests/Core/Controller/LoginControllerTest.php
@@ -83,7 +83,7 @@ class LoginControllerTest extends TestCase {
/** @var IInitialStateService|MockObject */
private $initialStateService;
- public function setUp(): void {
+ protected function setUp(): void {
parent::setUp();
$this->request = $this->createMock(IRequest::class);
$this->userManager = $this->createMock(\OC\User\Manager::class);
diff --git a/tests/Core/Controller/NavigationControllerTest.php b/tests/Core/Controller/NavigationControllerTest.php
index ce77d1d0684..4a4ad4b49e3 100644
--- a/tests/Core/Controller/NavigationControllerTest.php
+++ b/tests/Core/Controller/NavigationControllerTest.php
@@ -45,7 +45,7 @@ class NavigationControllerTest extends TestCase {
/** @var NavigationController */
private $controller;
- public function setUp(): void {
+ protected function setUp(): void {
parent::setUp();
$this->request = $this->createMock(IRequest::class);
diff --git a/tests/Core/Controller/OCSControllerTest.php b/tests/Core/Controller/OCSControllerTest.php
index d1e7f2c4350..f0fbce86b8c 100644
--- a/tests/Core/Controller/OCSControllerTest.php
+++ b/tests/Core/Controller/OCSControllerTest.php
@@ -48,7 +48,7 @@ class OCSControllerTest extends TestCase {
/** @var OCSController */
private $controller;
- public function setUp(): void {
+ protected function setUp(): void {
parent::setUp();
$this->request = $this->createMock(IRequest::class);
diff --git a/tests/Core/Controller/PreviewControllerTest.php b/tests/Core/Controller/PreviewControllerTest.php
index 145fb93f63a..65252561796 100644
--- a/tests/Core/Controller/PreviewControllerTest.php
+++ b/tests/Core/Controller/PreviewControllerTest.php
@@ -49,7 +49,7 @@ class PreviewControllerTest extends \Test\TestCase {
/** @var PreviewController|\PHPUnit_Framework_MockObject_MockObject */
private $controller;
- public function setUp(): void {
+ protected function setUp(): void {
parent::setUp();
$this->rootFolder = $this->createMock(IRootFolder::class);
diff --git a/tests/Core/Controller/UserControllerTest.php b/tests/Core/Controller/UserControllerTest.php
index 489433f10b8..b5e43b2999d 100644
--- a/tests/Core/Controller/UserControllerTest.php
+++ b/tests/Core/Controller/UserControllerTest.php
@@ -38,7 +38,7 @@ class UserControllerTest extends TestCase {
/** @var UserController */
private $controller;
- public function setUp(): void {
+ protected function setUp(): void {
parent::setUp();
$this->userManager = $this->createMock(IUserManager::class);
diff --git a/tests/Core/Controller/WipeControllerTest.php b/tests/Core/Controller/WipeControllerTest.php
index ebbf6509009..73d16a63a6e 100644
--- a/tests/Core/Controller/WipeControllerTest.php
+++ b/tests/Core/Controller/WipeControllerTest.php
@@ -40,7 +40,7 @@ class WipeControllerTest extends TestCase {
/** @var WipeController */
private $controller;
- public function setUp(): void {
+ protected function setUp(): void {
parent::setUp();
$this->remoteWipe = $this->createMock(RemoteWipe::class);