summaryrefslogtreecommitdiffstats
path: root/apps/files_trashbin
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/files_trashbin
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/files_trashbin')
-rw-r--r--apps/files_trashbin/tests/CapabilitiesTest.php2
-rw-r--r--apps/files_trashbin/tests/Command/CleanUpTest.php2
-rw-r--r--apps/files_trashbin/tests/Controller/PreviewControllerTest.php2
-rw-r--r--apps/files_trashbin/tests/StorageTest.php4
-rw-r--r--apps/files_trashbin/tests/TrashbinTest.php8
5 files changed, 9 insertions, 9 deletions
diff --git a/apps/files_trashbin/tests/CapabilitiesTest.php b/apps/files_trashbin/tests/CapabilitiesTest.php
index c4729d7a7c7..9a891e86522 100644
--- a/apps/files_trashbin/tests/CapabilitiesTest.php
+++ b/apps/files_trashbin/tests/CapabilitiesTest.php
@@ -27,7 +27,7 @@ class CapabilitiesTest extends TestCase {
/** @var Capabilities */
private $capabilities;
- public function setUp() {
+ public function setUp(): void {
parent::setUp();
$this->capabilities = new Capabilities();
}
diff --git a/apps/files_trashbin/tests/Command/CleanUpTest.php b/apps/files_trashbin/tests/Command/CleanUpTest.php
index 9a517df1a54..74231ada18b 100644
--- a/apps/files_trashbin/tests/Command/CleanUpTest.php
+++ b/apps/files_trashbin/tests/Command/CleanUpTest.php
@@ -61,7 +61,7 @@ class CleanUpTest extends TestCase {
/** @var string */
protected $user0 = 'user0';
- public function setUp() {
+ public function setUp(): void {
parent::setUp();
$this->rootFolder = $this->getMockBuilder('OCP\Files\IRootFolder')
->disableOriginalConstructor()->getMock();
diff --git a/apps/files_trashbin/tests/Controller/PreviewControllerTest.php b/apps/files_trashbin/tests/Controller/PreviewControllerTest.php
index fd562b5cd04..a6891a6c07b 100644
--- a/apps/files_trashbin/tests/Controller/PreviewControllerTest.php
+++ b/apps/files_trashbin/tests/Controller/PreviewControllerTest.php
@@ -65,7 +65,7 @@ class PreviewControllerTest extends TestCase {
/** @var IUserSession|\PHPUnit_Framework_MockObject_MockObject */
private $userSession;
- public function setUp() {
+ public function setUp(): void {
parent::setUp();
$this->rootFolder = $this->createMock(IRootFolder::class);
diff --git a/apps/files_trashbin/tests/StorageTest.php b/apps/files_trashbin/tests/StorageTest.php
index c98f5fd2b1e..99690933745 100644
--- a/apps/files_trashbin/tests/StorageTest.php
+++ b/apps/files_trashbin/tests/StorageTest.php
@@ -66,7 +66,7 @@ class StorageTest extends \Test\TestCase {
*/
private $userView;
- protected function setUp() {
+ protected function setUp(): void {
parent::setUp();
\OC_Hook::clear();
@@ -88,7 +88,7 @@ class StorageTest extends \Test\TestCase {
$this->userView->file_put_contents('folder/inside.txt', 'bar');
}
- protected function tearDown() {
+ protected function tearDown(): void {
\OC\Files\Filesystem::getLoader()->removeStorageWrapper('oc_trashbin');
$this->logout();
$user = \OC::$server->getUserManager()->get($this->user);
diff --git a/apps/files_trashbin/tests/TrashbinTest.php b/apps/files_trashbin/tests/TrashbinTest.php
index 3b1fff31fe1..9e5b029d9dc 100644
--- a/apps/files_trashbin/tests/TrashbinTest.php
+++ b/apps/files_trashbin/tests/TrashbinTest.php
@@ -54,7 +54,7 @@ class TrashbinTest extends \Test\TestCase {
*/
private $rootView;
- public static function setUpBeforeClass() {
+ public static function setUpBeforeClass(): void {
parent::setUpBeforeClass();
$appManager = \OC::$server->getAppManager();
@@ -89,7 +89,7 @@ class TrashbinTest extends \Test\TestCase {
}
- public static function tearDownAfterClass() {
+ public static function tearDownAfterClass(): void {
// cleanup test user
$user = \OC::$server->getUserManager()->get(self::TEST_TRASHBIN_USER1);
if ($user !== null) {
@@ -111,7 +111,7 @@ class TrashbinTest extends \Test\TestCase {
parent::tearDownAfterClass();
}
- protected function setUp() {
+ protected function setUp(): void {
parent::setUp();
\OC::$server->getAppManager()->enableApp('files_trashbin');
@@ -134,7 +134,7 @@ class TrashbinTest extends \Test\TestCase {
self::loginHelper(self::TEST_TRASHBIN_USER1);
}
- protected function tearDown() {
+ protected function tearDown(): void {
$this->restoreService('AllConfig');
// disable trashbin to be able to properly clean up
\OC::$server->getAppManager()->disableApp('files_trashbin');