summaryrefslogtreecommitdiffstats
path: root/tests/lib/Files/Storage
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 /tests/lib/Files/Storage
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 'tests/lib/Files/Storage')
-rw-r--r--tests/lib/Files/Storage/CommonTest.php4
-rw-r--r--tests/lib/Files/Storage/CopyDirectoryTest.php2
-rw-r--r--tests/lib/Files/Storage/HomeTest.php4
-rw-r--r--tests/lib/Files/Storage/LocalTest.php4
-rw-r--r--tests/lib/Files/Storage/Wrapper/AvailabilityTest.php2
-rw-r--r--tests/lib/Files/Storage/Wrapper/EncodingTest.php4
-rw-r--r--tests/lib/Files/Storage/Wrapper/EncryptionTest.php2
-rw-r--r--tests/lib/Files/Storage/Wrapper/JailTest.php4
-rw-r--r--tests/lib/Files/Storage/Wrapper/PermissionsMaskTest.php4
-rw-r--r--tests/lib/Files/Storage/Wrapper/QuotaTest.php4
-rw-r--r--tests/lib/Files/Storage/Wrapper/WrapperTest.php4
11 files changed, 19 insertions, 19 deletions
diff --git a/tests/lib/Files/Storage/CommonTest.php b/tests/lib/Files/Storage/CommonTest.php
index f7be996e5ea..0900765c510 100644
--- a/tests/lib/Files/Storage/CommonTest.php
+++ b/tests/lib/Files/Storage/CommonTest.php
@@ -39,14 +39,14 @@ class CommonTest extends Storage {
*/
private $tmpDir;
- protected function setUp() {
+ protected function setUp(): void {
parent::setUp();
$this->tmpDir = \OC::$server->getTempManager()->getTemporaryFolder();
$this->instance = new \OC\Files\Storage\CommonTest(['datadir' => $this->tmpDir]);
}
- protected function tearDown() {
+ protected function tearDown(): void {
\OC_Helper::rmdirr($this->tmpDir);
parent::tearDown();
}
diff --git a/tests/lib/Files/Storage/CopyDirectoryTest.php b/tests/lib/Files/Storage/CopyDirectoryTest.php
index 034ffb5a53a..d56cc37124d 100644
--- a/tests/lib/Files/Storage/CopyDirectoryTest.php
+++ b/tests/lib/Files/Storage/CopyDirectoryTest.php
@@ -45,7 +45,7 @@ class CopyDirectoryStorage extends StorageNoRecursiveCopy {
*/
class CopyDirectoryTest extends Storage {
- protected function setUp() {
+ protected function setUp(): void {
parent::setUp();
$this->instance = new CopyDirectoryStorage([]);
}
diff --git a/tests/lib/Files/Storage/HomeTest.php b/tests/lib/Files/Storage/HomeTest.php
index e6899ff7d38..6075e9af293 100644
--- a/tests/lib/Files/Storage/HomeTest.php
+++ b/tests/lib/Files/Storage/HomeTest.php
@@ -67,7 +67,7 @@ class HomeTest extends Storage {
*/
private $user;
- protected function setUp() {
+ protected function setUp(): void {
parent::setUp();
$this->tmpDir = \OC::$server->getTempManager()->getTemporaryFolder();
@@ -76,7 +76,7 @@ class HomeTest extends Storage {
$this->instance = new \OC\Files\Storage\Home(array('user' => $this->user));
}
- protected function tearDown() {
+ protected function tearDown(): void {
\OC_Helper::rmdirr($this->tmpDir);
parent::tearDown();
}
diff --git a/tests/lib/Files/Storage/LocalTest.php b/tests/lib/Files/Storage/LocalTest.php
index c611a990236..3b83a349cfa 100644
--- a/tests/lib/Files/Storage/LocalTest.php
+++ b/tests/lib/Files/Storage/LocalTest.php
@@ -35,14 +35,14 @@ class LocalTest extends Storage {
*/
private $tmpDir;
- protected function setUp() {
+ protected function setUp(): void {
parent::setUp();
$this->tmpDir = \OC::$server->getTempManager()->getTemporaryFolder();
$this->instance = new \OC\Files\Storage\Local(array('datadir' => $this->tmpDir));
}
- protected function tearDown() {
+ protected function tearDown(): void {
\OC_Helper::rmdirr($this->tmpDir);
parent::tearDown();
}
diff --git a/tests/lib/Files/Storage/Wrapper/AvailabilityTest.php b/tests/lib/Files/Storage/Wrapper/AvailabilityTest.php
index 1672d17e36b..e8eb49ec014 100644
--- a/tests/lib/Files/Storage/Wrapper/AvailabilityTest.php
+++ b/tests/lib/Files/Storage/Wrapper/AvailabilityTest.php
@@ -35,7 +35,7 @@ class AvailabilityTest extends \Test\TestCase {
/** @var Availability */
protected $wrapper;
- public function setUp() {
+ public function setUp(): void {
parent::setUp();
$this->storageCache = $this->createMock(StorageCache::class);
diff --git a/tests/lib/Files/Storage/Wrapper/EncodingTest.php b/tests/lib/Files/Storage/Wrapper/EncodingTest.php
index 24bf10eb789..5b4443eecfc 100644
--- a/tests/lib/Files/Storage/Wrapper/EncodingTest.php
+++ b/tests/lib/Files/Storage/Wrapper/EncodingTest.php
@@ -18,7 +18,7 @@ class EncodingTest extends \Test\Files\Storage\Storage {
*/
private $sourceStorage;
- public function setUp() {
+ public function setUp(): void {
parent::setUp();
$this->sourceStorage = new \OC\Files\Storage\Temporary([]);
$this->instance = new \OC\Files\Storage\Wrapper\Encoding([
@@ -26,7 +26,7 @@ class EncodingTest extends \Test\Files\Storage\Storage {
]);
}
- public function tearDown() {
+ public function tearDown(): void {
$this->sourceStorage->cleanUp();
parent::tearDown();
}
diff --git a/tests/lib/Files/Storage/Wrapper/EncryptionTest.php b/tests/lib/Files/Storage/Wrapper/EncryptionTest.php
index 70d94ab16e6..eb43eb73359 100644
--- a/tests/lib/Files/Storage/Wrapper/EncryptionTest.php
+++ b/tests/lib/Files/Storage/Wrapper/EncryptionTest.php
@@ -108,7 +108,7 @@ class EncryptionTest extends Storage {
/** @var integer dummy unencrypted size */
private $dummySize = -1;
- protected function setUp() {
+ protected function setUp(): void {
parent::setUp();
diff --git a/tests/lib/Files/Storage/Wrapper/JailTest.php b/tests/lib/Files/Storage/Wrapper/JailTest.php
index b03eb0bcc63..1091809f96c 100644
--- a/tests/lib/Files/Storage/Wrapper/JailTest.php
+++ b/tests/lib/Files/Storage/Wrapper/JailTest.php
@@ -15,7 +15,7 @@ class JailTest extends \Test\Files\Storage\Storage {
*/
private $sourceStorage;
- public function setUp() {
+ public function setUp(): void {
parent::setUp();
$this->sourceStorage = new \OC\Files\Storage\Temporary(array());
$this->sourceStorage->mkdir('foo');
@@ -25,7 +25,7 @@ class JailTest extends \Test\Files\Storage\Storage {
));
}
- public function tearDown() {
+ public function tearDown(): void {
// test that nothing outside our jail is touched
$contents = array();
$dh = $this->sourceStorage->opendir('');
diff --git a/tests/lib/Files/Storage/Wrapper/PermissionsMaskTest.php b/tests/lib/Files/Storage/Wrapper/PermissionsMaskTest.php
index 388272b4107..c9545ae3f28 100644
--- a/tests/lib/Files/Storage/Wrapper/PermissionsMaskTest.php
+++ b/tests/lib/Files/Storage/Wrapper/PermissionsMaskTest.php
@@ -22,13 +22,13 @@ class PermissionsMaskTest extends \Test\Files\Storage\Storage {
*/
private $sourceStorage;
- public function setUp() {
+ public function setUp(): void {
parent::setUp();
$this->sourceStorage = new \OC\Files\Storage\Temporary(array());
$this->instance = $this->getMaskedStorage(Constants::PERMISSION_ALL);
}
- public function tearDown() {
+ public function tearDown(): void {
$this->sourceStorage->cleanUp();
parent::tearDown();
}
diff --git a/tests/lib/Files/Storage/Wrapper/QuotaTest.php b/tests/lib/Files/Storage/Wrapper/QuotaTest.php
index 0b80467fcc4..0061ca3910e 100644
--- a/tests/lib/Files/Storage/Wrapper/QuotaTest.php
+++ b/tests/lib/Files/Storage/Wrapper/QuotaTest.php
@@ -27,7 +27,7 @@ class QuotaTest extends \Test\Files\Storage\Storage {
*/
private $tmpDir;
- protected function setUp() {
+ protected function setUp(): void {
parent::setUp();
$this->tmpDir = \OC::$server->getTempManager()->getTemporaryFolder();
@@ -35,7 +35,7 @@ class QuotaTest extends \Test\Files\Storage\Storage {
$this->instance = new \OC\Files\Storage\Wrapper\Quota(array('storage' => $storage, 'quota' => 10000000));
}
- protected function tearDown() {
+ protected function tearDown(): void {
\OC_Helper::rmdirr($this->tmpDir);
parent::tearDown();
}
diff --git a/tests/lib/Files/Storage/Wrapper/WrapperTest.php b/tests/lib/Files/Storage/Wrapper/WrapperTest.php
index 942ff27fc35..2477b361bc1 100644
--- a/tests/lib/Files/Storage/Wrapper/WrapperTest.php
+++ b/tests/lib/Files/Storage/Wrapper/WrapperTest.php
@@ -14,7 +14,7 @@ class WrapperTest extends \Test\Files\Storage\Storage {
*/
private $tmpDir;
- protected function setUp() {
+ protected function setUp(): void {
parent::setUp();
$this->tmpDir = \OC::$server->getTempManager()->getTemporaryFolder();
@@ -22,7 +22,7 @@ class WrapperTest extends \Test\Files\Storage\Storage {
$this->instance = new \OC\Files\Storage\Wrapper\Wrapper(array('storage' => $storage));
}
- protected function tearDown() {
+ protected function tearDown(): void {
\OC_Helper::rmdirr($this->tmpDir);
parent::tearDown();
}