diff options
| author | Roeland Jago Douma <roeland@famdouma.nl> | 2019-11-21 18:40:38 +0300 |
|---|---|---|
| committer | Roeland Jago Douma <roeland@famdouma.nl> | 2019-11-27 15:34:41 +0300 |
| commit | c007ca624f4a95e1a491221d425fcb2fa6e5589a (patch) | |
| tree | b60aa133b438eb116ac3579283aa8a7967efd12b /tests | |
| parent | e0f32814e33f9ebb8c42744611048cbfac1eb588 (diff) | |
Make phpunit8 compatible
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Diffstat (limited to 'tests')
386 files changed, 465 insertions, 466 deletions
diff --git a/tests/Core/Command/Apps/AppsDisableTest.php b/tests/Core/Command/Apps/AppsDisableTest.php index d9c43a79c26..f066eaba401 100644 --- a/tests/Core/Command/Apps/AppsDisableTest.php +++ b/tests/Core/Command/Apps/AppsDisableTest.php @@ -36,7 +36,7 @@ class AppsDisableTest extends TestCase { /** @var CommandTester */ private $commandTester; - public function setUp() { + public function setUp(): void { parent::setUp(); $command = new Disable( diff --git a/tests/Core/Command/Apps/AppsEnableTest.php b/tests/Core/Command/Apps/AppsEnableTest.php index d2bda141303..a30bef59326 100644 --- a/tests/Core/Command/Apps/AppsEnableTest.php +++ b/tests/Core/Command/Apps/AppsEnableTest.php @@ -36,7 +36,7 @@ class AppsEnableTest extends TestCase { /** @var CommandTester */ private $commandTester; - public function setUp() { + public function setUp(): void { parent::setUp(); $command = new Enable( diff --git a/tests/Core/Command/Config/App/DeleteConfigTest.php b/tests/Core/Command/Config/App/DeleteConfigTest.php index f74fd73d697..251de227d67 100644 --- a/tests/Core/Command/Config/App/DeleteConfigTest.php +++ b/tests/Core/Command/Config/App/DeleteConfigTest.php @@ -40,7 +40,7 @@ class DeleteConfigTest extends TestCase { /** @var \Symfony\Component\Console\Command\Command */ protected $command; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->config = $this->getMockBuilder(IConfig::class) diff --git a/tests/Core/Command/Config/App/GetConfigTest.php b/tests/Core/Command/Config/App/GetConfigTest.php index 7ea3fbb587c..7ecb09b8f82 100644 --- a/tests/Core/Command/Config/App/GetConfigTest.php +++ b/tests/Core/Command/Config/App/GetConfigTest.php @@ -40,7 +40,7 @@ class GetConfigTest extends TestCase { /** @var \Symfony\Component\Console\Command\Command */ protected $command; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $config = $this->config = $this->getMockBuilder(IConfig::class) diff --git a/tests/Core/Command/Config/App/SetConfigTest.php b/tests/Core/Command/Config/App/SetConfigTest.php index f66390871de..988e965d317 100644 --- a/tests/Core/Command/Config/App/SetConfigTest.php +++ b/tests/Core/Command/Config/App/SetConfigTest.php @@ -40,7 +40,7 @@ class SetConfigTest extends TestCase { /** @var \Symfony\Component\Console\Command\Command */ protected $command; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $config = $this->config = $this->getMockBuilder(IConfig::class) diff --git a/tests/Core/Command/Config/ImportTest.php b/tests/Core/Command/Config/ImportTest.php index 7afa47d3536..fa1ed151678 100644 --- a/tests/Core/Command/Config/ImportTest.php +++ b/tests/Core/Command/Config/ImportTest.php @@ -40,7 +40,7 @@ class ImportTest extends TestCase { /** @var \Symfony\Component\Console\Command\Command */ protected $command; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $config = $this->config = $this->getMockBuilder(IConfig::class) diff --git a/tests/Core/Command/Config/ListConfigsTest.php b/tests/Core/Command/Config/ListConfigsTest.php index 861c1f59d5e..203feaacbf1 100644 --- a/tests/Core/Command/Config/ListConfigsTest.php +++ b/tests/Core/Command/Config/ListConfigsTest.php @@ -44,7 +44,7 @@ class ListConfigsTest extends TestCase { /** @var \Symfony\Component\Console\Command\Command */ protected $command; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $systemConfig = $this->systemConfig = $this->getMockBuilder(SystemConfig::class) diff --git a/tests/Core/Command/Config/System/DeleteConfigTest.php b/tests/Core/Command/Config/System/DeleteConfigTest.php index 5ac4c853df3..21ef3e33981 100644 --- a/tests/Core/Command/Config/System/DeleteConfigTest.php +++ b/tests/Core/Command/Config/System/DeleteConfigTest.php @@ -40,7 +40,7 @@ class DeleteConfigTest extends TestCase { /** @var \Symfony\Component\Console\Command\Command */ protected $command; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $systemConfig = $this->systemConfig = $this->getMockBuilder(SystemConfig::class) diff --git a/tests/Core/Command/Config/System/GetConfigTest.php b/tests/Core/Command/Config/System/GetConfigTest.php index fd5db69fec9..1d8975f7f7f 100644 --- a/tests/Core/Command/Config/System/GetConfigTest.php +++ b/tests/Core/Command/Config/System/GetConfigTest.php @@ -40,7 +40,7 @@ class GetConfigTest extends TestCase { /** @var \Symfony\Component\Console\Command\Command */ protected $command; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $systemConfig = $this->systemConfig = $this->getMockBuilder(SystemConfig::class) diff --git a/tests/Core/Command/Config/System/SetConfigTest.php b/tests/Core/Command/Config/System/SetConfigTest.php index bb8d2c4b962..e3cfa89093d 100644 --- a/tests/Core/Command/Config/System/SetConfigTest.php +++ b/tests/Core/Command/Config/System/SetConfigTest.php @@ -40,7 +40,7 @@ class SetConfigTest extends TestCase { /** @var \Symfony\Component\Console\Command\Command */ protected $command; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $systemConfig = $this->systemConfig = $this->getMockBuilder(SystemConfig::class) diff --git a/tests/Core/Command/Encryption/ChangeKeyStorageRootTest.php b/tests/Core/Command/Encryption/ChangeKeyStorageRootTest.php index 811b64029c6..0f56cf53fa8 100644 --- a/tests/Core/Command/Encryption/ChangeKeyStorageRootTest.php +++ b/tests/Core/Command/Encryption/ChangeKeyStorageRootTest.php @@ -63,7 +63,7 @@ class ChangeKeyStorageRootTest extends TestCase { /** @var \OCP\UserInterface | \PHPUnit_Framework_MockObject_MockObject */ protected $userInterface; - public function setUp() { + public function setUp(): void { parent::setUp(); $this->view = $this->getMockBuilder(View::class)->getMock(); diff --git a/tests/Core/Command/Encryption/DecryptAllTest.php b/tests/Core/Command/Encryption/DecryptAllTest.php index 508d5da95f7..7fa95351045 100644 --- a/tests/Core/Command/Encryption/DecryptAllTest.php +++ b/tests/Core/Command/Encryption/DecryptAllTest.php @@ -54,7 +54,7 @@ class DecryptAllTest extends TestCase { /** @var \PHPUnit_Framework_MockObject_MockObject | \OC\Encryption\DecryptAll */ protected $decryptAll; - public function setUp() { + public function setUp(): void { parent::setUp(); $this->config = $this->getMockBuilder(IConfig::class) diff --git a/tests/Core/Command/Encryption/DisableTest.php b/tests/Core/Command/Encryption/DisableTest.php index 77a690fe264..f9035a84788 100644 --- a/tests/Core/Command/Encryption/DisableTest.php +++ b/tests/Core/Command/Encryption/DisableTest.php @@ -39,7 +39,7 @@ class DisableTest extends TestCase { /** @var \Symfony\Component\Console\Command\Command */ protected $command; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $config = $this->config = $this->getMockBuilder(IConfig::class) diff --git a/tests/Core/Command/Encryption/EnableTest.php b/tests/Core/Command/Encryption/EnableTest.php index eb1b7842385..5c8fc826af1 100644 --- a/tests/Core/Command/Encryption/EnableTest.php +++ b/tests/Core/Command/Encryption/EnableTest.php @@ -42,7 +42,7 @@ class EnableTest extends TestCase { /** @var \Symfony\Component\Console\Command\Command */ protected $command; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $config = $this->config = $this->getMockBuilder(IConfig::class) diff --git a/tests/Core/Command/Encryption/EncryptAllTest.php b/tests/Core/Command/Encryption/EncryptAllTest.php index 7fa4b5e5bbe..9c9818475f5 100644 --- a/tests/Core/Command/Encryption/EncryptAllTest.php +++ b/tests/Core/Command/Encryption/EncryptAllTest.php @@ -58,7 +58,7 @@ class EncryptAllTest extends TestCase { /** @var EncryptAll */ protected $command; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->config = $this->getMockBuilder(IConfig::class) diff --git a/tests/Core/Command/Encryption/SetDefaultModuleTest.php b/tests/Core/Command/Encryption/SetDefaultModuleTest.php index 2dc62d42bfa..0776ef42b48 100644 --- a/tests/Core/Command/Encryption/SetDefaultModuleTest.php +++ b/tests/Core/Command/Encryption/SetDefaultModuleTest.php @@ -42,7 +42,7 @@ class SetDefaultModuleTest extends TestCase { /** @var \Symfony\Component\Console\Command\Command */ protected $command; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->manager = $this->getMockBuilder(IManager::class) diff --git a/tests/Core/Command/Group/AddTest.php b/tests/Core/Command/Group/AddTest.php index c7010e53e58..ea30a5d3d68 100644 --- a/tests/Core/Command/Group/AddTest.php +++ b/tests/Core/Command/Group/AddTest.php @@ -44,7 +44,7 @@ class AddTest extends TestCase { /** @var OutputInterface|\PHPUnit_Framework_MockObject_MockObject */ private $output; - public function setUp() { + public function setUp(): void { parent::setUp(); $this->groupManager = $this->createMock(IGroupManager::class); diff --git a/tests/Core/Command/Group/AddUserTest.php b/tests/Core/Command/Group/AddUserTest.php index 7660aad1192..85288d9e29c 100644 --- a/tests/Core/Command/Group/AddUserTest.php +++ b/tests/Core/Command/Group/AddUserTest.php @@ -49,7 +49,7 @@ class AddUserTest extends TestCase { /** @var OutputInterface|\PHPUnit_Framework_MockObject_MockObject */ private $output; - public function setUp() { + public function setUp(): void { parent::setUp(); $this->groupManager = $this->createMock(IGroupManager::class); diff --git a/tests/Core/Command/Group/DeleteTest.php b/tests/Core/Command/Group/DeleteTest.php index f9b1cbbe3a8..4c2acbbad94 100644 --- a/tests/Core/Command/Group/DeleteTest.php +++ b/tests/Core/Command/Group/DeleteTest.php @@ -44,7 +44,7 @@ class DeleteTest extends TestCase { /** @var OutputInterface|\PHPUnit_Framework_MockObject_MockObject */ private $output; - public function setUp() { + public function setUp(): void { parent::setUp(); $this->groupManager = $this->createMock(IGroupManager::class); diff --git a/tests/Core/Command/Group/ListCommandTest.php b/tests/Core/Command/Group/ListCommandTest.php index ab089c93422..71697d89401 100644 --- a/tests/Core/Command/Group/ListCommandTest.php +++ b/tests/Core/Command/Group/ListCommandTest.php @@ -45,7 +45,7 @@ class ListCommandTest extends TestCase { /** @var OutputInterface|\PHPUnit_Framework_MockObject_MockObject */ private $output; - public function setUp() { + public function setUp(): void { parent::setUp(); $this->groupManager = $this->createMock(IGroupManager::class); diff --git a/tests/Core/Command/Group/RemoveUserTest.php b/tests/Core/Command/Group/RemoveUserTest.php index 8a75571e3cb..7e835f58478 100644 --- a/tests/Core/Command/Group/RemoveUserTest.php +++ b/tests/Core/Command/Group/RemoveUserTest.php @@ -49,7 +49,7 @@ class RemoveUserTest extends TestCase { /** @var OutputInterface|\PHPUnit_Framework_MockObject_MockObject */ private $output; - public function setUp() { + public function setUp(): void { parent::setUp(); $this->groupManager = $this->createMock(IGroupManager::class); diff --git a/tests/Core/Command/Log/FileTest.php b/tests/Core/Command/Log/FileTest.php index 4b8845277da..524a193d86f 100644 --- a/tests/Core/Command/Log/FileTest.php +++ b/tests/Core/Command/Log/FileTest.php @@ -39,7 +39,7 @@ class FileTest extends TestCase { /** @var \Symfony\Component\Console\Command\Command */ protected $command; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $config = $this->config = $this->getMockBuilder(IConfig::class) diff --git a/tests/Core/Command/Log/ManageTest.php b/tests/Core/Command/Log/ManageTest.php index 2044fc4de90..92907948fb2 100644 --- a/tests/Core/Command/Log/ManageTest.php +++ b/tests/Core/Command/Log/ManageTest.php @@ -39,7 +39,7 @@ class ManageTest extends TestCase { /** @var \Symfony\Component\Console\Command\Command */ protected $command; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $config = $this->config = $this->getMockBuilder(IConfig::class) diff --git a/tests/Core/Command/Maintenance/DataFingerprintTest.php b/tests/Core/Command/Maintenance/DataFingerprintTest.php index 90ffa50c012..5cc816627e6 100644 --- a/tests/Core/Command/Maintenance/DataFingerprintTest.php +++ b/tests/Core/Command/Maintenance/DataFingerprintTest.php @@ -41,7 +41,7 @@ class DataFingerprintTest extends TestCase { /** @var \Symfony\Component\Console\Command\Command */ protected $command; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->config = $this->getMockBuilder(IConfig::class)->getMock(); diff --git a/tests/Core/Command/Maintenance/Mimetype/UpdateDBTest.php b/tests/Core/Command/Maintenance/Mimetype/UpdateDBTest.php index 77757008633..32608796864 100644 --- a/tests/Core/Command/Maintenance/Mimetype/UpdateDBTest.php +++ b/tests/Core/Command/Maintenance/Mimetype/UpdateDBTest.php @@ -44,7 +44,7 @@ class UpdateDBTest extends TestCase { /** @var \Symfony\Component\Console\Command\Command */ protected $command; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->detector = $this->getMockBuilder(Detection::class) diff --git a/tests/Core/Command/Maintenance/ModeTest.php b/tests/Core/Command/Maintenance/ModeTest.php index 895a06bbec1..1e8af354d50 100644 --- a/tests/Core/Command/Maintenance/ModeTest.php +++ b/tests/Core/Command/Maintenance/ModeTest.php @@ -48,7 +48,7 @@ class ModeTest extends TestCase { * * @return void */ - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->config = $this->getMockBuilder(IConfig::class) ->getMock(); diff --git a/tests/Core/Command/Maintenance/UpdateTheme.php b/tests/Core/Command/Maintenance/UpdateTheme.php index 73141cefcbd..ace756b2647 100644 --- a/tests/Core/Command/Maintenance/UpdateTheme.php +++ b/tests/Core/Command/Maintenance/UpdateTheme.php @@ -50,7 +50,7 @@ class UpdateThemeTest extends TestCase { /** @var \Symfony\Component\Console\Command\Command */ protected $command; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->detector = $this->createMock(Detection::class); diff --git a/tests/Core/Command/TwoFactorAuth/CleanupTest.php b/tests/Core/Command/TwoFactorAuth/CleanupTest.php index 227283decf6..24aaa9abce2 100644 --- a/tests/Core/Command/TwoFactorAuth/CleanupTest.php +++ b/tests/Core/Command/TwoFactorAuth/CleanupTest.php @@ -40,7 +40,7 @@ class CleanupTest extends TestCase { /** @var CommandTester */ private $cmd; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->registry = $this->createMock(IRegistry::class); diff --git a/tests/Core/Command/TwoFactorAuth/DisableTest.php b/tests/Core/Command/TwoFactorAuth/DisableTest.php index 30ebc007dc1..9741f5b2b52 100644 --- a/tests/Core/Command/TwoFactorAuth/DisableTest.php +++ b/tests/Core/Command/TwoFactorAuth/DisableTest.php @@ -45,7 +45,7 @@ class DisableTest extends TestCase { /** @var CommandTester */ private $command; - public function setUp() { + public function setUp(): void { parent::setUp(); $this->providerManager = $this->createMock(ProviderManager::class); diff --git a/tests/Core/Command/TwoFactorAuth/EnableTest.php b/tests/Core/Command/TwoFactorAuth/EnableTest.php index f31f92da4a5..bd74bde2e81 100644 --- a/tests/Core/Command/TwoFactorAuth/EnableTest.php +++ b/tests/Core/Command/TwoFactorAuth/EnableTest.php @@ -45,7 +45,7 @@ class EnableTest extends TestCase { /** @var CommandTester */ private $command; - public function setUp() { + public function setUp(): void { parent::setUp(); $this->providerManager = $this->createMock(ProviderManager::class); diff --git a/tests/Core/Command/TwoFactorAuth/EnforceTest.php b/tests/Core/Command/TwoFactorAuth/EnforceTest.php index 2d9b77e18c2..aa2cbc10620 100644 --- a/tests/Core/Command/TwoFactorAuth/EnforceTest.php +++ b/tests/Core/Command/TwoFactorAuth/EnforceTest.php @@ -41,7 +41,7 @@ class EnforceTest extends TestCase { /** @var CommandTester */ private $command; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->mandatoryTwoFactor = $this->createMock(MandatoryTwoFactor::class); diff --git a/tests/Core/Command/TwoFactorAuth/StateTest.php b/tests/Core/Command/TwoFactorAuth/StateTest.php index 580e137fe32..8d1b28862d3 100644 --- a/tests/Core/Command/TwoFactorAuth/StateTest.php +++ b/tests/Core/Command/TwoFactorAuth/StateTest.php @@ -45,7 +45,7 @@ class StateTest extends TestCase { /** @var CommandTester|MockObject */ private $cmd; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->registry = $this->createMock(IRegistry::class); diff --git a/tests/Core/Command/User/DeleteTest.php b/tests/Core/Command/User/DeleteTest.php index 1b94d37cfc4..9dc920894d7 100644 --- a/tests/Core/Command/User/DeleteTest.php +++ b/tests/Core/Command/User/DeleteTest.php @@ -40,7 +40,7 @@ class DeleteTest extends TestCase { /** @var \Symfony\Component\Console\Command\Command */ protected $command; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $userManager = $this->userManager = $this->getMockBuilder(IUserManager::class) diff --git a/tests/Core/Command/User/DisableTest.php b/tests/Core/Command/User/DisableTest.php index 019fedc1da9..5456118f67c 100644 --- a/tests/Core/Command/User/DisableTest.php +++ b/tests/Core/Command/User/DisableTest.php @@ -42,7 +42,7 @@ class DisableTest extends TestCase { /** @var Disable */ protected $command; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->userManager = $this->createMock(IUserManager::class); diff --git a/tests/Core/Command/User/EnableTest.php b/tests/Core/Command/User/EnableTest.php index 9a3df13efe0..4a723ca1167 100644 --- a/tests/Core/Command/User/EnableTest.php +++ b/tests/Core/Command/User/EnableTest.php @@ -42,7 +42,7 @@ class EnableTest extends TestCase { /** @var Disable */ protected $command; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->userManager = $this->createMock(IUserManager::class); diff --git a/tests/Core/Command/User/LastSeenTest.php b/tests/Core/Command/User/LastSeenTest.php index cceefb98810..f6ee4796454 100644 --- a/tests/Core/Command/User/LastSeenTest.php +++ b/tests/Core/Command/User/LastSeenTest.php @@ -40,7 +40,7 @@ class LastSeenTest extends TestCase { /** @var \Symfony\Component\Console\Command\Command */ protected $command; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $userManager = $this->userManager = $this->getMockBuilder(IUserManager::class) diff --git a/tests/Core/Command/User/SettingTest.php b/tests/Core/Command/User/SettingTest.php index 784183c72c3..7d717343348 100644 --- a/tests/Core/Command/User/SettingTest.php +++ b/tests/Core/Command/User/SettingTest.php @@ -42,7 +42,7 @@ class SettingTest extends TestCase { /** @var \Symfony\Component\Console\Output\OutputInterface|\PHPUnit_Framework_MockObject_MockObject */ protected $consoleOutput; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->userManager = $this->getMockBuilder(IUserManager::class) diff --git a/tests/Core/Controller/AppPasswordControllerTest.php b/tests/Core/Controller/AppPasswordControllerTest.php index a7be7a90b09..00a4dd2b5fa 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() { + public function setUp(): void { parent::setUp(); $this->session = $this->createMock(ISession::class); diff --git a/tests/Core/Controller/AutoCompleteControllerTest.php b/tests/Core/Controller/AutoCompleteControllerTest.php index 8ff0542cb0b..ea62b502196 100644 --- a/tests/Core/Controller/AutoCompleteControllerTest.php +++ b/tests/Core/Controller/AutoCompleteControllerTest.php @@ -41,7 +41,7 @@ class AutoCompleteControllerTest extends TestCase { /** @var AutoCompleteController */ protected $controller; - protected function setUp() { + protected function setUp(): void { parent::setUp(); /** @var IRequest $request */ diff --git a/tests/Core/Controller/AvatarControllerTest.php b/tests/Core/Controller/AvatarControllerTest.php index 6f82607dc02..e43196824c1 100644 --- a/tests/Core/Controller/AvatarControllerTest.php +++ b/tests/Core/Controller/AvatarControllerTest.php @@ -79,7 +79,7 @@ class AvatarControllerTest extends \Test\TestCase { /** @var TimeFactory|\PHPUnit_Framework_MockObject_MockObject */ private $timeFactory; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->avatarManager = $this->getMockBuilder('OCP\IAvatarManager')->getMock(); @@ -121,7 +121,7 @@ class AvatarControllerTest extends \Test\TestCase { $this->avatarFile->method('getEtag')->willReturn('my etag'); } - public function tearDown() { + public function tearDown(): void { parent::tearDown(); } diff --git a/tests/Core/Controller/CSRFTokenControllerTest.php b/tests/Core/Controller/CSRFTokenControllerTest.php index a97f2eabc27..74eebf61749 100644 --- a/tests/Core/Controller/CSRFTokenControllerTest.php +++ b/tests/Core/Controller/CSRFTokenControllerTest.php @@ -44,7 +44,7 @@ class CSRFTokenControllerTest extends TestCase { /** @var CsrfTokenManager|PHPUnit_Framework_MockObject_MockObject */ private $tokenManager; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->request = $this->createMock(IRequest::class); diff --git a/tests/Core/Controller/ChangePasswordControllerTest.php b/tests/Core/Controller/ChangePasswordControllerTest.php index 55f05c975ed..ac9d9d37993 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() { + public 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 1401eac67d8..ebe43ba560f 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() { + public 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 c3ed740432c..d8ce67b18f1 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() { + public function setUp(): void { parent::setUp(); $this->request = $this->createMock(IRequest::class); diff --git a/tests/Core/Controller/ContactsMenuControllerTest.php b/tests/Core/Controller/ContactsMenuControllerTest.php index 92a185cf2ad..24f1adb10f2 100644 --- a/tests/Core/Controller/ContactsMenuControllerTest.php +++ b/tests/Core/Controller/ContactsMenuControllerTest.php @@ -47,7 +47,7 @@ class ContactsMenuControllerTest extends TestCase { /** @var ContactsMenuController */ private $controller; - protected function setUp() { + 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 faab89db40c..edee29cee57 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() { + public function setUp(): void { parent::setUp(); /** @var Factory|\PHPUnit_Framework_MockObject_MockObject $factory */ diff --git a/tests/Core/Controller/GuestAvatarControllerTest.php b/tests/Core/Controller/GuestAvatarControllerTest.php index f720478e499..dd8188b002f 100644 --- a/tests/Core/Controller/GuestAvatarControllerTest.php +++ b/tests/Core/Controller/GuestAvatarControllerTest.php @@ -48,7 +48,7 @@ class GuestAvatarControllerTest extends \Test\TestCase { /** * Sets up the test environment. */ - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->logger = $this->getMockBuilder(ILogger::class)->getMock(); diff --git a/tests/Core/Controller/JsControllerTest.php b/tests/Core/Controller/JsControllerTest.php index e05f5bf5ded..503e97d1c53 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() { + public 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 df1b12b9709..6a8db74b0d3 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() { + public 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/LostControllerTest.php b/tests/Core/Controller/LostControllerTest.php index 60b96a39081..27344102f0a 100644 --- a/tests/Core/Controller/LostControllerTest.php +++ b/tests/Core/Controller/LostControllerTest.php @@ -84,7 +84,7 @@ class LostControllerTest extends \Test\TestCase { /** @var IInitialStateService|\PHPUnit_Framework_MockObject_MockObject */ private $initialStateService; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->existingUser = $this->createMock(IUser::class); diff --git a/tests/Core/Controller/NavigationControllerTest.php b/tests/Core/Controller/NavigationControllerTest.php index 71730a8f8b9..ce77d1d0684 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() { + public 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 241c3b12477..d1e7f2c4350 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() { + public 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 7b66d32f61e..145fb93f63a 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() { + public function setUp(): void { parent::setUp(); $this->rootFolder = $this->createMock(IRootFolder::class); diff --git a/tests/Core/Controller/TwoFactorChallengeControllerTest.php b/tests/Core/Controller/TwoFactorChallengeControllerTest.php index 73b035a408c..40453db5729 100644 --- a/tests/Core/Controller/TwoFactorChallengeControllerTest.php +++ b/tests/Core/Controller/TwoFactorChallengeControllerTest.php @@ -61,7 +61,7 @@ class TwoFactorChallengeControllerTest extends TestCase { /** @var TwoFactorChallengeController|PHPUnit_Framework_MockObject_MockObject */ private $controller; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->request = $this->createMock(IRequest::class); diff --git a/tests/Core/Controller/UserControllerTest.php b/tests/Core/Controller/UserControllerTest.php index 7a089d5e57e..489433f10b8 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() { + public 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 cc084890e70..ebbf6509009 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() { + public function setUp(): void { parent::setUp(); $this->remoteWipe = $this->createMock(RemoteWipe::class); diff --git a/tests/Core/Middleware/TwoFactorMiddlewareTest.php b/tests/Core/Middleware/TwoFactorMiddlewareTest.php index 994599212f9..65db9733ab2 100644 --- a/tests/Core/Middleware/TwoFactorMiddlewareTest.php +++ b/tests/Core/Middleware/TwoFactorMiddlewareTest.php @@ -70,7 +70,7 @@ class TwoFactorMiddlewareTest extends TestCase { /** @var Controller */ private $controller; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->twoFactorManager = $this->getMockBuilder(Manager::class) diff --git a/tests/acceptance/features/core/NextcloudTestServerLocalApacheHelper.php b/tests/acceptance/features/core/NextcloudTestServerLocalApacheHelper.php index b552a86d250..a2dd6664c6f 100644 --- a/tests/acceptance/features/core/NextcloudTestServerLocalApacheHelper.php +++ b/tests/acceptance/features/core/NextcloudTestServerLocalApacheHelper.php @@ -72,7 +72,7 @@ class NextcloudTestServerLocalApacheHelper implements NextcloudTestServerHelper * @throws \Exception if the Nextcloud test server can not be reset or * started again. */ - public function setUp() { + public function setUp(): void { // Ensure that previous Apache server is not running (as cleanUp may not // have been called). $this->stopApacheServer(); diff --git a/tests/acceptance/features/core/NextcloudTestServerLocalBuiltInHelper.php b/tests/acceptance/features/core/NextcloudTestServerLocalBuiltInHelper.php index 722f580171a..1e74f5c66d1 100644 --- a/tests/acceptance/features/core/NextcloudTestServerLocalBuiltInHelper.php +++ b/tests/acceptance/features/core/NextcloudTestServerLocalBuiltInHelper.php @@ -76,7 +76,7 @@ class NextcloudTestServerLocalBuiltInHelper implements NextcloudTestServerHelper * @throws \Exception if the Nextcloud test server can not be reset or * started again. */ - public function setUp() { + public function setUp(): void { // Ensure that previous PHP server is not running (as cleanUp may not // have been called). $this->killPhpServer(); diff --git a/tests/lib/Accounts/AccountsManagerTest.php b/tests/lib/Accounts/AccountsManagerTest.php index 9d9a0e01583..3204eca8bbb 100644 --- a/tests/lib/Accounts/AccountsManagerTest.php +++ b/tests/lib/Accounts/AccountsManagerTest.php @@ -51,7 +51,7 @@ class AccountsManagerTest extends TestCase { /** @var string accounts table name */ private $table = 'accounts'; - public function setUp() { + public function setUp(): void { parent::setUp(); $this->eventDispatcher = $this->getMockBuilder('Symfony\Component\EventDispatcher\EventDispatcherInterface') ->disableOriginalConstructor()->getMock(); @@ -59,7 +59,7 @@ class AccountsManagerTest extends TestCase { $this->jobList = $this->getMockBuilder(IJobList::class)->getMock(); } - public function tearDown() { + public function tearDown(): void { parent::tearDown(); $query = $this->connection->getQueryBuilder(); $query->delete($this->table)->execute(); diff --git a/tests/lib/Accounts/HooksTest.php b/tests/lib/Accounts/HooksTest.php index 0534f2dba6b..1cffb1e265e 100644 --- a/tests/lib/Accounts/HooksTest.php +++ b/tests/lib/Accounts/HooksTest.php @@ -45,7 +45,7 @@ class HooksTest extends TestCase { /** @var Hooks | \PHPUnit_Framework_MockObject_MockObject */ private $hooks; - public function setUp() { + public function setUp(): void { parent::setUp(); $this->logger = $this->createMock(ILogger::class); diff --git a/tests/lib/Activity/ManagerTest.php b/tests/lib/Activity/ManagerTest.php index ba6b87ca9aa..fed4bceb6a7 100644 --- a/tests/lib/Activity/ManagerTest.php +++ b/tests/lib/Activity/ManagerTest.php @@ -44,7 +44,7 @@ class ManagerTest extends TestCase { /** @var IValidator|\PHPUnit_Framework_MockObject_MockObject */ protected $validator; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->request = $this->createMock(IRequest::class); diff --git a/tests/lib/App/AppManagerTest.php b/tests/lib/App/AppManagerTest.php index 66b210c4c13..0dc93174a67 100644 --- a/tests/lib/App/AppManagerTest.php +++ b/tests/lib/App/AppManagerTest.php @@ -97,7 +97,7 @@ class AppManagerTest extends TestCase { /** @var IAppManager */ protected $manager; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->userSession = $this->createMock(IUserSession::class); diff --git a/tests/lib/App/AppStore/Bundles/BundleBase.php b/tests/lib/App/AppStore/Bundles/BundleBase.php index 23af1cda927..6b03940c9a9 100644 --- a/tests/lib/App/AppStore/Bundles/BundleBase.php +++ b/tests/lib/App/AppStore/Bundles/BundleBase.php @@ -37,7 +37,7 @@ abstract class BundleBase extends TestCase { /** @var array */ protected $bundleAppIds; - public function setUp() { + public function setUp(): void { parent::setUp(); $this->l10n = $this->createMock(IL10N::class); $this->l10n->method('t') diff --git a/tests/lib/App/AppStore/Bundles/BundleFetcherTest.php b/tests/lib/App/AppStore/Bundles/BundleFetcherTest.php index 350f6654e08..27384953d3f 100644 --- a/tests/lib/App/AppStore/Bundles/BundleFetcherTest.php +++ b/tests/lib/App/AppStore/Bundles/BundleFetcherTest.php @@ -36,7 +36,7 @@ class BundleFetcherTest extends TestCase { /** @var BundleFetcher */ private $bundleFetcher; - public function setUp() { + public function setUp(): void { parent::setUp(); $this->l10n = $this->createMock(IL10N::class); diff --git a/tests/lib/App/AppStore/Bundles/CoreBundleTest.php b/tests/lib/App/AppStore/Bundles/CoreBundleTest.php index 235e2ec84fe..01a449c8093 100644 --- a/tests/lib/App/AppStore/Bundles/CoreBundleTest.php +++ b/tests/lib/App/AppStore/Bundles/CoreBundleTest.php @@ -24,7 +24,7 @@ namespace Test\App\AppStore\Bundles; use OC\App\AppStore\Bundles\CoreBundle; class CoreBundleTest extends BundleBase { - public function setUp() { + public function setUp(): void { parent::setUp(); $this->bundle = new CoreBundle($this->l10n); $this->bundleIdentifier = 'CoreBundle'; diff --git a/tests/lib/App/AppStore/Bundles/EducationBundleTest.php b/tests/lib/App/AppStore/Bundles/EducationBundleTest.php index 589f35db215..e3da7f1f660 100644 --- a/tests/lib/App/AppStore/Bundles/EducationBundleTest.php +++ b/tests/lib/App/AppStore/Bundles/EducationBundleTest.php @@ -24,7 +24,7 @@ namespace Test\App\AppStore\Bundles; use OC\App\AppStore\Bundles\EducationBundle; class EducationBundleTest extends BundleBase { - public function setUp() { + public function setUp(): void { parent::setUp(); $this->bundle = new EducationBundle($this->l10n); $this->bundleIdentifier = 'EducationBundle'; diff --git a/tests/lib/App/AppStore/Bundles/EnterpriseBundleTest.php b/tests/lib/App/AppStore/Bundles/EnterpriseBundleTest.php index b3182ff00c8..717c6151ed4 100644 --- a/tests/lib/App/AppStore/Bundles/EnterpriseBundleTest.php +++ b/tests/lib/App/AppStore/Bundles/EnterpriseBundleTest.php @@ -24,7 +24,7 @@ namespace Test\App\AppStore\Bundles; use OC\App\AppStore\Bundles\EnterpriseBundle; class EnterpriseBundleTest extends BundleBase { - public function setUp() { + public function setUp(): void { parent::setUp(); $this->bundle = new EnterpriseBundle($this->l10n); $this->bundleIdentifier = 'EnterpriseBundle'; diff --git a/tests/lib/App/AppStore/Bundles/GroupwareBundleTest.php b/tests/lib/App/AppStore/Bundles/GroupwareBundleTest.php index ccff5dcbd34..547e6e84ec8 100644 --- a/tests/lib/App/AppStore/Bundles/GroupwareBundleTest.php +++ b/tests/lib/App/AppStore/Bundles/GroupwareBundleTest.php @@ -24,7 +24,7 @@ namespace Test\App\AppStore\Bundles; use OC\App\AppStore\Bundles\GroupwareBundle; class GroupwareBundleTest extends BundleBase { - public function setUp() { + public function setUp(): void { parent::setUp(); $this->bundle = new GroupwareBundle($this->l10n); $this->bundleIdentifier = 'GroupwareBundle'; diff --git a/tests/lib/App/AppStore/Bundles/SocialSharingBundleTest.php b/tests/lib/App/AppStore/Bundles/SocialSharingBundleTest.php index 3d8bccf1935..7f0e0f49302 100644 --- a/tests/lib/App/AppStore/Bundles/SocialSharingBundleTest.php +++ b/tests/lib/App/AppStore/Bundles/SocialSharingBundleTest.php @@ -24,7 +24,7 @@ namespace Test\App\AppStore\Bundles; use OC\App\AppStore\Bundles\SocialSharingBundle; class SocialSharingBundleTest extends BundleBase { - public function setUp() { + public function setUp(): void { parent::setUp(); $this->bundle = new SocialSharingBundle($this->l10n); $this->bundleIdentifier = 'SocialSharingBundle'; diff --git a/tests/lib/App/AppStore/Fetcher/AppFetcherTest.php b/tests/lib/App/AppStore/Fetcher/AppFetcherTest.php index 214f652742b..cf19b5aa355 100644 --- a/tests/lib/App/AppStore/Fetcher/AppFetcherTest.php +++ b/tests/lib/App/AppStore/Fetcher/AppFetcherTest.php @@ -59,7 +59,7 @@ class AppFetcherTest extends TestCase { EOD; - public function setUp() { + public function setUp(): void { parent::setUp(); /** @var Factory|PHPUnit_Framework_MockObject_MockObject $factory */ diff --git a/tests/lib/App/AppStore/Fetcher/CategoryFetcherTest.php b/tests/lib/App/AppStore/Fetcher/CategoryFetcherTest.php index f4b8c320c51..753a1bf88d3 100644 --- a/tests/lib/App/AppStore/Fetcher/CategoryFetcherTest.php +++ b/tests/lib/App/AppStore/Fetcher/CategoryFetcherTest.php @@ -24,7 +24,7 @@ namespace Test\App\AppStore\Fetcher; use OC\App\AppStore\Fetcher\CategoryFetcher; class CategoryFetcherTest extends FetcherBase { - public function setUp() { + public function setUp(): void { parent::setUp(); $this->fileName = 'categories.json'; $this->endpoint = 'https://apps.nextcloud.com/api/v1/categories.json'; diff --git a/tests/lib/App/AppStore/Fetcher/FetcherBase.php b/tests/lib/App/AppStore/Fetcher/FetcherBase.php index 851773a6506..4f614d33101 100644 --- a/tests/lib/App/AppStore/Fetcher/FetcherBase.php +++ b/tests/lib/App/AppStore/Fetcher/FetcherBase.php @@ -56,7 +56,7 @@ abstract class FetcherBase extends TestCase { /** @var string */ protected $endpoint; - public function setUp() { + public function setUp(): void { parent::setUp(); $this->appDataFactory = $this->createMock(Factory::class); $this->appData = $this->createMock(AppData::class); diff --git a/tests/lib/App/AppStore/Version/VersionParserTest.php b/tests/lib/App/AppStore/Version/VersionParserTest.php index ebfa98ade39..ea30f40d821 100644 --- a/tests/lib/App/AppStore/Version/VersionParserTest.php +++ b/tests/lib/App/AppStore/Version/VersionParserTest.php @@ -29,7 +29,7 @@ class VersionParserTest extends TestCase { /** @var VersionParser */ private $versionParser; - public function setUp() { + public function setUp(): void { parent::setUp(); $this->versionParser = new VersionParser(); } diff --git a/tests/lib/App/CodeChecker/InfoCheckerTest.php b/tests/lib/App/CodeChecker/InfoCheckerTest.php index 3128f902f47..531066a54c6 100644 --- a/tests/lib/App/CodeChecker/InfoCheckerTest.php +++ b/tests/lib/App/CodeChecker/InfoCheckerTest.php @@ -29,7 +29,7 @@ class InfoCheckerTest extends TestCase { /** @var InfoChecker */ protected $infoChecker; - public static function setUpBeforeClass() { + public static function setUpBeforeClass(): void { \OC::$APPSROOTS[] = [ 'path' => \OC::$SERVERROOT . '/tests/apps', 'url' => '/apps-test', @@ -37,12 +37,12 @@ class InfoCheckerTest extends TestCase { ]; } - public static function tearDownAfterClass() { + public static function tearDownAfterClass(): void { // remove last element array_pop(\OC::$APPSROOTS); } - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->infoChecker = new InfoChecker(); } diff --git a/tests/lib/App/CompareVersionTest.php b/tests/lib/App/CompareVersionTest.php index 60309fdeae4..af04691f276 100644 --- a/tests/lib/App/CompareVersionTest.php +++ b/tests/lib/App/CompareVersionTest.php @@ -33,7 +33,7 @@ class CompareVersionTest extends TestCase { /** @var CompareVersion */ private $compare; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->compare = new CompareVersion(); diff --git a/tests/lib/App/DependencyAnalyzerTest.php b/tests/lib/App/DependencyAnalyzerTest.php index 081f6d767db..d6848971a84 100644 --- a/tests/lib/App/DependencyAnalyzerTest.php +++ b/tests/lib/App/DependencyAnalyzerTest.php @@ -26,7 +26,7 @@ class DependencyAnalyzerTest extends TestCase { /** @var DependencyAnalyzer */ private $analyser; - public function setUp() { + public function setUp(): void { $this->platformMock = $this->getMockBuilder(Platform::class) ->disableOriginalConstructor() ->getMock(); diff --git a/tests/lib/App/InfoParserTest.php b/tests/lib/App/InfoParserTest.php index b72a869e02c..8de0f4cfd4f 100644 --- a/tests/lib/App/InfoParserTest.php +++ b/tests/lib/App/InfoParserTest.php @@ -16,7 +16,7 @@ class InfoParserTest extends TestCase { /** @var OC\Cache\CappedMemoryCache */ private static $cache; - public static function setUpBeforeClass() { + public static function setUpBeforeClass(): void { self::$cache = new OC\Cache\CappedMemoryCache(); } diff --git a/tests/lib/AppConfigTest.php b/tests/lib/AppConfigTest.php index 9456fe4c232..87f8142d4b9 100644 --- a/tests/lib/AppConfigTest.php +++ b/tests/lib/AppConfigTest.php @@ -26,7 +26,7 @@ class AppConfigTest extends TestCase { protected $originalConfig; - public function setUp() { + public function setUp(): void { parent::setUp(); $this->connection = \OC::$server->getDatabaseConnection(); @@ -111,7 +111,7 @@ class AppConfigTest extends TestCase { ])->execute(); } - public function tearDown() { + public function tearDown(): void { $sql = $this->connection->getQueryBuilder(); $sql->delete('appconfig'); $sql->execute(); diff --git a/tests/lib/AppFramework/AppTest.php b/tests/lib/AppFramework/AppTest.php index cd3e7c47ad6..ccc694942a1 100644 --- a/tests/lib/AppFramework/AppTest.php +++ b/tests/lib/AppFramework/AppTest.php @@ -56,7 +56,7 @@ class AppTest extends \Test\TestCase { private $controllerMethod; private $appPath; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->container = new \OC\AppFramework\DependencyInjection\DIContainer('test', array()); @@ -121,7 +121,7 @@ class AppTest extends \Test\TestCase { } - protected function tearDown() { + protected function tearDown(): void { rrmdir($this->appPath); parent::tearDown(); } diff --git a/tests/lib/AppFramework/Controller/AuthPublicShareControllerTest.php b/tests/lib/AppFramework/Controller/AuthPublicShareControllerTest.php index 30da40d36b4..8eb76d3cb27 100644 --- a/tests/lib/AppFramework/Controller/AuthPublicShareControllerTest.php +++ b/tests/lib/AppFramework/Controller/AuthPublicShareControllerTest.php @@ -50,7 +50,7 @@ class AuthPublicShareControllerTest extends \Test\TestCase { private $controller; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->request = $this->createMock(IRequest::class); diff --git a/tests/lib/AppFramework/Controller/ControllerTest.php b/tests/lib/AppFramework/Controller/ControllerTest.php index 7831b44b632..d239cacf633 100644 --- a/tests/lib/AppFramework/Controller/ControllerTest.php +++ b/tests/lib/AppFramework/Controller/ControllerTest.php @@ -62,7 +62,7 @@ class ControllerTest extends \Test\TestCase { private $controller; private $app; - protected function setUp(){ + protected function setUp(): void { parent::setUp(); $request = new Request( diff --git a/tests/lib/AppFramework/Controller/PublicShareControllerTest.php b/tests/lib/AppFramework/Controller/PublicShareControllerTest.php index f20f996d5a3..318647ca844 100644 --- a/tests/lib/AppFramework/Controller/PublicShareControllerTest.php +++ b/tests/lib/AppFramework/Controller/PublicShareControllerTest.php @@ -47,7 +47,7 @@ class PublicShareControllerTest extends \Test\TestCase { private $controller; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->request = $this->createMock(IRequest::class); diff --git a/tests/lib/AppFramework/Db/EntityTest.php b/tests/lib/AppFramework/Db/EntityTest.php index a49440949e3..3eb9f6eef51 100644 --- a/tests/lib/AppFramework/Db/EntityTest.php +++ b/tests/lib/AppFramework/Db/EntityTest.php @@ -66,7 +66,7 @@ class EntityTest extends \Test\TestCase { private $entity; - protected function setUp(){ + protected function setUp(): void { parent::setUp(); $this->entity = new TestEntity(); } diff --git a/tests/lib/AppFramework/Db/MapperTest.php b/tests/lib/AppFramework/Db/MapperTest.php index 8ca80fe11ca..a69980fbb26 100644 --- a/tests/lib/AppFramework/Db/MapperTest.php +++ b/tests/lib/AppFramework/Db/MapperTest.php @@ -60,7 +60,7 @@ class MapperTest extends MapperTestUtility { */ private $mapper; - protected function setUp(){ + protected function setUp(): void { parent::setUp(); $this->mapper = new ExampleMapper($this->db); } diff --git a/tests/lib/AppFramework/Db/MapperTestUtility.php b/tests/lib/AppFramework/Db/MapperTestUtility.php index 71c21a06632..83156a3932b 100644 --- a/tests/lib/AppFramework/Db/MapperTestUtility.php +++ b/tests/lib/AppFramework/Db/MapperTestUtility.php @@ -40,7 +40,7 @@ abstract class MapperTestUtility extends \Test\TestCase { * Run this function before the actual test to either set or initialize the * db. After this the db can be accessed by using $this->db */ - protected function setUp(){ + protected function setUp(): void { parent::setUp(); $this->db = $this->getMockBuilder( diff --git a/tests/lib/AppFramework/Db/QBMapperTest.php b/tests/lib/AppFramework/Db/QBMapperTest.php index 279c95afaeb..da4102396de 100644 --- a/tests/lib/AppFramework/Db/QBMapperTest.php +++ b/tests/lib/AppFramework/Db/QBMapperTest.php @@ -105,7 +105,7 @@ class QBMapperTest extends \Test\TestCase { /** * @throws \ReflectionException */ - protected function setUp() { + protected function setUp(): void { $this->db = $this->getMockBuilder(IDBConnection::class) ->disableOriginalConstructor() diff --git a/tests/lib/AppFramework/DependencyInjection/DIContainerTest.php b/tests/lib/AppFramework/DependencyInjection/DIContainerTest.php index 03c8265f2c9..95d368a448e 100644 --- a/tests/lib/AppFramework/DependencyInjection/DIContainerTest.php +++ b/tests/lib/AppFramework/DependencyInjection/DIContainerTest.php @@ -41,7 +41,7 @@ class DIContainerTest extends \Test\TestCase { /** @var DIContainer|\PHPUnit_Framework_MockObject_MockObject */ private $container; - protected function setUp(){ + protected function setUp(): void { parent::setUp(); $this->container = $this->getMockBuilder(DIContainer::class) ->setMethods(['isAdminUser']) diff --git a/tests/lib/AppFramework/DependencyInjection/DIIntergrationTests.php b/tests/lib/AppFramework/DependencyInjection/DIIntergrationTests.php index d3d3f73e872..a0783474df3 100644 --- a/tests/lib/AppFramework/DependencyInjection/DIIntergrationTests.php +++ b/tests/lib/AppFramework/DependencyInjection/DIIntergrationTests.php @@ -56,7 +56,7 @@ class DIIntergrationTests extends TestCase { /** @var ServerContainer */ private $server; - public function setUp() { + public function setUp(): void { parent::setUp(); $this->server = new ServerContainer(); diff --git a/tests/lib/AppFramework/Http/ContentSecurityPolicyTest.php b/tests/lib/AppFramework/Http/ContentSecurityPolicyTest.php index b6163e90386..1f687b1f7cc 100644 --- a/tests/lib/AppFramework/Http/ContentSecurityPolicyTest.php +++ b/tests/lib/AppFramework/Http/ContentSecurityPolicyTest.php @@ -21,7 +21,7 @@ class ContentSecurityPolicyTest extends \Test\TestCase { /** @var ContentSecurityPolicy */ private $contentSecurityPolicy; - public function setUp() { + public function setUp(): void { parent::setUp(); $this->contentSecurityPolicy = new ContentSecurityPolicy(); } diff --git a/tests/lib/AppFramework/Http/DataResponseTest.php b/tests/lib/AppFramework/Http/DataResponseTest.php index 6f81e0d56b4..b629c6d385e 100644 --- a/tests/lib/AppFramework/Http/DataResponseTest.php +++ b/tests/lib/AppFramework/Http/DataResponseTest.php @@ -34,7 +34,7 @@ class DataResponseTest extends \Test\TestCase { */ private $response; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->response = new DataResponse(); } diff --git a/tests/lib/AppFramework/Http/DispatcherTest.php b/tests/lib/AppFramework/Http/DispatcherTest.php index 404c94abdbd..1c4dc067b5d 100644 --- a/tests/lib/AppFramework/Http/DispatcherTest.php +++ b/tests/lib/AppFramework/Http/DispatcherTest.php @@ -87,7 +87,7 @@ class DispatcherTest extends \Test\TestCase { private $http; private $reflector; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->controllerMethod = 'test'; diff --git a/tests/lib/AppFramework/Http/DownloadResponseTest.php b/tests/lib/AppFramework/Http/DownloadResponseTest.php index 97c7ab75ed9..5f816eaeb76 100644 --- a/tests/lib/AppFramework/Http/DownloadResponseTest.php +++ b/tests/lib/AppFramework/Http/DownloadResponseTest.php @@ -38,7 +38,7 @@ class DownloadResponseTest extends \Test\TestCase { */ protected $response; - protected function setUp(){ + protected function setUp(): void { parent::setUp(); $this->response = new ChildDownloadResponse('file', 'content'); } diff --git a/tests/lib/AppFramework/Http/EmptyContentSecurityPolicyTest.php b/tests/lib/AppFramework/Http/EmptyContentSecurityPolicyTest.php index d9bdfccf60b..86de705a80c 100644 --- a/tests/lib/AppFramework/Http/EmptyContentSecurityPolicyTest.php +++ b/tests/lib/AppFramework/Http/EmptyContentSecurityPolicyTest.php @@ -21,7 +21,7 @@ class EmptyContentSecurityPolicyTest extends \Test\TestCase { /** @var EmptyContentSecurityPolicy */ private $contentSecurityPolicy; - public function setUp() { + public function setUp(): void { parent::setUp(); $this->contentSecurityPolicy = new EmptyContentSecurityPolicy(); } diff --git a/tests/lib/AppFramework/Http/EmptyFeaturePolicyTest.php b/tests/lib/AppFramework/Http/EmptyFeaturePolicyTest.php index 9150503c632..0321d700cd7 100644 --- a/tests/lib/AppFramework/Http/EmptyFeaturePolicyTest.php +++ b/tests/lib/AppFramework/Http/EmptyFeaturePolicyTest.php @@ -31,7 +31,7 @@ class EmptyFeaturePolicyTest extends \Test\TestCase { /** @var EmptyFeaturePolicy */ private $policy; - public function setUp() { + public function setUp(): void { parent::setUp(); $this->policy = new EmptyFeaturePolicy(); } diff --git a/tests/lib/AppFramework/Http/FeaturePolicyTest.php b/tests/lib/AppFramework/Http/FeaturePolicyTest.php index 7c2cc3fa6d5..45d7ff0c558 100644 --- a/tests/lib/AppFramework/Http/FeaturePolicyTest.php +++ b/tests/lib/AppFramework/Http/FeaturePolicyTest.php @@ -31,7 +31,7 @@ class FeaturePolicyTest extends \Test\TestCase { /** @var EmptyFeaturePolicy */ private $policy; - public function setUp() { + public function setUp(): void { parent::setUp(); $this->policy = new FeaturePolicy(); } diff --git a/tests/lib/AppFramework/Http/FileDisplayResponseTest.php b/tests/lib/AppFramework/Http/FileDisplayResponseTest.php index 2c91289a5c9..d7c8b384bf5 100644 --- a/tests/lib/AppFramework/Http/FileDisplayResponseTest.php +++ b/tests/lib/AppFramework/Http/FileDisplayResponseTest.php @@ -34,7 +34,7 @@ class FileDisplayResponseTest extends \Test\TestCase { /** @var FileDisplayResponse */ private $response; - public function setup() { + public function setUp(): void { $this->file = $this->getMockBuilder('OCP\Files\File') ->getMock(); diff --git a/tests/lib/AppFramework/Http/HttpTest.php b/tests/lib/AppFramework/Http/HttpTest.php index 0a13e1e11e5..79c03ce1ab0 100644 --- a/tests/lib/AppFramework/Http/HttpTest.php +++ b/tests/lib/AppFramework/Http/HttpTest.php @@ -34,7 +34,7 @@ class HttpTest extends \Test\TestCase { */ private $http; - protected function setUp(){ + protected function setUp(): void { parent::setUp(); $this->server = array(); diff --git a/tests/lib/AppFramework/Http/JSONResponseTest.php b/tests/lib/AppFramework/Http/JSONResponseTest.php index a74bd67d1f0..4981313c32a 100644 --- a/tests/lib/AppFramework/Http/JSONResponseTest.php +++ b/tests/lib/AppFramework/Http/JSONResponseTest.php @@ -36,7 +36,7 @@ class JSONResponseTest extends \Test\TestCase { */ private $json; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->json = new JSONResponse(); } diff --git a/tests/lib/AppFramework/Http/RedirectResponseTest.php b/tests/lib/AppFramework/Http/RedirectResponseTest.php index 218f748a88b..fc24f323c6a 100644 --- a/tests/lib/AppFramework/Http/RedirectResponseTest.php +++ b/tests/lib/AppFramework/Http/RedirectResponseTest.php @@ -33,7 +33,7 @@ class RedirectResponseTest extends \Test\TestCase { */ protected $response; - protected function setUp(){ + protected function setUp(): void { parent::setUp(); $this->response = new RedirectResponse('/url'); } diff --git a/tests/lib/AppFramework/Http/RequestTest.php b/tests/lib/AppFramework/Http/RequestTest.php index 2ad660405f3..7ca09cf33da 100644 --- a/tests/lib/AppFramework/Http/RequestTest.php +++ b/tests/lib/AppFramework/Http/RequestTest.php @@ -31,7 +31,7 @@ class RequestTest extends \Test\TestCase { /** @var CsrfTokenManager */ protected $csrfTokenManager; - protected function setUp() { + protected function setUp(): void { parent::setUp(); if (in_array('fakeinput', stream_get_wrappers())) { @@ -45,7 +45,7 @@ class RequestTest extends \Test\TestCase { ->disableOriginalConstructor()->getMock(); } - protected function tearDown() { + protected function tearDown(): void { stream_wrapper_unregister('fakeinput'); parent::tearDown(); } diff --git a/tests/lib/AppFramework/Http/ResponseTest.php b/tests/lib/AppFramework/Http/ResponseTest.php index 64b9566f8e6..3d76d24496d 100644 --- a/tests/lib/AppFramework/Http/ResponseTest.php +++ b/tests/lib/AppFramework/Http/ResponseTest.php @@ -35,7 +35,7 @@ class ResponseTest extends \Test\TestCase { */ private $childResponse; - protected function setUp(){ + protected function setUp(): void { parent::setUp(); $this->childResponse = new Response(); } diff --git a/tests/lib/AppFramework/Http/StreamResponseTest.php b/tests/lib/AppFramework/Http/StreamResponseTest.php index ef9a37aa81b..ef7132013b6 100644 --- a/tests/lib/AppFramework/Http/StreamResponseTest.php +++ b/tests/lib/AppFramework/Http/StreamResponseTest.php @@ -33,7 +33,7 @@ class StreamResponseTest extends \Test\TestCase { /** @var IOutput */ private $output; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->output = $this->getMockBuilder('OCP\\AppFramework\\Http\\IOutput') ->disableOriginalConstructor() diff --git a/tests/lib/AppFramework/Http/TemplateResponseTest.php b/tests/lib/AppFramework/Http/TemplateResponseTest.php index b5586222257..6672b4d0c1e 100644 --- a/tests/lib/AppFramework/Http/TemplateResponseTest.php +++ b/tests/lib/AppFramework/Http/TemplateResponseTest.php @@ -33,7 +33,7 @@ class TemplateResponseTest extends \Test\TestCase { */ private $tpl; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->tpl = new TemplateResponse('app', 'home'); diff --git a/tests/lib/AppFramework/Middleware/AdditionalScriptsMiddlewareTest.php b/tests/lib/AppFramework/Middleware/AdditionalScriptsMiddlewareTest.php index 7f817e03c1e..3174971032b 100644 --- a/tests/lib/AppFramework/Middleware/AdditionalScriptsMiddlewareTest.php +++ b/tests/lib/AppFramework/Middleware/AdditionalScriptsMiddlewareTest.php @@ -47,7 +47,7 @@ class AdditionalScriptsMiddlewareTest extends \Test\TestCase { /** @var AdditionalScriptsMiddleware */ private $middleWare; - public function setUp() { + public function setUp(): void { parent::setUp(); $this->dispatcher = $this->createMock(EventDispatcherInterface::class); diff --git a/tests/lib/AppFramework/Middleware/MiddlewareDispatcherTest.php b/tests/lib/AppFramework/Middleware/MiddlewareDispatcherTest.php index e38aa4525e3..965637cb4c4 100644 --- a/tests/lib/AppFramework/Middleware/MiddlewareDispatcherTest.php +++ b/tests/lib/AppFramework/Middleware/MiddlewareDispatcherTest.php @@ -113,7 +113,7 @@ class MiddlewareDispatcherTest extends \Test\TestCase { */ private $dispatcher; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->dispatcher = new MiddlewareDispatcher(); diff --git a/tests/lib/AppFramework/Middleware/MiddlewareTest.php b/tests/lib/AppFramework/Middleware/MiddlewareTest.php index 8f9c60b65ff..4ac6fa647f7 100644 --- a/tests/lib/AppFramework/Middleware/MiddlewareTest.php +++ b/tests/lib/AppFramework/Middleware/MiddlewareTest.php @@ -43,7 +43,7 @@ class MiddlewareTest extends \Test\TestCase { /** @var Response */ private $response; - protected function setUp(){ + protected function setUp(): void { parent::setUp(); $this->middleware = new ChildMiddleware(); diff --git a/tests/lib/AppFramework/Middleware/OCSMiddlewareTest.php b/tests/lib/AppFramework/Middleware/OCSMiddlewareTest.php index cca3b4aecca..e001e48acd2 100644 --- a/tests/lib/AppFramework/Middleware/OCSMiddlewareTest.php +++ b/tests/lib/AppFramework/Middleware/OCSMiddlewareTest.php @@ -42,7 +42,7 @@ class OCSMiddlewareTest extends \Test\TestCase { */ private $request; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->request = $this->getMockBuilder(IRequest::class) diff --git a/tests/lib/AppFramework/Middleware/PublicShare/PublicShareMiddlewareTest.php b/tests/lib/AppFramework/Middleware/PublicShare/PublicShareMiddlewareTest.php index 4ad90b6e874..82f354d127d 100644 --- a/tests/lib/AppFramework/Middleware/PublicShare/PublicShareMiddlewareTest.php +++ b/tests/lib/AppFramework/Middleware/PublicShare/PublicShareMiddlewareTest.php @@ -49,7 +49,7 @@ class PublicShareMiddlewareTest extends \Test\TestCase { private $middleware; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->request = $this->createMock(IRequest::class); diff --git a/tests/lib/AppFramework/Middleware/Security/BruteForceMiddlewareTest.php b/tests/lib/AppFramework/Middleware/Security/BruteForceMiddlewareTest.php index ae2345764ff..6d464a66177 100644 --- a/tests/lib/AppFramework/Middleware/Security/BruteForceMiddlewareTest.php +++ b/tests/lib/AppFramework/Middleware/Security/BruteForceMiddlewareTest.php @@ -40,7 +40,7 @@ class BruteForceMiddlewareTest extends TestCase { /** @var BruteForceMiddleware */ private $bruteForceMiddleware; - public function setUp() { + public function setUp(): void { parent::setUp(); $this->reflector = $this->createMock(ControllerMethodReflector::class); diff --git a/tests/lib/AppFramework/Middleware/Security/CORSMiddlewareTest.php b/tests/lib/AppFramework/Middleware/Security/CORSMiddlewareTest.php index 0fab8803073..e022770a8cf 100644 --- a/tests/lib/AppFramework/Middleware/Security/CORSMiddlewareTest.php +++ b/tests/lib/AppFramework/Middleware/Security/CORSMiddlewareTest.php @@ -34,7 +34,7 @@ class CORSMiddlewareTest extends \Test\TestCase { /** @var Controller */ private $controller; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->reflector = new ControllerMethodReflector(); $this->session = $this->createMock(Session::class); diff --git a/tests/lib/AppFramework/Middleware/Security/CSPMiddlewareTest.php b/tests/lib/AppFramework/Middleware/Security/CSPMiddlewareTest.php index 9f2b4e399fb..6d089e3880d 100644 --- a/tests/lib/AppFramework/Middleware/Security/CSPMiddlewareTest.php +++ b/tests/lib/AppFramework/Middleware/Security/CSPMiddlewareTest.php @@ -48,7 +48,7 @@ class CSPMiddlewareTest extends \Test\TestCase { /** @var ContentSecurityPolicyNonceManager|MockObject */ private $cspNonceManager; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->controller = $this->createMock(Controller::class); diff --git a/tests/lib/AppFramework/Middleware/Security/FeaturePolicyMiddlewareTest.php b/tests/lib/AppFramework/Middleware/Security/FeaturePolicyMiddlewareTest.php index d2ab8d05919..e136d783616 100644 --- a/tests/lib/AppFramework/Middleware/Security/FeaturePolicyMiddlewareTest.php +++ b/tests/lib/AppFramework/Middleware/Security/FeaturePolicyMiddlewareTest.php @@ -44,7 +44,7 @@ class FeaturePolicyMiddlewareTest extends \Test\TestCase { /** @var FeaturePolicyManager|MockObject */ private $manager; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->controller = $this->createMock(Controller::class); diff --git a/tests/lib/AppFramework/Middleware/Security/PasswordConfirmationMiddlewareTest.php b/tests/lib/AppFramework/Middleware/Security/PasswordConfirmationMiddlewareTest.php index c981e840d70..7a64b6cbcad 100644 --- a/tests/lib/AppFramework/Middleware/Security/PasswordConfirmationMiddlewareTest.php +++ b/tests/lib/AppFramework/Middleware/Security/PasswordConfirmationMiddlewareTest.php @@ -49,7 +49,7 @@ class PasswordConfirmationMiddlewareTest extends TestCase { /** @var ITimeFactory|\PHPUnit_Framework_MockObject_MockObject */ private $timeFactory; - protected function setUp() { + protected function setUp(): void { $this->reflector = new ControllerMethodReflector(); $this->session = $this->createMock(ISession::class); $this->userSession = $this->createMock(IUserSession::class); diff --git a/tests/lib/AppFramework/Middleware/Security/RateLimitingMiddlewareTest.php b/tests/lib/AppFramework/Middleware/Security/RateLimitingMiddlewareTest.php index 1317a07447d..89e396fcee3 100644 --- a/tests/lib/AppFramework/Middleware/Security/RateLimitingMiddlewareTest.php +++ b/tests/lib/AppFramework/Middleware/Security/RateLimitingMiddlewareTest.php @@ -45,7 +45,7 @@ class RateLimitingMiddlewareTest extends TestCase { /** @var RateLimitingMiddleware */ private $rateLimitingMiddleware; - public function setUp() { + public function setUp(): void { parent::setUp(); $this->request = $this->createMock(IRequest::class); diff --git a/tests/lib/AppFramework/Middleware/Security/SameSiteCookieMiddlewareTest.php b/tests/lib/AppFramework/Middleware/Security/SameSiteCookieMiddlewareTest.php index c92c131780e..c30d2760886 100644 --- a/tests/lib/AppFramework/Middleware/Security/SameSiteCookieMiddlewareTest.php +++ b/tests/lib/AppFramework/Middleware/Security/SameSiteCookieMiddlewareTest.php @@ -43,7 +43,7 @@ class SameSiteCookieMiddlewareTest extends TestCase { /** @var ControllerMethodReflector|\PHPUnit_Framework_MockObject_MockObject */ private $reflector; - public function setUp() { + public function setUp(): void { parent::setUp(); $this->request = $this->createMock(Request::class); diff --git a/tests/lib/AppFramework/Middleware/Security/SecurityMiddlewareTest.php b/tests/lib/AppFramework/Middleware/Security/SecurityMiddlewareTest.php index 00bb1a0bb3c..26d09af9003 100644 --- a/tests/lib/AppFramework/Middleware/Security/SecurityMiddlewareTest.php +++ b/tests/lib/AppFramework/Middleware/Security/SecurityMiddlewareTest.php @@ -77,7 +77,7 @@ class SecurityMiddlewareTest extends \Test\TestCase { /** @var IL10N|\PHPUnit_Framework_MockObject_MockObject */ private $l10n; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->controller = $this->createMock(Controller::class); diff --git a/tests/lib/AppFramework/Middleware/SessionMiddlewareTest.php b/tests/lib/AppFramework/Middleware/SessionMiddlewareTest.php index 2cd61c73c71..db2a9d5b625 100644 --- a/tests/lib/AppFramework/Middleware/SessionMiddlewareTest.php +++ b/tests/lib/AppFramework/Middleware/SessionMiddlewareTest.php @@ -26,7 +26,7 @@ class SessionMiddlewareTest extends \Test\TestCase { /** @var Controller */ private $controller; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->reflector = new ControllerMethodReflector(); diff --git a/tests/lib/AppFramework/Utility/SimpleContainerTest.php b/tests/lib/AppFramework/Utility/SimpleContainerTest.php index b2f6c6ad8d0..cfd55d8d6d8 100644 --- a/tests/lib/AppFramework/Utility/SimpleContainerTest.php +++ b/tests/lib/AppFramework/Utility/SimpleContainerTest.php @@ -61,7 +61,7 @@ class SimpleContainerTest extends \Test\TestCase { private $container; - public function setUp() { + public function setUp(): void { $this->container = new SimpleContainer(); } diff --git a/tests/lib/Authentication/Listeners/RemoteWipeActivityListenerTest.php b/tests/lib/Authentication/Listeners/RemoteWipeActivityListenerTest.php index 87a7b030273..47d1d53a74c 100644 --- a/tests/lib/Authentication/Listeners/RemoteWipeActivityListenerTest.php +++ b/tests/lib/Authentication/Listeners/RemoteWipeActivityListenerTest.php @@ -47,7 +47,7 @@ class RemoteWipeActivityListenerTests extends TestCase { /** @var IEventListener */ private $listener; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->activityManager = $this->createMock(IActivityManager::class); diff --git a/tests/lib/Authentication/Listeners/RemoteWipeEmailListenerTest.php b/tests/lib/Authentication/Listeners/RemoteWipeEmailListenerTest.php index ea7740057ba..3d47b8d4a03 100644 --- a/tests/lib/Authentication/Listeners/RemoteWipeEmailListenerTest.php +++ b/tests/lib/Authentication/Listeners/RemoteWipeEmailListenerTest.php @@ -60,7 +60,7 @@ class RemoteWipeEmailListenerTest extends TestCase { /** @var IEventListener */ private $listener; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->mailer = $this->createMock(IMailer::class); diff --git a/tests/lib/Authentication/Listeners/RemoteWipeNotificationsListenerTest.php b/tests/lib/Authentication/Listeners/RemoteWipeNotificationsListenerTest.php index e3e526e401b..79d362410ae 100644 --- a/tests/lib/Authentication/Listeners/RemoteWipeNotificationsListenerTest.php +++ b/tests/lib/Authentication/Listeners/RemoteWipeNotificationsListenerTest.php @@ -47,7 +47,7 @@ class RemoteWipeNotificationListenerTests extends TestCase { /** @var IEventListener */ private $listener; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->notificationManager = $this->createMock(INotificationManager::class); diff --git a/tests/lib/Authentication/Login/ALoginCommandTest.php b/tests/lib/Authentication/Login/ALoginCommandTest.php index ec3b324b2ce..f09b649ffcb 100644 --- a/tests/lib/Authentication/Login/ALoginCommandTest.php +++ b/tests/lib/Authentication/Login/ALoginCommandTest.php @@ -56,7 +56,7 @@ abstract class ALoginCommandTest extends TestCase { /** @var ALoginCommand */ protected $cmd; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->request = $this->createMock(IRequest::class); diff --git a/tests/lib/Authentication/Login/ClearLostPasswordTokensCommandTest.php b/tests/lib/Authentication/Login/ClearLostPasswordTokensCommandTest.php index 05078cde930..0d3b7acfa2d 100644 --- a/tests/lib/Authentication/Login/ClearLostPasswordTokensCommandTest.php +++ b/tests/lib/Authentication/Login/ClearLostPasswordTokensCommandTest.php @@ -36,7 +36,7 @@ class ClearLostPasswordTokensCommandTest extends ALoginCommandTest { /** @var IConfig|MockObject */ private $config; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->config = $this->createMock(IConfig::class); diff --git a/tests/lib/Authentication/Login/CompleteLoginCommandTest.php b/tests/lib/Authentication/Login/CompleteLoginCommandTest.php index bf312e7f4e3..e611611dd7c 100644 --- a/tests/lib/Authentication/Login/CompleteLoginCommandTest.php +++ b/tests/lib/Authentication/Login/CompleteLoginCommandTest.php @@ -34,7 +34,7 @@ class CompleteLoginCommandTest extends ALoginCommandTest { /** @var Session|MockObject */ private $session; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->session = $this->createMock(Session::class); diff --git a/tests/lib/Authentication/Login/CreateSessionTokenCommandTest.php b/tests/lib/Authentication/Login/CreateSessionTokenCommandTest.php index 11d2ea36b27..82ae90015a4 100644 --- a/tests/lib/Authentication/Login/CreateSessionTokenCommandTest.php +++ b/tests/lib/Authentication/Login/CreateSessionTokenCommandTest.php @@ -39,7 +39,7 @@ class CreateSessionTokenCommandTest extends ALoginCommandTest { /** @var Session|MockObject */ private $userSession; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->config = $this->createMock(IConfig::class); diff --git a/tests/lib/Authentication/Login/EmailLoginCommandTest.php b/tests/lib/Authentication/Login/EmailLoginCommandTest.php index c72048d8877..5217a4d0080 100644 --- a/tests/lib/Authentication/Login/EmailLoginCommandTest.php +++ b/tests/lib/Authentication/Login/EmailLoginCommandTest.php @@ -35,7 +35,7 @@ class EmailLoginCommandTest extends ALoginCommandTest { /** @var IUserManager|MockObject */ private $userManager; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->userManager = $this->createMock(IUserManager::class); diff --git a/tests/lib/Authentication/Login/FinishRememberedLoginCommandTest.php b/tests/lib/Authentication/Login/FinishRememberedLoginCommandTest.php index 33926aeea0e..9cb3734922e 100644 --- a/tests/lib/Authentication/Login/FinishRememberedLoginCommandTest.php +++ b/tests/lib/Authentication/Login/FinishRememberedLoginCommandTest.php @@ -34,7 +34,7 @@ class FinishRememberedLoginCommandTest extends ALoginCommandTest { /** @var Session|MockObject */ private $userSession; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->userSession = $this->createMock(Session::class); diff --git a/tests/lib/Authentication/Login/LoggedInCheckCommandTest.php b/tests/lib/Authentication/Login/LoggedInCheckCommandTest.php index 16938307338..3b18c97a612 100644 --- a/tests/lib/Authentication/Login/LoggedInCheckCommandTest.php +++ b/tests/lib/Authentication/Login/LoggedInCheckCommandTest.php @@ -35,7 +35,7 @@ class LoggedInCheckCommandTest extends ALoginCommandTest { /** @var ILogger|MockObject */ private $logger; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->logger = $this->createMock(ILogger::class); diff --git a/tests/lib/Authentication/Login/PreLoginHookCommandTest.php b/tests/lib/Authentication/Login/PreLoginHookCommandTest.php index 3329f3ad82f..c067899ffc2 100644 --- a/tests/lib/Authentication/Login/PreLoginHookCommandTest.php +++ b/tests/lib/Authentication/Login/PreLoginHookCommandTest.php @@ -35,7 +35,7 @@ class PreLoginHookCommandTest extends ALoginCommandTest { /** @var IUserManager|MockObject */ private $userManager; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->userManager = $this->createMock(Manager::class); diff --git a/tests/lib/Authentication/Login/SetUserTimezoneCommandTest.php b/tests/lib/Authentication/Login/SetUserTimezoneCommandTest.php index a2ce656a14b..14da73b93fa 100644 --- a/tests/lib/Authentication/Login/SetUserTimezoneCommandTest.php +++ b/tests/lib/Authentication/Login/SetUserTimezoneCommandTest.php @@ -38,7 +38,7 @@ class SetUserTimezoneCommandTest extends ALoginCommandTest { /** @var ISession|MockObject */ private $session; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->config = $this->createMock(IConfig::class); diff --git a/tests/lib/Authentication/Login/TwoFactorCommandTest.php b/tests/lib/Authentication/Login/TwoFactorCommandTest.php index 5f91d812525..3e8ad142cc1 100644 --- a/tests/lib/Authentication/Login/TwoFactorCommandTest.php +++ b/tests/lib/Authentication/Login/TwoFactorCommandTest.php @@ -45,7 +45,7 @@ class TwoFactorCommandTest extends ALoginCommandTest { /** @var IURLGenerator|MockObject */ private $urlGenerator; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->twoFactorManager = $this->createMock(Manager::class); diff --git a/tests/lib/Authentication/Login/UidLoginCommandTest.php b/tests/lib/Authentication/Login/UidLoginCommandTest.php index 0a7889c227c..c4dd3f10381 100644 --- a/tests/lib/Authentication/Login/UidLoginCommandTest.php +++ b/tests/lib/Authentication/Login/UidLoginCommandTest.php @@ -35,7 +35,7 @@ class UidLoginCommandTest extends ALoginCommandTest { /** @var Manager|MockObject */ private $userManager; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->userManager = $this->createMock(Manager::class); diff --git a/tests/lib/Authentication/Login/UpdateLastPasswordConfirmCommandTest.php b/tests/lib/Authentication/Login/UpdateLastPasswordConfirmCommandTest.php index 5f5bd3032a8..b66ecdde3c4 100644 --- a/tests/lib/Authentication/Login/UpdateLastPasswordConfirmCommandTest.php +++ b/tests/lib/Authentication/Login/UpdateLastPasswordConfirmCommandTest.php @@ -34,7 +34,7 @@ class UpdateLastPasswordConfirmCommandTest extends ALoginCommandTest { /** @var ISession|MockObject */ private $session; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->session = $this->createMock(ISession::class); diff --git a/tests/lib/Authentication/Login/UserDisabledCheckCommandTest.php b/tests/lib/Authentication/Login/UserDisabledCheckCommandTest.php index 35d8ac63de6..2a2f23162bf 100644 --- a/tests/lib/Authentication/Login/UserDisabledCheckCommandTest.php +++ b/tests/lib/Authentication/Login/UserDisabledCheckCommandTest.php @@ -39,7 +39,7 @@ class UserDisabledCheckCommandTest extends ALoginCommandTest { /** @var ILogger|MockObject */ private $logger; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->userManager = $this->createMock(IUserManager::class); diff --git a/tests/lib/Authentication/LoginCredentials/CredentialsTest.php b/tests/lib/Authentication/LoginCredentials/CredentialsTest.php index 308ccafb151..263db1bbb5b 100644 --- a/tests/lib/Authentication/LoginCredentials/CredentialsTest.php +++ b/tests/lib/Authentication/LoginCredentials/CredentialsTest.php @@ -41,7 +41,7 @@ class CredentialsTest extends TestCase { /** @var Credentials */ private $credentials; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->uid = 'user123'; diff --git a/tests/lib/Authentication/LoginCredentials/StoreTest.php b/tests/lib/Authentication/LoginCredentials/StoreTest.php index 4588eae35f0..b75e1498889 100644 --- a/tests/lib/Authentication/LoginCredentials/StoreTest.php +++ b/tests/lib/Authentication/LoginCredentials/StoreTest.php @@ -51,7 +51,7 @@ class StoreTest extends TestCase { /** @var Store */ private $store; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->session = $this->createMock(ISession::class); diff --git a/tests/lib/Authentication/Token/DefaultTokenCleanupJobTest.php b/tests/lib/Authentication/Token/DefaultTokenCleanupJobTest.php index b8074d75b30..e4bc13fe5fb 100644 --- a/tests/lib/Authentication/Token/DefaultTokenCleanupJobTest.php +++ b/tests/lib/Authentication/Token/DefaultTokenCleanupJobTest.php @@ -33,7 +33,7 @@ class DefaultTokenCleanupJobTest extends TestCase { private $job; private $tokenProvider; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->tokenProvider = $this->getMockBuilder(Manager::class) diff --git a/tests/lib/Authentication/Token/DefaultTokenMapperTest.php b/tests/lib/Authentication/Token/DefaultTokenMapperTest.php index a40db4461d2..fb20558c95a 100644 --- a/tests/lib/Authentication/Token/DefaultTokenMapperTest.php +++ b/tests/lib/Authentication/Token/DefaultTokenMapperTest.php @@ -46,7 +46,7 @@ class DefaultTokenMapperTest extends TestCase { private $dbConnection; private $time; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->dbConnection = OC::$server->getDatabaseConnection(); diff --git a/tests/lib/Authentication/Token/DefaultTokenProviderTest.php b/tests/lib/Authentication/Token/DefaultTokenProviderTest.php index 57144d0f00d..b90a9931937 100644 --- a/tests/lib/Authentication/Token/DefaultTokenProviderTest.php +++ b/tests/lib/Authentication/Token/DefaultTokenProviderTest.php @@ -53,7 +53,7 @@ class DefaultTokenProviderTest extends TestCase { /** @var int */ private $time; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->mapper = $this->createMock(DefaultTokenMapper::class); diff --git a/tests/lib/Authentication/Token/ManagerTest.php b/tests/lib/Authentication/Token/ManagerTest.php index 1f3fda1b15d..6f64424364e 100644 --- a/tests/lib/Authentication/Token/ManagerTest.php +++ b/tests/lib/Authentication/Token/ManagerTest.php @@ -46,7 +46,7 @@ class ManagerTest extends TestCase { /** @var Manager */ private $manager; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->publicKeyTokenProvider = $this->createMock(PublicKeyTokenProvider::class); diff --git a/tests/lib/Authentication/Token/PublicKeyTokenMapperTest.php b/tests/lib/Authentication/Token/PublicKeyTokenMapperTest.php index b8c399b81f8..b58001ee7bb 100644 --- a/tests/lib/Authentication/Token/PublicKeyTokenMapperTest.php +++ b/tests/lib/Authentication/Token/PublicKeyTokenMapperTest.php @@ -47,7 +47,7 @@ class PublicKeyTokenMapperTest extends TestCase { /** @var int */ private $time; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->dbConnection = OC::$server->getDatabaseConnection(); diff --git a/tests/lib/Authentication/Token/PublicKeyTokenProviderTest.php b/tests/lib/Authentication/Token/PublicKeyTokenProviderTest.php index 1b468839cb7..aecbd969ee1 100644 --- a/tests/lib/Authentication/Token/PublicKeyTokenProviderTest.php +++ b/tests/lib/Authentication/Token/PublicKeyTokenProviderTest.php @@ -54,7 +54,7 @@ class PublicKeyTokenProviderTest extends TestCase { /** @var int */ private $time; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->mapper = $this->createMock(PublicKeyTokenMapper::class); diff --git a/tests/lib/Authentication/Token/RemoteWipeTest.php b/tests/lib/Authentication/Token/RemoteWipeTest.php index 5773bb596a5..2ca49d36159 100644 --- a/tests/lib/Authentication/Token/RemoteWipeTest.php +++ b/tests/lib/Authentication/Token/RemoteWipeTest.php @@ -51,7 +51,7 @@ class RemoteWipeTest extends TestCase { /** @var RemoteWipe */ private $remoteWipe; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->tokenProvider = $this->createMock(IProvider::class); diff --git a/tests/lib/Authentication/TwoFactorAuth/Db/ProviderUserAssignmentDaoTest.php b/tests/lib/Authentication/TwoFactorAuth/Db/ProviderUserAssignmentDaoTest.php index 2402fcf9f7b..67eb27cfdee 100644 --- a/tests/lib/Authentication/TwoFactorAuth/Db/ProviderUserAssignmentDaoTest.php +++ b/tests/lib/Authentication/TwoFactorAuth/Db/ProviderUserAssignmentDaoTest.php @@ -41,7 +41,7 @@ class ProviderUserAssignmentDaoTest extends TestCase { /** @var ProviderUserAssignmentDao */ private $dao; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->dbConn = OC::$server->getDatabaseConnection(); diff --git a/tests/lib/Authentication/TwoFactorAuth/ManagerTest.php b/tests/lib/Authentication/TwoFactorAuth/ManagerTest.php index e836e8d316b..63d0e993f3b 100644 --- a/tests/lib/Authentication/TwoFactorAuth/ManagerTest.php +++ b/tests/lib/Authentication/TwoFactorAuth/ManagerTest.php @@ -87,7 +87,7 @@ class ManagerTest extends TestCase { /** @var EventDispatcherInterface|MockObject */ private $eventDispatcher; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->user = $this->createMock(IUser::class); diff --git a/tests/lib/Authentication/TwoFactorAuth/MandatoryTwoFactorTest.php b/tests/lib/Authentication/TwoFactorAuth/MandatoryTwoFactorTest.php index 61ffb404dd9..92d072608f2 100644 --- a/tests/lib/Authentication/TwoFactorAuth/MandatoryTwoFactorTest.php +++ b/tests/lib/Authentication/TwoFactorAuth/MandatoryTwoFactorTest.php @@ -45,7 +45,7 @@ class MandatoryTwoFactorTest extends TestCase { /** @var MandatoryTwoFactor */ private $mandatoryTwoFactor; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->config = $this->createMock(IConfig::class); diff --git a/tests/lib/Authentication/TwoFactorAuth/ProviderLoaderTest.php b/tests/lib/Authentication/TwoFactorAuth/ProviderLoaderTest.php index 55a1e173928..634ab97a8bf 100644 --- a/tests/lib/Authentication/TwoFactorAuth/ProviderLoaderTest.php +++ b/tests/lib/Authentication/TwoFactorAuth/ProviderLoaderTest.php @@ -43,7 +43,7 @@ class ProviderLoaderTest extends TestCase { /** @var ProviderLoader */ private $loader; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->appManager = $this->createMock(IAppManager::class); diff --git a/tests/lib/Authentication/TwoFactorAuth/ProviderManagerTest.php b/tests/lib/Authentication/TwoFactorAuth/ProviderManagerTest.php index 736dfdb913b..f776e244c27 100644 --- a/tests/lib/Authentication/TwoFactorAuth/ProviderManagerTest.php +++ b/tests/lib/Authentication/TwoFactorAuth/ProviderManagerTest.php @@ -47,7 +47,7 @@ class ProviderManagerTest extends TestCase { /** @var ProviderManager */ private $providerManager; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->providerLoader = $this->createMock(ProviderLoader::class); diff --git a/tests/lib/Authentication/TwoFactorAuth/RegistryTest.php b/tests/lib/Authentication/TwoFactorAuth/RegistryTest.php index ad29377e559..2f59d14992a 100644 --- a/tests/lib/Authentication/TwoFactorAuth/RegistryTest.php +++ b/tests/lib/Authentication/TwoFactorAuth/RegistryTest.php @@ -45,7 +45,7 @@ class RegistryTest extends TestCase { /** @var Registry */ private $registry; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->dao = $this->createMock(ProviderUserAssignmentDao::class); diff --git a/tests/lib/AutoLoaderTest.php b/tests/lib/AutoLoaderTest.php index 38ba29bc085..b3ca21a90d4 100644 --- a/tests/lib/AutoLoaderTest.php +++ b/tests/lib/AutoLoaderTest.php @@ -14,7 +14,7 @@ class AutoLoaderTest extends TestCase { */ private $loader; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->loader = new \OC\AutoLoader([]); } diff --git a/tests/lib/Avatar/AvatarManagerTest.php b/tests/lib/Avatar/AvatarManagerTest.php index ae3ee89cec2..812802f8c5f 100644 --- a/tests/lib/Avatar/AvatarManagerTest.php +++ b/tests/lib/Avatar/AvatarManagerTest.php @@ -51,7 +51,7 @@ class AvatarManagerTest extends \Test\TestCase { /** @var AvatarManager | \PHPUnit_Framework_MockObject_MockObject */ private $avatarManager; - public function setUp() { + public function setUp(): void { parent::setUp(); $this->userManager = $this->createMock(Manager::class); diff --git a/tests/lib/Avatar/UserAvatarTest.php b/tests/lib/Avatar/UserAvatarTest.php index 2ce9266cf4d..19be534e0ef 100644 --- a/tests/lib/Avatar/UserAvatarTest.php +++ b/tests/lib/Avatar/UserAvatarTest.php @@ -31,7 +31,7 @@ class UserAvatarTest extends \Test\TestCase { /** @var \OCP\IConfig|\PHPUnit_Framework_MockObject_MockObject */ private $config; - public function setUp() { + public function setUp(): void { parent::setUp(); $this->folder = $this->createMock(SimpleFolder::class); diff --git a/tests/lib/BackgroundJob/JobListTest.php b/tests/lib/BackgroundJob/JobListTest.php index 78299e81546..7e099b23d06 100644 --- a/tests/lib/BackgroundJob/JobListTest.php +++ b/tests/lib/BackgroundJob/JobListTest.php @@ -33,7 +33,7 @@ class JobListTest extends TestCase { /** @var \OCP\AppFramework\Utility\ITimeFactory|\PHPUnit_Framework_MockObject_MockObject */ protected $timeFactory; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->connection = \OC::$server->getDatabaseConnection(); diff --git a/tests/lib/BackgroundJob/JobTest.php b/tests/lib/BackgroundJob/JobTest.php index ecd8bde8626..6e5474e597c 100644 --- a/tests/lib/BackgroundJob/JobTest.php +++ b/tests/lib/BackgroundJob/JobTest.php @@ -13,7 +13,7 @@ use OCP\ILogger; class JobTest extends \Test\TestCase { private $run = false; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->run = false; } diff --git a/tests/lib/BackgroundJob/QueuedJobTest.php b/tests/lib/BackgroundJob/QueuedJobTest.php index 73b245f93a5..9378816ce61 100644 --- a/tests/lib/BackgroundJob/QueuedJobTest.php +++ b/tests/lib/BackgroundJob/QueuedJobTest.php @@ -35,7 +35,7 @@ class QueuedJobTest extends \Test\TestCase { */ private $jobList; - protected function setup() { + protected function setUp(): void { parent::setUp(); $this->jobList = new DummyJobList(); diff --git a/tests/lib/BackgroundJob/TimedJobTest.php b/tests/lib/BackgroundJob/TimedJobTest.php index e684ad8c1e6..12f1c43adde 100644 --- a/tests/lib/BackgroundJob/TimedJobTest.php +++ b/tests/lib/BackgroundJob/TimedJobTest.php @@ -44,7 +44,7 @@ class TimedJobTest extends \Test\TestCase { /** @var ITimeFactory */ private $time; - protected function setup() { + protected function setUp(): void { parent::setUp(); $this->jobList = new DummyJobList(); diff --git a/tests/lib/Cache/CappedMemoryCacheTest.php b/tests/lib/Cache/CappedMemoryCacheTest.php index 243a1ad74f1..3b8e5bd7fb0 100644 --- a/tests/lib/Cache/CappedMemoryCacheTest.php +++ b/tests/lib/Cache/CappedMemoryCacheTest.php @@ -28,7 +28,7 @@ namespace Test\Cache; * @package Test\Cache */ class CappedMemoryCacheTest extends TestCache { - public function setUp() { + public function setUp(): void { parent::setUp(); $this->instance = new \OC\Cache\CappedMemoryCache(); } diff --git a/tests/lib/Cache/FileCacheTest.php b/tests/lib/Cache/FileCacheTest.php index a90fc6678e9..26306458d83 100644 --- a/tests/lib/Cache/FileCacheTest.php +++ b/tests/lib/Cache/FileCacheTest.php @@ -52,7 +52,7 @@ class FileCacheTest extends TestCache { //$this->skipUnless(OC_User::isLoggedIn()); } - protected function setUp() { + protected function setUp(): void { parent::setUp(); //clear all proxies and hooks so we can do clean testing @@ -87,7 +87,7 @@ class FileCacheTest extends TestCache { $this->instance->set('hack', 'hack'); } - protected function tearDown() { + protected function tearDown(): void { if ($this->instance) { $this->instance->remove('hack', 'hack'); } diff --git a/tests/lib/Cache/TestCache.php b/tests/lib/Cache/TestCache.php index 2642c014a78..62341a5698b 100644 --- a/tests/lib/Cache/TestCache.php +++ b/tests/lib/Cache/TestCache.php @@ -14,7 +14,7 @@ abstract class TestCache extends \Test\TestCase { */ protected $instance; - protected function tearDown() { + protected function tearDown(): void { if($this->instance) { $this->instance->clear(); } diff --git a/tests/lib/Calendar/ManagerTest.php b/tests/lib/Calendar/ManagerTest.php index dca9368558f..fa459203dac 100644 --- a/tests/lib/Calendar/ManagerTest.php +++ b/tests/lib/Calendar/ManagerTest.php @@ -32,7 +32,7 @@ class ManagerTest extends TestCase { /** @var Manager */ private $manager; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->manager = new Manager(); diff --git a/tests/lib/Calendar/Resource/ManagerTest.php b/tests/lib/Calendar/Resource/ManagerTest.php index 3e065c69908..71679a86a8c 100644 --- a/tests/lib/Calendar/Resource/ManagerTest.php +++ b/tests/lib/Calendar/Resource/ManagerTest.php @@ -36,7 +36,7 @@ class ManagerTest extends TestCase { /** @var IServerContainer */ private $server; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->server = $this->createMock(IServerContainer::class); diff --git a/tests/lib/Calendar/Room/ManagerTest.php b/tests/lib/Calendar/Room/ManagerTest.php index 9a85132aa3a..56f05544e29 100644 --- a/tests/lib/Calendar/Room/ManagerTest.php +++ b/tests/lib/Calendar/Room/ManagerTest.php @@ -36,7 +36,7 @@ class ManagerTest extends TestCase { /** @var IServerContainer */ private $server; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->server = $this->createMock(IServerContainer::class); diff --git a/tests/lib/CapabilitiesManagerTest.php b/tests/lib/CapabilitiesManagerTest.php index c967b77130d..f4222a83ef8 100644 --- a/tests/lib/CapabilitiesManagerTest.php +++ b/tests/lib/CapabilitiesManagerTest.php @@ -35,7 +35,7 @@ class CapabilitiesManagerTest extends TestCase { /** @var ILogger */ private $logger; - public function setUp() { + public function setUp(): void { parent::setUp(); $this->logger = $this->getMockBuilder(ILogger::class)->getMock(); $this->manager = new CapabilitiesManager($this->logger); diff --git a/tests/lib/Collaboration/Collaborators/GroupPluginTest.php b/tests/lib/Collaboration/Collaborators/GroupPluginTest.php index 36d98ee302f..d5a84e9b1b5 100644 --- a/tests/lib/Collaboration/Collaborators/GroupPluginTest.php +++ b/tests/lib/Collaboration/Collaborators/GroupPluginTest.php @@ -60,7 +60,7 @@ class GroupPluginTest extends TestCase { /** @var IUser|\PHPUnit_Framework_MockObject_MockObject */ protected $user; - public function setUp() { + public function setUp(): void { parent::setUp(); $this->config = $this->createMock(IConfig::class); diff --git a/tests/lib/Collaboration/Collaborators/LookupPluginTest.php b/tests/lib/Collaboration/Collaborators/LookupPluginTest.php index e4be6a73ee1..40fee52f234 100644 --- a/tests/lib/Collaboration/Collaborators/LookupPluginTest.php +++ b/tests/lib/Collaboration/Collaborators/LookupPluginTest.php @@ -55,7 +55,7 @@ class LookupPluginTest extends TestCase { /** @var ILogger|\PHPUnit_Framework_MockObject_MockObject */ protected $logger; - public function setUp() { + public function setUp(): void { parent::setUp(); $this->userSession = $this->createMock(IUserSession::class); diff --git a/tests/lib/Collaboration/Collaborators/MailPluginTest.php b/tests/lib/Collaboration/Collaborators/MailPluginTest.php index a9d0244d38c..af5cb7d3036 100644 --- a/tests/lib/Collaboration/Collaborators/MailPluginTest.php +++ b/tests/lib/Collaboration/Collaborators/MailPluginTest.php @@ -59,7 +59,7 @@ class MailPluginTest extends TestCase { /** @var IUserSession|\PHPUnit_Framework_MockObject_MockObject */ protected $userSession; - public function setUp() { + public function setUp(): void { parent::setUp(); $this->config = $this->createMock(IConfig::class); diff --git a/tests/lib/Collaboration/Collaborators/RemotePluginTest.php b/tests/lib/Collaboration/Collaborators/RemotePluginTest.php index 560e72a984d..03140ddc6eb 100644 --- a/tests/lib/Collaboration/Collaborators/RemotePluginTest.php +++ b/tests/lib/Collaboration/Collaborators/RemotePluginTest.php @@ -57,7 +57,7 @@ class RemotePluginTest extends TestCase { /** @var SearchResult */ protected $searchResult; - public function setUp() { + public function setUp(): void { parent::setUp(); $this->userManager = $this->createMock(IUserManager::class); diff --git a/tests/lib/Collaboration/Collaborators/SearchResultTest.php b/tests/lib/Collaboration/Collaborators/SearchResultTest.php index 90ea90237a1..717693e7592 100644 --- a/tests/lib/Collaboration/Collaborators/SearchResultTest.php +++ b/tests/lib/Collaboration/Collaborators/SearchResultTest.php @@ -39,7 +39,7 @@ class SearchResultTest extends TestCase { /** @var ISearch */ protected $search; - public function setUp() { + public function setUp(): void { parent::setUp(); $this->container = $this->createMock(IContainer::class); diff --git a/tests/lib/Collaboration/Collaborators/SearchTest.php b/tests/lib/Collaboration/Collaborators/SearchTest.php index 80e6c7f0beb..9116352ef19 100644 --- a/tests/lib/Collaboration/Collaborators/SearchTest.php +++ b/tests/lib/Collaboration/Collaborators/SearchTest.php @@ -39,7 +39,7 @@ class SearchTest extends TestCase { /** @var ISearch */ protected $search; - public function setUp() { + public function setUp(): void { parent::setUp(); $this->container = $this->createMock(IContainer::class); diff --git a/tests/lib/Collaboration/Collaborators/UserPluginTest.php b/tests/lib/Collaboration/Collaborators/UserPluginTest.php index 7513f9da5b6..b9f10a54fa0 100644 --- a/tests/lib/Collaboration/Collaborators/UserPluginTest.php +++ b/tests/lib/Collaboration/Collaborators/UserPluginTest.php @@ -62,7 +62,7 @@ class UserPluginTest extends TestCase { /** @var IUser|\PHPUnit_Framework_MockObject_MockObject */ protected $user; - public function setUp() { + public function setUp(): void { parent::setUp(); $this->config = $this->createMock(IConfig::class); diff --git a/tests/lib/Command/AsyncBusTest.php b/tests/lib/Command/AsyncBusTest.php index 8f07738bec6..59a80320f41 100644 --- a/tests/lib/Command/AsyncBusTest.php +++ b/tests/lib/Command/AsyncBusTest.php @@ -89,7 +89,7 @@ abstract class AsyncBusTest extends TestCase { */ abstract protected function createBus(); - public function setUp() { + public function setUp(): void { self::$lastCommand = ''; } diff --git a/tests/lib/Command/CronBusTest.php b/tests/lib/Command/CronBusTest.php index 9bf53ba92d2..a28ed0fbed4 100644 --- a/tests/lib/Command/CronBusTest.php +++ b/tests/lib/Command/CronBusTest.php @@ -31,7 +31,7 @@ class CronBusTest extends AsyncBusTest { private $jobList; - public function setUp() { + public function setUp(): void { parent::setUp(); $this->jobList = new DummyJobList(); diff --git a/tests/lib/Command/Integrity/SignAppTest.php b/tests/lib/Command/Integrity/SignAppTest.php index 2615c6afc1e..b30d465fcaa 100644 --- a/tests/lib/Command/Integrity/SignAppTest.php +++ b/tests/lib/Command/Integrity/SignAppTest.php @@ -39,7 +39,7 @@ class SignAppTest extends TestCase { /** @var IURLGenerator|\PHPUnit_Framework_MockObject_MockObject */ private $urlGenerator; - public function setUp() { + public function setUp(): void { parent::setUp(); $this->checker = $this->createMock(Checker::class); $this->fileAccessHelper = $this->createMock(FileAccessHelper::class); diff --git a/tests/lib/Command/Integrity/SignCoreTest.php b/tests/lib/Command/Integrity/SignCoreTest.php index e601b4a1a90..c496b864008 100644 --- a/tests/lib/Command/Integrity/SignCoreTest.php +++ b/tests/lib/Command/Integrity/SignCoreTest.php @@ -36,7 +36,7 @@ class SignCoreTest extends TestCase { /** @var SignCore */ private $signCore; - public function setUp() { + public function setUp(): void { parent::setUp(); $this->checker = $this->createMock(Checker::class); $this->fileAccessHelper = $this->createMock(FileAccessHelper::class); diff --git a/tests/lib/Comments/ManagerTest.php b/tests/lib/Comments/ManagerTest.php index 28002ff42cc..8b7bf50f95c 100644 --- a/tests/lib/Comments/ManagerTest.php +++ b/tests/lib/Comments/ManagerTest.php @@ -21,7 +21,7 @@ class ManagerTest extends TestCase { /** @var IDBConnection */ private $connection; - public function setUp() { + public function setUp(): void { parent::setUp(); $this->connection = \OC::$server->getDatabaseConnection(); diff --git a/tests/lib/ConfigTest.php b/tests/lib/ConfigTest.php index 2a4c9620340..109f7471e96 100644 --- a/tests/lib/ConfigTest.php +++ b/tests/lib/ConfigTest.php @@ -20,7 +20,7 @@ class ConfigTest extends TestCase { /** @var string */ private $randomTmpDir; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->randomTmpDir = \OC::$server->getTempManager()->getTemporaryFolder(); @@ -29,7 +29,7 @@ class ConfigTest extends TestCase { $this->config = new \OC\Config($this->randomTmpDir, 'testconfig.php'); } - protected function tearDown() { + protected function tearDown(): void { unlink($this->configFile); parent::tearDown(); } diff --git a/tests/lib/Contacts/ContactsMenu/ActionFactoryTest.php b/tests/lib/Contacts/ContactsMenu/ActionFactoryTest.php index d1273c2b9ad..54106bbb642 100644 --- a/tests/lib/Contacts/ContactsMenu/ActionFactoryTest.php +++ b/tests/lib/Contacts/ContactsMenu/ActionFactoryTest.php @@ -33,7 +33,7 @@ class ActionFactoryTest extends TestCase { /** @var ActionFactory */ private $actionFactory; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->actionFactory = new ActionFactory(); diff --git a/tests/lib/Contacts/ContactsMenu/ActionProviderStoreTest.php b/tests/lib/Contacts/ContactsMenu/ActionProviderStoreTest.php index fb5e815447c..6460ef20d0c 100644 --- a/tests/lib/Contacts/ContactsMenu/ActionProviderStoreTest.php +++ b/tests/lib/Contacts/ContactsMenu/ActionProviderStoreTest.php @@ -51,7 +51,7 @@ class ActionProviderStoreTest extends TestCase { /** @var ActionProviderStore */ private $actionProviderStore; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->serverContainer = $this->createMock(IServerContainer::class); diff --git a/tests/lib/Contacts/ContactsMenu/Actions/LinkActionTest.php b/tests/lib/Contacts/ContactsMenu/Actions/LinkActionTest.php index 31654b40918..da2d6ac4517 100644 --- a/tests/lib/Contacts/ContactsMenu/Actions/LinkActionTest.php +++ b/tests/lib/Contacts/ContactsMenu/Actions/LinkActionTest.php @@ -31,7 +31,7 @@ class LinkActionTest extends TestCase { private $action; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->action = new LinkAction(); diff --git a/tests/lib/Contacts/ContactsMenu/ContactsStoreTest.php b/tests/lib/Contacts/ContactsMenu/ContactsStoreTest.php index cf801396cb1..49dc1d9d823 100644 --- a/tests/lib/Contacts/ContactsMenu/ContactsStoreTest.php +++ b/tests/lib/Contacts/ContactsMenu/ContactsStoreTest.php @@ -46,7 +46,7 @@ class ContactsStoreTest extends TestCase { /** @var IConfig|PHPUnit_Framework_MockObject_MockObject */ private $config; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->contactsManager = $this->createMock(IManager::class); diff --git a/tests/lib/Contacts/ContactsMenu/EntryTest.php b/tests/lib/Contacts/ContactsMenu/EntryTest.php index e28248fb0fb..1ea4782a301 100644 --- a/tests/lib/Contacts/ContactsMenu/EntryTest.php +++ b/tests/lib/Contacts/ContactsMenu/EntryTest.php @@ -33,7 +33,7 @@ class EntryTest extends TestCase { /** @var Entry */ private $entry; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->entry = new Entry(); diff --git a/tests/lib/Contacts/ContactsMenu/ManagerTest.php b/tests/lib/Contacts/ContactsMenu/ManagerTest.php index d1630e8ddeb..b78420e5424 100644 --- a/tests/lib/Contacts/ContactsMenu/ManagerTest.php +++ b/tests/lib/Contacts/ContactsMenu/ManagerTest.php @@ -52,7 +52,7 @@ class ManagerTest extends TestCase { /** @var Manager */ private $manager; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->contactsStore = $this->createMock(ContactsStore::class); diff --git a/tests/lib/Contacts/ContactsMenu/Providers/EMailproviderTest.php b/tests/lib/Contacts/ContactsMenu/Providers/EMailproviderTest.php index 353c8d6f58f..85ffd1e72b1 100644 --- a/tests/lib/Contacts/ContactsMenu/Providers/EMailproviderTest.php +++ b/tests/lib/Contacts/ContactsMenu/Providers/EMailproviderTest.php @@ -43,7 +43,7 @@ class EMailproviderTest extends TestCase { /** @var EMailProvider */ private $provider; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->actionFactory = $this->createMock(IActionFactory::class); diff --git a/tests/lib/ContactsManagerTest.php b/tests/lib/ContactsManagerTest.php index c460330e7eb..9e8b75fbf4d 100644 --- a/tests/lib/ContactsManagerTest.php +++ b/tests/lib/ContactsManagerTest.php @@ -9,7 +9,7 @@ class ContactsManagerTest extends \Test\TestCase { /** @var \OC\ContactsManager */ private $cm; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->cm = new \OC\ContactsManager(); } diff --git a/tests/lib/DB/ConnectionTest.php b/tests/lib/DB/ConnectionTest.php index 02dd6a1495c..4683c53d339 100644 --- a/tests/lib/DB/ConnectionTest.php +++ b/tests/lib/DB/ConnectionTest.php @@ -26,12 +26,12 @@ class ConnectionTest extends \Test\TestCase { */ private $connection; - public static function setUpBeforeClass() { + public static function setUpBeforeClass(): void { self::dropTestTable(); parent::setUpBeforeClass(); } - public static function tearDownAfterClass() { + public static function tearDownAfterClass(): void { self::dropTestTable(); parent::tearDownAfterClass(); } @@ -42,12 +42,12 @@ class ConnectionTest extends \Test\TestCase { } } - public function setUp() { + public function setUp(): void { parent::setUp(); $this->connection = \OC::$server->getDatabaseConnection(); } - public function tearDown() { + public function tearDown(): void { parent::tearDown(); $this->connection->dropTable('table'); } diff --git a/tests/lib/DB/DBSchemaTest.php b/tests/lib/DB/DBSchemaTest.php index cc6059c163f..5fb68fdf258 100644 --- a/tests/lib/DB/DBSchemaTest.php +++ b/tests/lib/DB/DBSchemaTest.php @@ -27,7 +27,7 @@ class DBSchemaTest extends TestCase { /** @var ITempManager */ protected $tempManager; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->tempManager = \OC::$server->getTempManager(); @@ -50,7 +50,7 @@ class DBSchemaTest extends TestCase { $this->table2 = $r.'cntcts_cards'; } - protected function tearDown() { + protected function tearDown(): void { unlink($this->schema_file); unlink($this->schema_file2); diff --git a/tests/lib/DB/LegacyDBTest.php b/tests/lib/DB/LegacyDBTest.php index 578d28139bc..e0bb1055be1 100644 --- a/tests/lib/DB/LegacyDBTest.php +++ b/tests/lib/DB/LegacyDBTest.php @@ -21,7 +21,7 @@ class LegacyDBTest extends \Test\TestCase { protected static $schema_file; protected $test_prefix; - public static function setUpBeforeClass() { + public static function setUpBeforeClass(): void { self::$schema_file = \OC::$server->getTempManager()->getTemporaryFile(); } @@ -56,7 +56,7 @@ class LegacyDBTest extends \Test\TestCase { */ private $text_table; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $dbFile = \OC::$SERVERROOT.'/tests/data/db_structure.xml'; @@ -76,7 +76,7 @@ class LegacyDBTest extends \Test\TestCase { $this->text_table = $this->test_prefix.'text_table'; } - protected function tearDown() { + protected function tearDown(): void { OC_DB::removeDBStructure(self::$schema_file); unlink(self::$schema_file); diff --git a/tests/lib/DB/MDB2SchemaManagerTest.php b/tests/lib/DB/MDB2SchemaManagerTest.php index 75572bb36a5..8c9290c56b4 100644 --- a/tests/lib/DB/MDB2SchemaManagerTest.php +++ b/tests/lib/DB/MDB2SchemaManagerTest.php @@ -20,7 +20,7 @@ use Doctrine\DBAL\Platforms\OraclePlatform; */ class MDB2SchemaManagerTest extends \Test\TestCase { - protected function tearDown() { + protected function tearDown(): void { // do not drop the table for Oracle as it will create a bogus transaction // that will break the following test suites requiring transactions if (\OC::$server->getConfig()->getSystemValue('dbtype', 'sqlite') !== 'oci') { diff --git a/tests/lib/DB/MigrationsTest.php b/tests/lib/DB/MigrationsTest.php index 87547debe80..8f38b3addd0 100644 --- a/tests/lib/DB/MigrationsTest.php +++ b/tests/lib/DB/MigrationsTest.php @@ -36,7 +36,7 @@ class MigrationsTest extends \Test\TestCase { /** @var \PHPUnit_Framework_MockObject_MockObject | IDBConnection $db */ private $db; - public function setUp() { + public function setUp(): void { parent::setUp(); $this->db = $this->createMock(Connection::class); diff --git a/tests/lib/DB/MigratorTest.php b/tests/lib/DB/MigratorTest.php index e9c52015dbe..ca778fd4e2f 100644 --- a/tests/lib/DB/MigratorTest.php +++ b/tests/lib/DB/MigratorTest.php @@ -44,7 +44,7 @@ class MigratorTest extends \Test\TestCase { /** @var string */ private $tableNameTmp; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->config = \OC::$server->getConfig(); @@ -61,7 +61,7 @@ class MigratorTest extends \Test\TestCase { return strtolower($this->getUniqueID($this->config->getSystemValue('dbtableprefix', 'oc_') . 'test_')); } - protected function tearDown() { + protected function tearDown(): void { // Try to delete if exists (IF EXISTS NOT SUPPORTED IN ORACLE) try { $this->connection->exec('DROP TABLE ' . $this->connection->quoteIdentifier($this->tableNameTmp)); diff --git a/tests/lib/DB/MySqlMigrationTest.php b/tests/lib/DB/MySqlMigrationTest.php index 3bbe89fe025..5ebbd273c33 100644 --- a/tests/lib/DB/MySqlMigrationTest.php +++ b/tests/lib/DB/MySqlMigrationTest.php @@ -21,7 +21,7 @@ class MySqlMigrationTest extends \Test\TestCase { /** @var string */ private $tableName; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->connection = \OC::$server->getDatabaseConnection(); @@ -34,7 +34,7 @@ class MySqlMigrationTest extends \Test\TestCase { $this->connection->exec("CREATE TABLE $this->tableName(b BIT, e ENUM('1','2','3','4'))"); } - protected function tearDown() { + protected function tearDown(): void { $this->connection->getSchemaManager()->dropTable($this->tableName); parent::tearDown(); } diff --git a/tests/lib/DB/QueryBuilder/ExpressionBuilderDBTest.php b/tests/lib/DB/QueryBuilder/ExpressionBuilderDBTest.php index c71e83f5fd6..8e0ce2fe934 100644 --- a/tests/lib/DB/QueryBuilder/ExpressionBuilderDBTest.php +++ b/tests/lib/DB/QueryBuilder/ExpressionBuilderDBTest.php @@ -31,7 +31,7 @@ class ExpressionBuilderDBTest extends TestCase { /** @var \Doctrine\DBAL\Connection|\OCP\IDBConnection */ protected $connection; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->connection = \OC::$server->getDatabaseConnection(); diff --git a/tests/lib/DB/QueryBuilder/ExpressionBuilderTest.php b/tests/lib/DB/QueryBuilder/ExpressionBuilderTest.php index f5dc2a07246..b3e9124e7de 100644 --- a/tests/lib/DB/QueryBuilder/ExpressionBuilderTest.php +++ b/tests/lib/DB/QueryBuilder/ExpressionBuilderTest.php @@ -43,7 +43,7 @@ class ExpressionBuilderTest extends TestCase { /** @var \Doctrine\DBAL\Connection|\OCP\IDBConnection */ protected $connection; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->connection = \OC::$server->getDatabaseConnection(); diff --git a/tests/lib/DB/QueryBuilder/FunctionBuilderTest.php b/tests/lib/DB/QueryBuilder/FunctionBuilderTest.php index a8af7f4fe07..d7617125faa 100644 --- a/tests/lib/DB/QueryBuilder/FunctionBuilderTest.php +++ b/tests/lib/DB/QueryBuilder/FunctionBuilderTest.php @@ -35,7 +35,7 @@ class FunctionBuilderTest extends TestCase { /** @var \Doctrine\DBAL\Connection|\OCP\IDBConnection */ protected $connection; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->connection = \OC::$server->getDatabaseConnection(); diff --git a/tests/lib/DB/QueryBuilder/QueryBuilderTest.php b/tests/lib/DB/QueryBuilder/QueryBuilderTest.php index fa1c4add0ab..e9878d33d85 100644 --- a/tests/lib/DB/QueryBuilder/QueryBuilderTest.php +++ b/tests/lib/DB/QueryBuilder/QueryBuilderTest.php @@ -49,7 +49,7 @@ class QueryBuilderTest extends \Test\TestCase { /** @var ILogger|\PHPUnit_Framework_MockObject_MockObject */ protected $logger; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->connection = \OC::$server->getDatabaseConnection(); diff --git a/tests/lib/DB/QueryBuilder/QuoteHelperTest.php b/tests/lib/DB/QueryBuilder/QuoteHelperTest.php index 3c1abd72f66..3b5562b69c9 100644 --- a/tests/lib/DB/QueryBuilder/QuoteHelperTest.php +++ b/tests/lib/DB/QueryBuilder/QuoteHelperTest.php @@ -31,7 +31,7 @@ class QuoteHelperTest extends \Test\TestCase { /** @var QuoteHelper */ protected $helper; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->helper = new QuoteHelper(); diff --git a/tests/lib/DB/SchemaDiffTest.php b/tests/lib/DB/SchemaDiffTest.php index f74d800bfec..78963698571 100644 --- a/tests/lib/DB/SchemaDiffTest.php +++ b/tests/lib/DB/SchemaDiffTest.php @@ -50,7 +50,7 @@ class SchemaDiffTest extends TestCase { private $schemaFile; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->schemaFile = \OC::$server->getTempManager()->getTemporaryFile(); @@ -61,7 +61,7 @@ class SchemaDiffTest extends TestCase { $this->testPrefix= strtolower($this->getUniqueID($this->config->getSystemValue('dbtableprefix', 'oc_'), 3)); } - protected function tearDown() { + protected function tearDown(): void { $this->manager->removeDBStructure($this->schemaFile); parent::tearDown(); } diff --git a/tests/lib/DB/SqliteMigrationTest.php b/tests/lib/DB/SqliteMigrationTest.php index 4712fc6d70b..ecc6cbe0951 100644 --- a/tests/lib/DB/SqliteMigrationTest.php +++ b/tests/lib/DB/SqliteMigrationTest.php @@ -21,7 +21,7 @@ class SqliteMigrationTest extends \Test\TestCase { /** @var string */ private $tableName; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->connection = \OC::$server->getDatabaseConnection(); @@ -34,7 +34,7 @@ class SqliteMigrationTest extends \Test\TestCase { $this->connection->exec("CREATE TABLE $this->tableName(t0 tinyint unsigned, t1 tinyint)"); } - protected function tearDown() { + protected function tearDown(): void { $this->connection->getSchemaManager()->dropTable($this->tableName); parent::tearDown(); } diff --git a/tests/lib/DateTimeFormatterTest.php b/tests/lib/DateTimeFormatterTest.php index deb6a7c783c..f7f6f6633cd 100644 --- a/tests/lib/DateTimeFormatterTest.php +++ b/tests/lib/DateTimeFormatterTest.php @@ -18,7 +18,7 @@ class DateTimeFormatterTest extends TestCase { static protected $defaultTimeZone; - public static function setUpBeforeClass() { + public static function setUpBeforeClass(): void { parent::setUpBeforeClass(); self::$defaultTimeZone = date_default_timezone_get(); date_default_timezone_set('UTC'); @@ -27,12 +27,12 @@ class DateTimeFormatterTest extends TestCase { self::$oneYear = self::$oneDay * 365; } - public static function tearDownAfterClass() { + public static function tearDownAfterClass(): void { date_default_timezone_set(self::$defaultTimeZone); parent::tearDownAfterClass(); } - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->formatter = new \OC\DateTimeFormatter(new \DateTimeZone('UTC'), \OC::$server->getL10N('lib', 'en')); } diff --git a/tests/lib/Diagnostics/EventLoggerTest.php b/tests/lib/Diagnostics/EventLoggerTest.php index 2d0c82ba72e..18009ea26fe 100644 --- a/tests/lib/Diagnostics/EventLoggerTest.php +++ b/tests/lib/Diagnostics/EventLoggerTest.php @@ -29,7 +29,7 @@ class EventLoggerTest extends TestCase { /** @var \OC\Diagnostics\EventLogger */ private $logger; - public function setUp() { + public function setUp(): void { parent::setUp(); $this->logger = new EventLogger(); diff --git a/tests/lib/Diagnostics/QueryLoggerTest.php b/tests/lib/Diagnostics/QueryLoggerTest.php index 99de60ed8e4..32c17064f1c 100644 --- a/tests/lib/Diagnostics/QueryLoggerTest.php +++ b/tests/lib/Diagnostics/QueryLoggerTest.php @@ -29,7 +29,7 @@ class QueryLoggerTest extends TestCase { /** @var \OC\Diagnostics\QueryLogger */ private $logger; - public function setUp() { + public function setUp(): void { parent::setUp(); $this->logger = new QueryLogger(); diff --git a/tests/lib/Encryption/DecryptAllTest.php b/tests/lib/Encryption/DecryptAllTest.php index 158e52f4a07..75ea3f8ef53 100644 --- a/tests/lib/Encryption/DecryptAllTest.php +++ b/tests/lib/Encryption/DecryptAllTest.php @@ -67,7 +67,7 @@ class DecryptAllTest extends TestCase { /** @var DecryptAll */ protected $instance; - public function setUp() { + public function setUp(): void { parent::setUp(); $this->userManager = $this->getMockBuilder(IUserManager::class) diff --git a/tests/lib/Encryption/EncryptionWrapperTest.php b/tests/lib/Encryption/EncryptionWrapperTest.php index 6a51d769751..8e9e774347b 100644 --- a/tests/lib/Encryption/EncryptionWrapperTest.php +++ b/tests/lib/Encryption/EncryptionWrapperTest.php @@ -43,7 +43,7 @@ class EncryptionWrapperTest extends TestCase { /** @var \PHPUnit_Framework_MockObject_MockObject | \OC\Memcache\ArrayCache */ private $arrayCache; - public function setUp() { + public function setUp(): void { parent::setUp(); $this->arrayCache = $this->createMock(ArrayCache::class); diff --git a/tests/lib/Encryption/Keys/StorageTest.php b/tests/lib/Encryption/Keys/StorageTest.php index cd8f1e9b953..611044ba920 100644 --- a/tests/lib/Encryption/Keys/StorageTest.php +++ b/tests/lib/Encryption/Keys/StorageTest.php @@ -42,7 +42,7 @@ class StorageTest extends TestCase { /** @var \PHPUnit_Framework_MockObject_MockObject */ protected $config; - public function setUp() { + public function setUp(): void { parent::setUp(); $this->util = $this->getMockBuilder('OC\Encryption\Util') diff --git a/tests/lib/Encryption/ManagerTest.php b/tests/lib/Encryption/ManagerTest.php index 65234074955..0919bda36b0 100644 --- a/tests/lib/Encryption/ManagerTest.php +++ b/tests/lib/Encryption/ManagerTest.php @@ -35,7 +35,7 @@ class ManagerTest extends TestCase { /** @var ArrayCache|\PHPUnit_Framework_MockObject_MockObject */ private $arrayCache; - public function setUp() { + public function setUp(): void { parent::setUp(); $this->config = $this->createMock(IConfig::class); $this->logger = $this->createMock(ILogger::class); diff --git a/tests/lib/Encryption/UpdateTest.php b/tests/lib/Encryption/UpdateTest.php index 68639ad6e24..28d7ca81163 100644 --- a/tests/lib/Encryption/UpdateTest.php +++ b/tests/lib/Encryption/UpdateTest.php @@ -53,7 +53,7 @@ class UpdateTest extends TestCase { /** @var \OC\Encryption\File | \PHPUnit_Framework_MockObject_MockObject */ private $fileHelper; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->view = $this->getMockBuilder(View::class) diff --git a/tests/lib/Encryption/UtilTest.php b/tests/lib/Encryption/UtilTest.php index 1e1b21d3671..ee616d20793 100644 --- a/tests/lib/Encryption/UtilTest.php +++ b/tests/lib/Encryption/UtilTest.php @@ -32,7 +32,7 @@ class UtilTest extends TestCase { /** @var \OC\Encryption\Util */ private $util; - public function setUp() { + public function setUp(): void { parent::setUp(); $this->view = $this->getMockBuilder(View::class) ->disableOriginalConstructor() diff --git a/tests/lib/Federation/CloudIdManagerTest.php b/tests/lib/Federation/CloudIdManagerTest.php index fe673588bba..bd62a8ac026 100644 --- a/tests/lib/Federation/CloudIdManagerTest.php +++ b/tests/lib/Federation/CloudIdManagerTest.php @@ -28,7 +28,7 @@ class CloudIdManagerTest extends TestCase { /** @var CloudIdManager */ private $cloudIdManager; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->cloudIdManager = new CloudIdManager(); } diff --git a/tests/lib/Files/AppData/AppDataTest.php b/tests/lib/Files/AppData/AppDataTest.php index a9353540fff..3932e308de0 100644 --- a/tests/lib/Files/AppData/AppDataTest.php +++ b/tests/lib/Files/AppData/AppDataTest.php @@ -42,7 +42,7 @@ class AppDataTest extends \Test\TestCase { /** @var IAppData */ private $appData; - public function setUp() { + public function setUp(): void { parent::setUp(); $this->rootFolder = $this->createMock(IRootFolder::class); diff --git a/tests/lib/Files/AppData/FactoryTest.php b/tests/lib/Files/AppData/FactoryTest.php index 9b7529b18d9..ceed1f4ed3a 100644 --- a/tests/lib/Files/AppData/FactoryTest.php +++ b/tests/lib/Files/AppData/FactoryTest.php @@ -37,7 +37,7 @@ class FactoryTest extends \Test\TestCase { /** @var Factory */ private $factory; - public function setUp() { + public function setUp(): void { parent::setUp(); $this->rootFolder = $this->createMock(IRootFolder::class); diff --git a/tests/lib/Files/Cache/CacheTest.php b/tests/lib/Files/Cache/CacheTest.php index ccdfbbd065b..b2816c03094 100644 --- a/tests/lib/Files/Cache/CacheTest.php +++ b/tests/lib/Files/Cache/CacheTest.php @@ -777,7 +777,7 @@ class CacheTest extends \Test\TestCase { $this->cache->remove("sub"); } - protected function tearDown() { + protected function tearDown(): void { if ($this->cache) { $this->cache->clear(); } @@ -785,7 +785,7 @@ class CacheTest extends \Test\TestCase { parent::tearDown(); } - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->storage = new \OC\Files\Storage\Temporary(array()); diff --git a/tests/lib/Files/Cache/HomeCacheTest.php b/tests/lib/Files/Cache/HomeCacheTest.php index a144b8cabb8..51fc2e5bc9b 100644 --- a/tests/lib/Files/Cache/HomeCacheTest.php +++ b/tests/lib/Files/Cache/HomeCacheTest.php @@ -66,7 +66,7 @@ class HomeCacheTest extends \Test\TestCase { */ private $user; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->user = new DummyUser('foo', \OC::$server->getTempManager()->getTemporaryFolder()); diff --git a/tests/lib/Files/Cache/MoveFromCacheTraitTest.php b/tests/lib/Files/Cache/MoveFromCacheTraitTest.php index 3d4a55c0722..f93b95b5fe7 100644 --- a/tests/lib/Files/Cache/MoveFromCacheTraitTest.php +++ b/tests/lib/Files/Cache/MoveFromCacheTraitTest.php @@ -20,7 +20,7 @@ class FallBackCrossCacheMoveCache extends \OC\Files\Cache\Cache { * @group DB */ class MoveFromCacheTraitTest extends CacheTest { - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->storage = new \OC\Files\Storage\Temporary(array()); diff --git a/tests/lib/Files/Cache/PropagatorTest.php b/tests/lib/Files/Cache/PropagatorTest.php index 402b29c8c3e..bbf36329461 100644 --- a/tests/lib/Files/Cache/PropagatorTest.php +++ b/tests/lib/Files/Cache/PropagatorTest.php @@ -20,7 +20,7 @@ class PropagatorTest extends TestCase { /** @var IStorage */ private $storage; - public function setUp() { + public function setUp(): void { parent::setUp(); $this->storage = new Temporary(); $this->storage->mkdir('foo/bar'); diff --git a/tests/lib/Files/Cache/QuerySearchHelperTest.php b/tests/lib/Files/Cache/QuerySearchHelperTest.php index addeac71350..5a9d3022099 100644 --- a/tests/lib/Files/Cache/QuerySearchHelperTest.php +++ b/tests/lib/Files/Cache/QuerySearchHelperTest.php @@ -48,7 +48,7 @@ class QuerySearchHelperTest extends TestCase { /** @var integer */ private $numericStorageId; - public function setUp() { + public function setUp(): void { parent::setUp(); $this->builder = \OC::$server->getDatabaseConnection()->getQueryBuilder(); $this->mimetypeLoader = $this->createMock(IMimeTypeLoader::class); @@ -83,7 +83,7 @@ class QuerySearchHelperTest extends TestCase { ->where($this->builder->expr()->eq('storage', new Literal($this->numericStorageId))); } - public function tearDown() { + public function tearDown(): void { parent::tearDown(); $builder = \OC::$server->getDatabaseConnection()->getQueryBuilder(); diff --git a/tests/lib/Files/Cache/ScannerTest.php b/tests/lib/Files/Cache/ScannerTest.php index 0f5335f4416..1c0a8b0e0e9 100644 --- a/tests/lib/Files/Cache/ScannerTest.php +++ b/tests/lib/Files/Cache/ScannerTest.php @@ -33,7 +33,7 @@ class ScannerTest extends \Test\TestCase { */ private $cache; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->storage = new \OC\Files\Storage\Temporary(array()); @@ -41,7 +41,7 @@ class ScannerTest extends \Test\TestCase { $this->cache = new \OC\Files\Cache\Cache($this->storage); } - protected function tearDown() { + protected function tearDown(): void { if ($this->cache) { $this->cache->clear(); } diff --git a/tests/lib/Files/Cache/UpdaterLegacyTest.php b/tests/lib/Files/Cache/UpdaterLegacyTest.php index a0cc1c5d89c..e20cfe2ac12 100644 --- a/tests/lib/Files/Cache/UpdaterLegacyTest.php +++ b/tests/lib/Files/Cache/UpdaterLegacyTest.php @@ -37,7 +37,7 @@ class UpdaterLegacyTest extends \Test\TestCase { private static $user; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->storage = new \OC\Files\Storage\Temporary(array()); @@ -68,7 +68,7 @@ class UpdaterLegacyTest extends \Test\TestCase { \OC_Hook::clear('OC_Filesystem'); } - protected function tearDown() { + protected function tearDown(): void { if ($this->cache) { $this->cache->clear(); } diff --git a/tests/lib/Files/Cache/UpdaterTest.php b/tests/lib/Files/Cache/UpdaterTest.php index 54fb3f3fc97..8dc5893007b 100644 --- a/tests/lib/Files/Cache/UpdaterTest.php +++ b/tests/lib/Files/Cache/UpdaterTest.php @@ -40,7 +40,7 @@ class UpdaterTest extends \Test\TestCase { */ protected $updater; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->loginAsUser(); @@ -50,7 +50,7 @@ class UpdaterTest extends \Test\TestCase { $this->cache = $this->storage->getCache(); } - protected function tearDown() { + protected function tearDown(): void { Filesystem::clearMounts(); $this->logout(); diff --git a/tests/lib/Files/Cache/WatcherTest.php b/tests/lib/Files/Cache/WatcherTest.php index d4aa9ac875e..18f0ebe98a9 100644 --- a/tests/lib/Files/Cache/WatcherTest.php +++ b/tests/lib/Files/Cache/WatcherTest.php @@ -22,13 +22,13 @@ class WatcherTest extends \Test\TestCase { */ private $storages = array(); - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->loginAsUser(); } - protected function tearDown() { + protected function tearDown(): void { foreach ($this->storages as $storage) { $cache = $storage->getCache(); $ids = $cache->getAll(); diff --git a/tests/lib/Files/Cache/Wrapper/CacheJailTest.php b/tests/lib/Files/Cache/Wrapper/CacheJailTest.php index 365049c1cc6..744e132d2cc 100644 --- a/tests/lib/Files/Cache/Wrapper/CacheJailTest.php +++ b/tests/lib/Files/Cache/Wrapper/CacheJailTest.php @@ -24,7 +24,7 @@ class CacheJailTest extends CacheTest { */ protected $sourceCache; - public function setUp() { + public function setUp(): void { parent::setUp(); $this->storage->mkdir('foo'); $this->sourceCache = $this->cache; diff --git a/tests/lib/Files/Cache/Wrapper/CachePermissionsMaskTest.php b/tests/lib/Files/Cache/Wrapper/CachePermissionsMaskTest.php index c12b35867ff..0e2460f74e2 100644 --- a/tests/lib/Files/Cache/Wrapper/CachePermissionsMaskTest.php +++ b/tests/lib/Files/Cache/Wrapper/CachePermissionsMaskTest.php @@ -24,7 +24,7 @@ class CachePermissionsMaskTest extends CacheTest { */ protected $sourceCache; - public function setUp() { + public function setUp(): void { parent::setUp(); $this->storage->mkdir('foo'); $this->sourceCache = $this->cache; diff --git a/tests/lib/Files/Config/UserMountCacheTest.php b/tests/lib/Files/Config/UserMountCacheTest.php index 4bfc8710951..ba1011aa68e 100644 --- a/tests/lib/Files/Config/UserMountCacheTest.php +++ b/tests/lib/Files/Config/UserMountCacheTest.php @@ -42,7 +42,7 @@ class UserMountCacheTest extends TestCase { private $fileIds = []; - public function setUp() { + public function setUp(): void { $this->fileIds = []; $this->connection = \OC::$server->getDatabaseConnection(); $this->userManager = new Manager($this->createMock(IConfig::class), $this->createMock(EventDispatcherInterface::class)); @@ -54,7 +54,7 @@ class UserMountCacheTest extends TestCase { $this->cache = new \OC\Files\Config\UserMountCache($this->connection, $this->userManager, $this->createMock(Log::class)); } - public function tearDown() { + public function tearDown(): void { $builder = $this->connection->getQueryBuilder(); $builder->delete('mounts')->execute(); diff --git a/tests/lib/Files/EtagTest.php b/tests/lib/Files/EtagTest.php index ef7bf7cfbb7..acda220d01f 100644 --- a/tests/lib/Files/EtagTest.php +++ b/tests/lib/Files/EtagTest.php @@ -28,7 +28,7 @@ class EtagTest extends \Test\TestCase { */ private $userBackend; - protected function setUp() { + protected function setUp(): void { parent::setUp(); \OC_Hook::clear('OC_Filesystem', 'setup'); @@ -46,7 +46,7 @@ class EtagTest extends \Test\TestCase { \OC_User::useBackend($this->userBackend); } - protected function tearDown() { + protected function tearDown(): void { \OC::$server->getConfig()->setSystemValue('datadirectory', $this->datadir); $this->logout(); diff --git a/tests/lib/Files/FileInfoTest.php b/tests/lib/Files/FileInfoTest.php index b1ab880ad70..5c7c5cdc361 100644 --- a/tests/lib/Files/FileInfoTest.php +++ b/tests/lib/Files/FileInfoTest.php @@ -23,7 +23,7 @@ class FileInfoTest extends TestCase { private $config; - public function setUp() { + public function setUp(): void { parent::setUp(); $this->createUser('foo', 'foo'); $this->config = $this->getMockBuilder(IConfig::class)->getMock(); diff --git a/tests/lib/Files/FilesystemTest.php b/tests/lib/Files/FilesystemTest.php index 6fc6fbe9d7c..6b6e3feda33 100644 --- a/tests/lib/Files/FilesystemTest.php +++ b/tests/lib/Files/FilesystemTest.php @@ -77,7 +77,7 @@ class FilesystemTest extends \Test\TestCase { return array('datadir' => $dir); } - protected function setUp() { + protected function setUp(): void { parent::setUp(); $userBackend = new \Test\Util\User\Dummy(); $userBackend->createUser(self::TEST_FILESYSTEM_USER1, self::TEST_FILESYSTEM_USER1); @@ -86,7 +86,7 @@ class FilesystemTest extends \Test\TestCase { $this->loginAsUser(); } - protected function tearDown() { + protected function tearDown(): void { foreach ($this->tmpDirs as $dir) { \OC_Helper::rmdirr($dir); } diff --git a/tests/lib/Files/Mount/ManagerTest.php b/tests/lib/Files/Mount/ManagerTest.php index 7633ffb2f2d..f3cdc4264e4 100644 --- a/tests/lib/Files/Mount/ManagerTest.php +++ b/tests/lib/Files/Mount/ManagerTest.php @@ -22,7 +22,7 @@ class ManagerTest extends \Test\TestCase { */ private $manager; - protected function setup() { + protected function setUp(): void { parent::setUp(); $this->manager = new \OC\Files\Mount\Manager(); } diff --git a/tests/lib/Files/Mount/ObjectHomeMountProviderTest.php b/tests/lib/Files/Mount/ObjectHomeMountProviderTest.php index 9aa0143b4a7..5cd517df3c9 100644 --- a/tests/lib/Files/Mount/ObjectHomeMountProviderTest.php +++ b/tests/lib/Files/Mount/ObjectHomeMountProviderTest.php @@ -21,7 +21,7 @@ class ObjectHomeMountProviderTest extends \Test\TestCase { /** @var IStorageFactory|\PHPUnit_Framework_MockObject_MockObject */ protected $loader; - public function setUp() { + public function setUp(): void { parent::setUp(); $this->config = $this->createMock(IConfig::class); diff --git a/tests/lib/Files/Node/HookConnectorTest.php b/tests/lib/Files/Node/HookConnectorTest.php index 5180dbb9fe2..9c47df02f3b 100644 --- a/tests/lib/Files/Node/HookConnectorTest.php +++ b/tests/lib/Files/Node/HookConnectorTest.php @@ -53,7 +53,7 @@ class HookConnectorTest extends TestCase { */ private $userId; - public function setUp() { + public function setUp(): void { parent::setUp(); $this->userId = $this->getUniqueID(); $this->createUser($this->userId, 'pass'); @@ -71,7 +71,7 @@ class HookConnectorTest extends TestCase { $this->eventDispatcher = \OC::$server->getEventDispatcher(); } - public function tearDown() { + public function tearDown(): void { parent::tearDown(); \OC_Hook::clear('OC_Filesystem'); \OC_Util::tearDownFS(); diff --git a/tests/lib/Files/Node/IntegrationTest.php b/tests/lib/Files/Node/IntegrationTest.php index 6d9b0ce20b9..2a542a1097a 100644 --- a/tests/lib/Files/Node/IntegrationTest.php +++ b/tests/lib/Files/Node/IntegrationTest.php @@ -38,7 +38,7 @@ class IntegrationTest extends \Test\TestCase { */ private $view; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $manager = \OC\Files\Filesystem::getMountManager(); @@ -65,7 +65,7 @@ class IntegrationTest extends \Test\TestCase { $this->root->mount($subStorage, '/substorage/'); } - protected function tearDown() { + protected function tearDown(): void { foreach ($this->storages as $storage) { $storage->getCache()->clear(); } diff --git a/tests/lib/Files/Node/NodeTest.php b/tests/lib/Files/Node/NodeTest.php index 566c84e2c85..14ae0b0ead3 100644 --- a/tests/lib/Files/Node/NodeTest.php +++ b/tests/lib/Files/Node/NodeTest.php @@ -43,7 +43,7 @@ abstract class NodeTest extends \Test\TestCase { /** @var IUserManager|\PHPUnit_Framework_MockObject_MockObject */ protected $userManager; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->user = $this->createMock(IUser::class); diff --git a/tests/lib/Files/Node/RootTest.php b/tests/lib/Files/Node/RootTest.php index 8a6e5411f26..70ffe1b25c4 100644 --- a/tests/lib/Files/Node/RootTest.php +++ b/tests/lib/Files/Node/RootTest.php @@ -36,7 +36,7 @@ class RootTest extends \Test\TestCase { /** @var IUserManager|\PHPUnit_Framework_MockObject_MockObject */ private $userManager; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->user = $this->createMock(IUser::class); diff --git a/tests/lib/Files/ObjectStore/NoopScannerTest.php b/tests/lib/Files/ObjectStore/NoopScannerTest.php index 1832ed8d61a..8b879e8ab37 100644 --- a/tests/lib/Files/ObjectStore/NoopScannerTest.php +++ b/tests/lib/Files/ObjectStore/NoopScannerTest.php @@ -19,7 +19,7 @@ class NoopScannerTest extends \Test\TestCase { /** @var \OC\Files\ObjectStore\NoopScanner $scanner */ private $scanner; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->storage = new \OC\Files\Storage\Temporary(array()); diff --git a/tests/lib/Files/ObjectStore/ObjectStoreStorageTest.php b/tests/lib/Files/ObjectStore/ObjectStoreStorageTest.php index ce9c9d2cd69..b8c7b15e039 100644 --- a/tests/lib/Files/ObjectStore/ObjectStoreStorageTest.php +++ b/tests/lib/Files/ObjectStore/ObjectStoreStorageTest.php @@ -38,7 +38,7 @@ class ObjectStoreStorageTest extends Storage { */ private $objectStorage; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $baseStorage = new Temporary(); @@ -47,7 +47,7 @@ class ObjectStoreStorageTest extends Storage { $this->instance = new ObjectStoreStorageOverwrite($config); } - protected function tearDown() { + protected function tearDown(): void { if (is_null($this->instance)) { return; } diff --git a/tests/lib/Files/PathVerificationTest.php b/tests/lib/Files/PathVerificationTest.php index 7e0b7dd2650..02ea3df6cb6 100644 --- a/tests/lib/Files/PathVerificationTest.php +++ b/tests/lib/Files/PathVerificationTest.php @@ -25,7 +25,7 @@ class PathVerificationTest extends \Test\TestCase { */ private $view; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->view = new View(); } diff --git a/tests/lib/Files/SimpleFS/SimpleFileTest.php b/tests/lib/Files/SimpleFS/SimpleFileTest.php index b31fa348afa..ba8688fea01 100644 --- a/tests/lib/Files/SimpleFS/SimpleFileTest.php +++ b/tests/lib/Files/SimpleFS/SimpleFileTest.php @@ -36,7 +36,7 @@ class SimpleFileTest extends \Test\TestCase { /** @var SimpleFile */ private $simpleFile; - public function setUp() { + public function setUp(): void { parent::setUp(); $this->file = $this->createMock(File::class); diff --git a/tests/lib/Files/SimpleFS/SimpleFolderTest.php b/tests/lib/Files/SimpleFS/SimpleFolderTest.php index 551d8c95205..9c55367f44f 100644 --- a/tests/lib/Files/SimpleFS/SimpleFolderTest.php +++ b/tests/lib/Files/SimpleFS/SimpleFolderTest.php @@ -37,7 +37,7 @@ class SimpleFolderTest extends \Test\TestCase { /** @var SimpleFolder */ private $simpleFolder; - public function setUp() { + public function setUp(): void { parent::setUp(); $this->folder = $this->createMock(Folder::class); 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(); } diff --git a/tests/lib/Files/Type/DetectionTest.php b/tests/lib/Files/Type/DetectionTest.php index 1d01a96fcc0..c0cd2a24411 100644 --- a/tests/lib/Files/Type/DetectionTest.php +++ b/tests/lib/Files/Type/DetectionTest.php @@ -28,7 +28,7 @@ class DetectionTest extends \Test\TestCase { /** @var Detection */ private $detection; - public function setUp() { + public function setUp(): void { parent::setUp(); $this->detection = new Detection( \OC::$server->getURLGenerator(), diff --git a/tests/lib/Files/Type/LoaderTest.php b/tests/lib/Files/Type/LoaderTest.php index cf6aa31a047..a99c80dac47 100644 --- a/tests/lib/Files/Type/LoaderTest.php +++ b/tests/lib/Files/Type/LoaderTest.php @@ -30,12 +30,12 @@ class LoaderTest extends \Test\TestCase { /** @var Loader */ protected $loader; - protected function setUp() { + protected function setUp(): void { $this->db = \OC::$server->getDatabaseConnection(); $this->loader = new Loader($this->db); } - protected function tearDown() { + protected function tearDown(): void { $deleteMimetypes = $this->db->getQueryBuilder(); $deleteMimetypes->delete('mimetypes') ->where($deleteMimetypes->expr()->like( diff --git a/tests/lib/Files/Utils/ScannerTest.php b/tests/lib/Files/Utils/ScannerTest.php index 8748b52f0ca..9f057960b60 100644 --- a/tests/lib/Files/Utils/ScannerTest.php +++ b/tests/lib/Files/Utils/ScannerTest.php @@ -47,7 +47,7 @@ class ScannerTest extends \Test\TestCase { */ private $userBackend; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->userBackend = new \Test\Util\User\Dummy(); @@ -55,7 +55,7 @@ class ScannerTest extends \Test\TestCase { $this->loginAsUser(); } - protected function tearDown() { + protected function tearDown(): void { $this->logout(); \OC::$server->getUserManager()->removeBackend($this->userBackend); parent::tearDown(); diff --git a/tests/lib/Files/ViewTest.php b/tests/lib/Files/ViewTest.php index c154c28e24a..1e564c69092 100644 --- a/tests/lib/Files/ViewTest.php +++ b/tests/lib/Files/ViewTest.php @@ -85,7 +85,7 @@ class ViewTest extends \Test\TestCase { /** @var \OC\Files\Storage\Storage */ private $tempStorage; - protected function setUp() { + protected function setUp(): void { parent::setUp(); \OC_Hook::clear(); @@ -109,7 +109,7 @@ class ViewTest extends \Test\TestCase { $this->tempStorage = null; } - protected function tearDown() { + protected function tearDown(): void { \OC_User::setUserId($this->user); foreach ($this->storages as $storage) { $cache = $storage->getCache(); diff --git a/tests/lib/GlobalScale/ConfigTest.php b/tests/lib/GlobalScale/ConfigTest.php index ab5ef351fc0..4ceb34dc02f 100644 --- a/tests/lib/GlobalScale/ConfigTest.php +++ b/tests/lib/GlobalScale/ConfigTest.php @@ -31,7 +31,7 @@ class ConfigTest extends TestCase { /** @var IConfig|\PHPUnit_Framework_MockObject_MockObject */ private $config; - public function setUp() { + public function setUp(): void { parent::setUp(); $this->config = $this->createMock(IConfig::class); diff --git a/tests/lib/Group/DatabaseTest.php b/tests/lib/Group/DatabaseTest.php index 395a442c5e3..4af8b1cd430 100644 --- a/tests/lib/Group/DatabaseTest.php +++ b/tests/lib/Group/DatabaseTest.php @@ -45,12 +45,12 @@ class DatabaseTest extends Backend { return $name; } - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->backend = new \OC\Group\Database(); } - protected function tearDown() { + protected function tearDown(): void { foreach ($this->groups as $group) { $this->backend->deleteGroup($group); } diff --git a/tests/lib/Group/Dummy.php b/tests/lib/Group/Dummy.php index 5504cd63a0a..3be04159938 100644 --- a/tests/lib/Group/Dummy.php +++ b/tests/lib/Group/Dummy.php @@ -28,7 +28,7 @@ namespace Test\Group; * @group DB */ class Dummy extends Backend { - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->backend=new \Test\Util\Group\Dummy(); } diff --git a/tests/lib/Group/GroupTest.php b/tests/lib/Group/GroupTest.php index 5ab7a645081..1a240d5bc98 100644 --- a/tests/lib/Group/GroupTest.php +++ b/tests/lib/Group/GroupTest.php @@ -21,7 +21,7 @@ class GroupTest extends \Test\TestCase { /** @var EventDispatcherInterface|MockObject */ protected $dispatcher; - public function setUp() { + public function setUp(): void { parent::setUp(); $this->dispatcher = $this->createMock(EventDispatcherInterface::class); } diff --git a/tests/lib/Group/ManagerTest.php b/tests/lib/Group/ManagerTest.php index 3069f9d148b..86665ee0879 100644 --- a/tests/lib/Group/ManagerTest.php +++ b/tests/lib/Group/ManagerTest.php @@ -40,7 +40,7 @@ class ManagerTest extends TestCase { /** @var ILogger|MockObject */ protected $logger; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->userManager = $this->createMock(Manager::class); diff --git a/tests/lib/Group/MetaDataTest.php b/tests/lib/Group/MetaDataTest.php index c24155aef37..c53a7eb2adf 100644 --- a/tests/lib/Group/MetaDataTest.php +++ b/tests/lib/Group/MetaDataTest.php @@ -34,7 +34,7 @@ class MetaDataTest extends \Test\TestCase { /** @var bool */ private $isAdmin = true; - public function setUp() { + public function setUp(): void { parent::setUp(); $this->groupManager = $this->getMockBuilder('\OC\Group\Manager') ->disableOriginalConstructor() diff --git a/tests/lib/HelperStorageTest.php b/tests/lib/HelperStorageTest.php index dacd73a4f01..7b2fb665733 100644 --- a/tests/lib/HelperStorageTest.php +++ b/tests/lib/HelperStorageTest.php @@ -22,7 +22,7 @@ class HelperStorageTest extends \Test\TestCase { /** @var \OC\Files\Storage\Storage */ private $storage; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->user = $this->getUniqueID('user_'); @@ -38,7 +38,7 @@ class HelperStorageTest extends \Test\TestCase { $this->storageMock = null; } - protected function tearDown() { + protected function tearDown(): void { $this->user = null; if ($this->storageMock) { diff --git a/tests/lib/Hooks/BasicEmitterTest.php b/tests/lib/Hooks/BasicEmitterTest.php index 7b71bb8259e..948659faaba 100644 --- a/tests/lib/Hooks/BasicEmitterTest.php +++ b/tests/lib/Hooks/BasicEmitterTest.php @@ -37,7 +37,7 @@ class BasicEmitterTest extends \Test\TestCase { */ protected $emitter; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->emitter = new DummyEmitter(); } diff --git a/tests/lib/Hooks/LegacyEmitterTest.php b/tests/lib/Hooks/LegacyEmitterTest.php index 60a29f23245..32c923d8013 100644 --- a/tests/lib/Hooks/LegacyEmitterTest.php +++ b/tests/lib/Hooks/LegacyEmitterTest.php @@ -26,7 +26,7 @@ class LegacyEmitterTest extends BasicEmitterTest { //we can't use exceptions here since OC_Hooks catches all exceptions private static $emitted = false; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->emitter = new DummyLegacyEmitter(); diff --git a/tests/lib/Http/Client/ClientTest.php b/tests/lib/Http/Client/ClientTest.php index 5c0693732bc..0f91769d25e 100644 --- a/tests/lib/Http/Client/ClientTest.php +++ b/tests/lib/Http/Client/ClientTest.php @@ -29,7 +29,7 @@ class ClientTest extends \Test\TestCase { /** @var array */ private $defaultRequestOptions; - public function setUp() { + public function setUp(): void { parent::setUp(); $this->config = $this->createMock(IConfig::class); $this->guzzleClient = $this->getMockBuilder(\GuzzleHttp\Client::class) diff --git a/tests/lib/Http/Client/ResponseTest.php b/tests/lib/Http/Client/ResponseTest.php index f62563a95e9..9707e955bcb 100644 --- a/tests/lib/Http/Client/ResponseTest.php +++ b/tests/lib/Http/Client/ResponseTest.php @@ -19,7 +19,7 @@ class ResponseTest extends \Test\TestCase { /** @var GuzzleResponse */ private $guzzleResponse; - public function setUp() { + public function setUp(): void { parent::setUp(); $this->guzzleResponse = new GuzzleResponse(1337); } diff --git a/tests/lib/ImageTest.php b/tests/lib/ImageTest.php index 8f37d9814f0..34fcf0e004d 100644 --- a/tests/lib/ImageTest.php +++ b/tests/lib/ImageTest.php @@ -12,7 +12,7 @@ use OC; use OCP\IConfig; class ImageTest extends \Test\TestCase { - public static function tearDownAfterClass() { + public static function tearDownAfterClass(): void { @unlink(OC::$SERVERROOT.'/tests/data/testimage2.png'); @unlink(OC::$SERVERROOT.'/tests/data/testimage2.jpg'); diff --git a/tests/lib/InitialStateServiceTest.php b/tests/lib/InitialStateServiceTest.php index 08bff615e3e..2a97f07ac21 100644 --- a/tests/lib/InitialStateServiceTest.php +++ b/tests/lib/InitialStateServiceTest.php @@ -36,7 +36,7 @@ class InitialStateServiceTest extends TestCase { /** @var InitialStateService */ private $service; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->service = new InitialStateService( diff --git a/tests/lib/InstallerTest.php b/tests/lib/InstallerTest.php index 9fb813aaac6..509dfdb66ab 100644 --- a/tests/lib/InstallerTest.php +++ b/tests/lib/InstallerTest.php @@ -40,7 +40,7 @@ class InstallerTest extends TestCase { /** @var IConfig|\PHPUnit_Framework_MockObject_MockObject */ private $config; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->appFetcher = $this->createMock(AppFetcher::class); @@ -72,7 +72,7 @@ class InstallerTest extends TestCase { ); } - protected function tearDown() { + protected function tearDown(): void { $installer = new Installer( \OC::$server->getAppFetcher(), \OC::$server->getHTTPClientService(), diff --git a/tests/lib/IntegrityCheck/CheckerTest.php b/tests/lib/IntegrityCheck/CheckerTest.php index febd9f56622..e7553aeac1f 100644 --- a/tests/lib/IntegrityCheck/CheckerTest.php +++ b/tests/lib/IntegrityCheck/CheckerTest.php @@ -51,7 +51,7 @@ class CheckerTest extends TestCase { /** @var \OC\Files\Type\Detection|\PHPUnit_Framework_MockObject_MockObject */ private $mimeTypeDetector; - public function setUp() { + public function setUp(): void { parent::setUp(); $this->environmentHelper = $this->createMock(EnvironmentHelper::class); $this->fileAccessHelper = $this->createMock(FileAccessHelper::class); diff --git a/tests/lib/IntegrityCheck/Helpers/AppLocatorTest.php b/tests/lib/IntegrityCheck/Helpers/AppLocatorTest.php index d0083298b22..333b29f826c 100644 --- a/tests/lib/IntegrityCheck/Helpers/AppLocatorTest.php +++ b/tests/lib/IntegrityCheck/Helpers/AppLocatorTest.php @@ -28,7 +28,7 @@ class AppLocatorTest extends TestCase { /** @var AppLocator */ private $locator; - public function setUp() { + public function setUp(): void { parent::setUp(); $this->locator = new AppLocator(); } diff --git a/tests/lib/IntegrityCheck/Helpers/EnvironmentHelperTest.php b/tests/lib/IntegrityCheck/Helpers/EnvironmentHelperTest.php index 9dc9214a779..079baaafe9f 100644 --- a/tests/lib/IntegrityCheck/Helpers/EnvironmentHelperTest.php +++ b/tests/lib/IntegrityCheck/Helpers/EnvironmentHelperTest.php @@ -28,9 +28,9 @@ class EnvironmentHelperTest extends TestCase { /** @var EnvironmentHelper */ private $environmentHelper; - public function setUp() { + public function setUp(): void { $this->environmentHelper = new EnvironmentHelper(); - return parent::setUp(); + parent::setUp(); } public function testGetServerRoot() { diff --git a/tests/lib/IntegrityCheck/Helpers/FileAccessHelperTest.php b/tests/lib/IntegrityCheck/Helpers/FileAccessHelperTest.php index f2ac46555f5..87c064a8458 100644 --- a/tests/lib/IntegrityCheck/Helpers/FileAccessHelperTest.php +++ b/tests/lib/IntegrityCheck/Helpers/FileAccessHelperTest.php @@ -28,7 +28,7 @@ class FileAccessHelperTest extends TestCase { /** @var FileAccessHelper */ private $fileAccessHelper; - public function setUp() { + public function setUp(): void { parent::setUp(); $this->fileAccessHelper = new FileAccessHelper(); } diff --git a/tests/lib/IntegrityCheck/Iterator/ExcludeFileByNameFilterIteratorTest.php b/tests/lib/IntegrityCheck/Iterator/ExcludeFileByNameFilterIteratorTest.php index 735a5e2d19a..081d2b5cb01 100644 --- a/tests/lib/IntegrityCheck/Iterator/ExcludeFileByNameFilterIteratorTest.php +++ b/tests/lib/IntegrityCheck/Iterator/ExcludeFileByNameFilterIteratorTest.php @@ -28,7 +28,7 @@ class ExcludeFileByNameFilterIteratorTest extends TestCase { /** @var ExcludeFileByNameFilterIterator|\PHPUnit\Framework\MockObject\MockObject */ protected $filter; - public function setUp() { + public function setUp(): void { parent::setUp(); $this->filter = $this->getMockBuilder(ExcludeFileByNameFilterIterator::class) ->disableOriginalConstructor() diff --git a/tests/lib/L10N/FactoryTest.php b/tests/lib/L10N/FactoryTest.php index 6b9bd053568..9235542b199 100644 --- a/tests/lib/L10N/FactoryTest.php +++ b/tests/lib/L10N/FactoryTest.php @@ -36,7 +36,7 @@ class FactoryTest extends TestCase { /** @var string */ protected $serverRoot; - public function setUp() { + public function setUp(): void { parent::setUp(); $this->config = $this->getMockBuilder(IConfig::class) diff --git a/tests/lib/L10N/LanguageIteratorTest.php b/tests/lib/L10N/LanguageIteratorTest.php index c8b1b24685f..f0ba1bc0aeb 100644 --- a/tests/lib/L10N/LanguageIteratorTest.php +++ b/tests/lib/L10N/LanguageIteratorTest.php @@ -36,7 +36,7 @@ class LanguageIteratorTest extends TestCase { /** @var LanguageIterator */ protected $iterator; - public function setUp() { + public function setUp(): void { parent::setUp(); $this->user = $this->createMock(IUser::class); diff --git a/tests/lib/LargeFileHelperGetFileSizeTest.php b/tests/lib/LargeFileHelperGetFileSizeTest.php index b2735d7f619..f9c90cced5b 100644 --- a/tests/lib/LargeFileHelperGetFileSizeTest.php +++ b/tests/lib/LargeFileHelperGetFileSizeTest.php @@ -20,7 +20,7 @@ class LargeFileHelperGetFileSizeTest extends TestCase { /** @var \OC\LargeFileHelper */ protected $helper; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->helper = new \OC\LargeFileHelper(); } diff --git a/tests/lib/LargeFileHelperTest.php b/tests/lib/LargeFileHelperTest.php index 7d155ff8b44..bfe26246918 100644 --- a/tests/lib/LargeFileHelperTest.php +++ b/tests/lib/LargeFileHelperTest.php @@ -11,7 +11,7 @@ namespace Test; class LargeFileHelperTest extends TestCase { protected $helper; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->helper = new \OC\LargeFileHelper; } diff --git a/tests/lib/LegacyHelperTest.php b/tests/lib/LegacyHelperTest.php index 96cd190fd62..b86c4893676 100644 --- a/tests/lib/LegacyHelperTest.php +++ b/tests/lib/LegacyHelperTest.php @@ -15,11 +15,11 @@ class LegacyHelperTest extends \Test\TestCase { /** @var string */ private $originalWebRoot; - public function setUp() { + public function setUp(): void { $this->originalWebRoot = \OC::$WEBROOT; } - public function tearDown() { + public function tearDown(): void { // Reset webRoot \OC::$WEBROOT = $this->originalWebRoot; } diff --git a/tests/lib/Lock/DBLockingProviderTest.php b/tests/lib/Lock/DBLockingProviderTest.php index e8419815e31..b7929aee476 100644 --- a/tests/lib/Lock/DBLockingProviderTest.php +++ b/tests/lib/Lock/DBLockingProviderTest.php @@ -49,7 +49,7 @@ class DBLockingProviderTest extends LockingProvider { protected $currentTime; - public function setUp() { + public function setUp(): void { $this->currentTime = time(); $this->timeFactory = $this->createMock(ITimeFactory::class); $this->timeFactory->expects($this->any()) @@ -68,7 +68,7 @@ class DBLockingProviderTest extends LockingProvider { return new \OC\Lock\DBLockingProvider($this->connection, \OC::$server->getLogger(), $this->timeFactory, 3600); } - public function tearDown() { + public function tearDown(): void { $this->connection->executeQuery('DELETE FROM `*PREFIX*file_locks`'); parent::tearDown(); } diff --git a/tests/lib/Lock/LockingProvider.php b/tests/lib/Lock/LockingProvider.php index 9c0461e2e60..7faca3ea90c 100644 --- a/tests/lib/Lock/LockingProvider.php +++ b/tests/lib/Lock/LockingProvider.php @@ -36,7 +36,7 @@ abstract class LockingProvider extends TestCase { */ abstract protected function getInstance(); - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->instance = $this->getInstance(); } diff --git a/tests/lib/Lock/MemcacheLockingProviderTest.php b/tests/lib/Lock/MemcacheLockingProviderTest.php index baf99dbb2bb..6d37aaa5367 100644 --- a/tests/lib/Lock/MemcacheLockingProviderTest.php +++ b/tests/lib/Lock/MemcacheLockingProviderTest.php @@ -38,7 +38,7 @@ class MemcacheLockingProviderTest extends LockingProvider { return new \OC\Lock\MemcacheLockingProvider($this->memcache); } - public function tearDown() { + public function tearDown(): void { $this->memcache->clear(); parent::tearDown(); } diff --git a/tests/lib/Lockdown/Filesystem/NoFSTest.php b/tests/lib/Lockdown/Filesystem/NoFSTest.php index a0900ad769d..eaaa7b12955 100644 --- a/tests/lib/Lockdown/Filesystem/NoFSTest.php +++ b/tests/lib/Lockdown/Filesystem/NoFSTest.php @@ -34,16 +34,16 @@ use Test\Traits\UserTrait; class NoFSTest extends \Test\TestCase { use UserTrait; - public function tearDown() { + public function tearDown(): void { $token = new DefaultToken(); $token->setScope([ 'filesystem' => true ]); \OC::$server->getLockdownManager()->setToken($token); - return parent::tearDown(); + parent::tearDown(); } - public function setUp() { + public function setUp(): void { parent::setUp(); $token = new DefaultToken(); $token->setScope([ diff --git a/tests/lib/Lockdown/Filesystem/NullCacheTest.php b/tests/lib/Lockdown/Filesystem/NullCacheTest.php index 7773241fca1..f9c6fb3ff6c 100644 --- a/tests/lib/Lockdown/Filesystem/NullCacheTest.php +++ b/tests/lib/Lockdown/Filesystem/NullCacheTest.php @@ -34,7 +34,7 @@ class NulLCacheTest extends \Test\TestCase { /** @var NullCache */ private $cache; - public function setUp() { + public function setUp(): void { parent::setUp(); $this->cache = new NullCache(); diff --git a/tests/lib/Lockdown/Filesystem/NullStorageTest.php b/tests/lib/Lockdown/Filesystem/NullStorageTest.php index a8e2d8d6ba4..97a5b775d06 100644 --- a/tests/lib/Lockdown/Filesystem/NullStorageTest.php +++ b/tests/lib/Lockdown/Filesystem/NullStorageTest.php @@ -36,7 +36,7 @@ class NullStorageTest extends TestCase { /** @var NullStorage */ private $storage; - public function setUp() { + public function setUp(): void { parent::setUp(); $this->storage = new NullStorage([]); diff --git a/tests/lib/Lockdown/LockdownManagerTest.php b/tests/lib/Lockdown/LockdownManagerTest.php index 1d206dbf409..2f1c794d4d7 100644 --- a/tests/lib/Lockdown/LockdownManagerTest.php +++ b/tests/lib/Lockdown/LockdownManagerTest.php @@ -29,7 +29,7 @@ use Test\TestCase; class LockdownManagerTest extends TestCase { private $sessionCallback; - public function setUp() { + public function setUp(): void { parent::setUp(); $this->sessionCallback = function() { diff --git a/tests/lib/Log/FileTest.php b/tests/lib/Log/FileTest.php index c2c3a4ff68b..0bbcdc0a23c 100644 --- a/tests/lib/Log/FileTest.php +++ b/tests/lib/Log/FileTest.php @@ -32,7 +32,7 @@ class FileTest extends TestCase /** @var File */ protected $logFile; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $config = \OC::$server->getSystemConfig(); $this->restore_logfile = $config->getValue("logfile"); @@ -41,7 +41,7 @@ class FileTest extends TestCase $config->setValue("logfile", $config->getValue('datadirectory') . "/logtest.log"); $this->logFile = new File($config->getValue('datadirectory') . '/logtest.log', '', $config); } - protected function tearDown() { + protected function tearDown(): void { $config = \OC::$server->getSystemConfig(); if (isset($this->restore_logfile)) { $config->getValue("logfile", $this->restore_logfile); diff --git a/tests/lib/Log/LogFactoryTest.php b/tests/lib/Log/LogFactoryTest.php index ea6b12436e6..37dbf1d97b8 100644 --- a/tests/lib/Log/LogFactoryTest.php +++ b/tests/lib/Log/LogFactoryTest.php @@ -48,7 +48,7 @@ class LogFactoryTest extends TestCase { /** @var SystemConfig|\PHPUnit_Framework_MockObject_MockObject */ protected $systemConfig; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->c = $this->createMock(IServerContainer::class); diff --git a/tests/lib/LoggerTest.php b/tests/lib/LoggerTest.php index 83cb87b8733..f22896e9879 100644 --- a/tests/lib/LoggerTest.php +++ b/tests/lib/LoggerTest.php @@ -26,7 +26,7 @@ class LoggerTest extends TestCase implements IWriter { /** @var array */ private $logs = []; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->logs = []; diff --git a/tests/lib/Mail/EMailTemplateTest.php b/tests/lib/Mail/EMailTemplateTest.php index d4687c44b06..60d7d2bbbf8 100644 --- a/tests/lib/Mail/EMailTemplateTest.php +++ b/tests/lib/Mail/EMailTemplateTest.php @@ -39,7 +39,7 @@ class EMailTemplateTest extends TestCase { /** @var EMailTemplate */ private $emailTemplate; - public function setUp() { + public function setUp(): void { parent::setUp(); $this->defaults = $this->createMock(Defaults::class); diff --git a/tests/lib/Mail/MailerTest.php b/tests/lib/Mail/MailerTest.php index 1913cc1176c..911e5708296 100644 --- a/tests/lib/Mail/MailerTest.php +++ b/tests/lib/Mail/MailerTest.php @@ -31,7 +31,7 @@ class MailerTest extends TestCase { /** @var Mailer */ private $mailer; - public function setUp() { + public function setUp(): void { parent::setUp(); $this->config = $this->createMock(IConfig::class); diff --git a/tests/lib/Mail/MessageTest.php b/tests/lib/Mail/MessageTest.php index 4b656938e48..729178d328d 100644 --- a/tests/lib/Mail/MessageTest.php +++ b/tests/lib/Mail/MessageTest.php @@ -31,7 +31,7 @@ class MessageTest extends TestCase { ); } - public function setUp() { + public function setUp(): void { parent::setUp(); $this->swiftMessage = $this->getMockBuilder('\Swift_Message') diff --git a/tests/lib/Memcache/APCuTest.php b/tests/lib/Memcache/APCuTest.php index 41de75a8ea8..199acbe263b 100644 --- a/tests/lib/Memcache/APCuTest.php +++ b/tests/lib/Memcache/APCuTest.php @@ -10,7 +10,7 @@ namespace Test\Memcache; class APCuTest extends Cache { - protected function setUp() { + protected function setUp(): void { parent::setUp(); if(!\OC\Memcache\APCu::isAvailable()) { diff --git a/tests/lib/Memcache/ArrayCacheTest.php b/tests/lib/Memcache/ArrayCacheTest.php index 3ae8c116a01..4e3623d344d 100644 --- a/tests/lib/Memcache/ArrayCacheTest.php +++ b/tests/lib/Memcache/ArrayCacheTest.php @@ -10,7 +10,7 @@ namespace Test\Memcache; class ArrayCacheTest extends Cache { - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->instance = new \OC\Memcache\ArrayCache(''); } diff --git a/tests/lib/Memcache/Cache.php b/tests/lib/Memcache/Cache.php index 8d6a231dd8d..ab316738c9c 100644 --- a/tests/lib/Memcache/Cache.php +++ b/tests/lib/Memcache/Cache.php @@ -123,7 +123,7 @@ abstract class Cache extends \Test\Cache\TestCache { } - protected function tearDown() { + protected function tearDown(): void { if ($this->instance) { $this->instance->clear(); } diff --git a/tests/lib/Memcache/MemcachedTest.php b/tests/lib/Memcache/MemcachedTest.php index 865d8594bbb..96b88992665 100644 --- a/tests/lib/Memcache/MemcachedTest.php +++ b/tests/lib/Memcache/MemcachedTest.php @@ -10,7 +10,7 @@ namespace Test\Memcache; class MemcachedTest extends Cache { - static public function setUpBeforeClass() { + static public function setUpBeforeClass(): void { parent::setUpBeforeClass(); if (!\OC\Memcache\Memcached::isAvailable()) { @@ -22,7 +22,7 @@ class MemcachedTest extends Cache { } } - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->instance = new \OC\Memcache\Memcached($this->getUniqueID()); } diff --git a/tests/lib/Memcache/RedisTest.php b/tests/lib/Memcache/RedisTest.php index 6a0a82f6aa7..ba16b4a2bf1 100644 --- a/tests/lib/Memcache/RedisTest.php +++ b/tests/lib/Memcache/RedisTest.php @@ -10,7 +10,7 @@ namespace Test\Memcache; class RedisTest extends Cache { - static public function setUpBeforeClass() { + static public function setUpBeforeClass(): void { parent::setUpBeforeClass(); if (!\OC\Memcache\Redis::isAvailable()) { @@ -44,7 +44,7 @@ class RedisTest extends Cache { } } - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->instance = new \OC\Memcache\Redis($this->getUniqueID()); } diff --git a/tests/lib/Migration/BackgroundRepairTest.php b/tests/lib/Migration/BackgroundRepairTest.php index df81fd45772..3b94c22fd50 100644 --- a/tests/lib/Migration/BackgroundRepairTest.php +++ b/tests/lib/Migration/BackgroundRepairTest.php @@ -68,7 +68,7 @@ class BackgroundRepairTest extends TestCase { /** @var EventDispatcherInterface|\PHPUnit_Framework_MockObject_MockObject $dispatcher */ private $dispatcher; - public function setUp() { + public function setUp(): void { parent::setUp(); $this->jobList = $this->getMockBuilder('OC\BackgroundJob\JobList') diff --git a/tests/lib/NavigationManagerTest.php b/tests/lib/NavigationManagerTest.php index acf08088784..74cb3948c5e 100644 --- a/tests/lib/NavigationManagerTest.php +++ b/tests/lib/NavigationManagerTest.php @@ -41,7 +41,7 @@ class NavigationManagerTest extends TestCase { /** @var \OC\NavigationManager */ protected $navigationManager; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->appManager = $this->createMock(AppManager::class); diff --git a/tests/lib/Notification/ActionTest.php b/tests/lib/Notification/ActionTest.php index 9160ea7a7c3..5103babd0e2 100644 --- a/tests/lib/Notification/ActionTest.php +++ b/tests/lib/Notification/ActionTest.php @@ -30,7 +30,7 @@ class ActionTest extends TestCase { /** @var IAction */ protected $action; - public function setUp() { + public function setUp(): void { parent::setUp(); $this->action = new Action(); } diff --git a/tests/lib/Notification/ManagerTest.php b/tests/lib/Notification/ManagerTest.php index 259ac0beefe..5de0b572607 100644 --- a/tests/lib/Notification/ManagerTest.php +++ b/tests/lib/Notification/ManagerTest.php @@ -40,7 +40,7 @@ class ManagerTest extends TestCase { /** @var ILogger|MockObject */ protected $logger; - public function setUp() { + public function setUp(): void { parent::setUp(); $this->validator = $this->createMock(IValidator::class); $this->logger = $this->createMock(ILogger::class); diff --git a/tests/lib/Notification/NotificationTest.php b/tests/lib/Notification/NotificationTest.php index d72c9f62ae0..6b021ceb6d3 100644 --- a/tests/lib/Notification/NotificationTest.php +++ b/tests/lib/Notification/NotificationTest.php @@ -35,7 +35,7 @@ class NotificationTest extends TestCase { /** @var IValidator|\PHPUnit_Framework_MockObject_MockObject */ protected $validator; - public function setUp() { + public function setUp(): void { parent::setUp(); $this->validator = $this->createMock(IValidator::class); $this->notification = new Notification($this->validator); diff --git a/tests/lib/OCS/DiscoveryServiceTest.php b/tests/lib/OCS/DiscoveryServiceTest.php index f8ec68f6f55..cbdde7bc313 100644 --- a/tests/lib/OCS/DiscoveryServiceTest.php +++ b/tests/lib/OCS/DiscoveryServiceTest.php @@ -39,7 +39,7 @@ class DiscoveryServiceTest extends TestCase { /** @var IDiscoveryService */ private $discoveryService; - public function setUp() { + public function setUp(): void { parent::setUp(); $this->cacheFactory = $this->getMockBuilder(ICacheFactory::class)->getMock(); diff --git a/tests/lib/OCS/ProviderTest.php b/tests/lib/OCS/ProviderTest.php index 9444544d12a..4f962f7f791 100644 --- a/tests/lib/OCS/ProviderTest.php +++ b/tests/lib/OCS/ProviderTest.php @@ -31,7 +31,7 @@ class ProviderTest extends \Test\TestCase { /** @var Provider */ private $ocsProvider; - public function setUp() { + public function setUp(): void { parent::setUp(); $this->request = $this->getMockBuilder('\\OCP\\IRequest')->getMock(); diff --git a/tests/lib/Preview/BackgroundCleanupJobTest.php b/tests/lib/Preview/BackgroundCleanupJobTest.php index b33d75c6aa6..65e30df4a15 100644 --- a/tests/lib/Preview/BackgroundCleanupJobTest.php +++ b/tests/lib/Preview/BackgroundCleanupJobTest.php @@ -61,7 +61,7 @@ class BackgroundCleanupJobTest extends \Test\TestCase { /** @var IRootFolder */ private $rootFolder; - public function setUp() { + public function setUp(): void { parent::setUp(); $this->userId = $this->getUniqueID(); @@ -87,7 +87,7 @@ class BackgroundCleanupJobTest extends \Test\TestCase { $this->rootFolder = \OC::$server->getRootFolder(); } - public function tearDown() { + public function tearDown(): void { if ($this->trashEnabled) { $appManager = \OC::$server->getAppManager(); $appManager->enableApp('files_trashbin'); @@ -95,7 +95,7 @@ class BackgroundCleanupJobTest extends \Test\TestCase { $this->logout(); - return parent::tearDown(); + parent::tearDown(); } private function setup11Previews(): array { diff --git a/tests/lib/Preview/BitmapTest.php b/tests/lib/Preview/BitmapTest.php index 32d6ce896e4..63f9c6a013e 100644 --- a/tests/lib/Preview/BitmapTest.php +++ b/tests/lib/Preview/BitmapTest.php @@ -30,7 +30,7 @@ namespace Test\Preview; */ class BitmapTest extends Provider { - public function setUp() { + public function setUp(): void { parent::setUp(); $fileName = 'testimage.eps'; diff --git a/tests/lib/Preview/GeneratorTest.php b/tests/lib/Preview/GeneratorTest.php index c7fe1ea5f8a..167f6aba1b7 100644 --- a/tests/lib/Preview/GeneratorTest.php +++ b/tests/lib/Preview/GeneratorTest.php @@ -58,7 +58,7 @@ class GeneratorTest extends \Test\TestCase { /** @var Generator */ private $generator; - public function setUp() { + public function setUp(): void { parent::setUp(); $this->config = $this->createMock(IConfig::class); diff --git a/tests/lib/Preview/HEICTest.php b/tests/lib/Preview/HEICTest.php index a3cc37d24fb..2b4c63098b5 100644 --- a/tests/lib/Preview/HEICTest.php +++ b/tests/lib/Preview/HEICTest.php @@ -30,7 +30,7 @@ namespace Test\Preview; */ class HEICTest extends Provider { - public function setUp() { + public function setUp(): void { if ( !in_array("HEIC", \Imagick::queryFormats("HEI*")) ) { $this->markTestSkipped('ImageMagick is not HEIC aware. Skipping tests'); } else { diff --git a/tests/lib/Preview/ImageTest.php b/tests/lib/Preview/ImageTest.php index a55433a2682..200deef3866 100644 --- a/tests/lib/Preview/ImageTest.php +++ b/tests/lib/Preview/ImageTest.php @@ -30,7 +30,7 @@ namespace Test\Preview; */ class ImageTest extends Provider { - public function setUp() { + public function setUp(): void { parent::setUp(); $fileName = 'testimage.jpg'; diff --git a/tests/lib/Preview/MP3Test.php b/tests/lib/Preview/MP3Test.php index 576eea20b8b..5e0764a8ed7 100644 --- a/tests/lib/Preview/MP3Test.php +++ b/tests/lib/Preview/MP3Test.php @@ -30,7 +30,7 @@ namespace Test\Preview; */ class MP3Test extends Provider { - public function setUp() { + public function setUp(): void { parent::setUp(); $fileName = 'testimage.mp3'; diff --git a/tests/lib/Preview/MovieTest.php b/tests/lib/Preview/MovieTest.php index 0c174a40ca6..7437ff3567a 100644 --- a/tests/lib/Preview/MovieTest.php +++ b/tests/lib/Preview/MovieTest.php @@ -30,7 +30,7 @@ namespace Test\Preview; */ class MovieTest extends Provider { - public function setUp() { + public function setUp(): void { $avconvBinary = \OC_Helper::findBinaryPath('avconv'); $ffmpegBinary = ($avconvBinary) ? null : \OC_Helper::findBinaryPath('ffmpeg'); diff --git a/tests/lib/Preview/OfficeTest.php b/tests/lib/Preview/OfficeTest.php index 15d66352c18..62981f2f003 100644 --- a/tests/lib/Preview/OfficeTest.php +++ b/tests/lib/Preview/OfficeTest.php @@ -30,7 +30,7 @@ namespace Test\Preview; */ class OfficeTest extends Provider { - public function setUp() { + public function setUp(): void { $libreofficeBinary = \OC_Helper::findBinaryPath('libreoffice'); $openofficeBinary = ($libreofficeBinary) ? null : \OC_Helper::findBinaryPath('openoffice'); diff --git a/tests/lib/Preview/Provider.php b/tests/lib/Preview/Provider.php index 2050b3f56b4..761f6b7f83f 100644 --- a/tests/lib/Preview/Provider.php +++ b/tests/lib/Preview/Provider.php @@ -46,7 +46,7 @@ abstract class Provider extends \Test\TestCase { /** @var \OC\Files\Storage\Storage */ protected $storage; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $userManager = \OC::$server->getUserManager(); @@ -68,7 +68,7 @@ abstract class Provider extends \Test\TestCase { $this->userId = $userId; } - protected function tearDown() { + protected function tearDown(): void { $this->logout(); parent::tearDown(); diff --git a/tests/lib/Preview/SVGTest.php b/tests/lib/Preview/SVGTest.php index 39bf3f1dfc9..ccfeede75e6 100644 --- a/tests/lib/Preview/SVGTest.php +++ b/tests/lib/Preview/SVGTest.php @@ -30,7 +30,7 @@ namespace Test\Preview; */ class SVGTest extends Provider { - public function setUp() { + public function setUp(): void { $checkImagick = new \Imagick(); if (count($checkImagick->queryFormats('SVG')) === 1) { parent::setUp(); diff --git a/tests/lib/Preview/TXTTest.php b/tests/lib/Preview/TXTTest.php index dfa0b920e16..f2cdb72cdd1 100644 --- a/tests/lib/Preview/TXTTest.php +++ b/tests/lib/Preview/TXTTest.php @@ -30,7 +30,7 @@ namespace Test\Preview; */ class TXTTest extends Provider { - public function setUp() { + public function setUp(): void { parent::setUp(); $fileName = 'lorem-big.txt'; diff --git a/tests/lib/Remote/Api/OCSTest.php b/tests/lib/Remote/Api/OCSTest.php index 5bdc0c21a9c..af0b570c091 100644 --- a/tests/lib/Remote/Api/OCSTest.php +++ b/tests/lib/Remote/Api/OCSTest.php @@ -35,7 +35,7 @@ class OCSTest extends TestCase { /** @var IInstanceFactory */ private $instanceFactory; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->instanceFactory = new InstanceFactory(new ArrayCache(), $this->getClientService()); diff --git a/tests/lib/Remote/InstanceTest.php b/tests/lib/Remote/InstanceTest.php index 9fc4cfc0177..7253228f231 100644 --- a/tests/lib/Remote/InstanceTest.php +++ b/tests/lib/Remote/InstanceTest.php @@ -34,7 +34,7 @@ class InstanceTest extends TestCase { /** @var ICache */ private $cache; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->cache = new ArrayCache(); diff --git a/tests/lib/Repair/CleanTagsTest.php b/tests/lib/Repair/CleanTagsTest.php index 58fc6af6efb..5ff13beba76 100644 --- a/tests/lib/Repair/CleanTagsTest.php +++ b/tests/lib/Repair/CleanTagsTest.php @@ -35,7 +35,7 @@ class CleanTagsTest extends \Test\TestCase { /** @var IOutput */ private $outputMock; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->outputMock = $this->getMockBuilder('\OCP\Migration\IOutput') @@ -51,7 +51,7 @@ class CleanTagsTest extends \Test\TestCase { $this->cleanUpTables(); } - protected function tearDown() { + protected function tearDown(): void { $this->cleanUpTables(); parent::tearDown(); diff --git a/tests/lib/Repair/ClearFrontendCachesTest.php b/tests/lib/Repair/ClearFrontendCachesTest.php index 7c3a54cf1db..ea33d331c4d 100644 --- a/tests/lib/Repair/ClearFrontendCachesTest.php +++ b/tests/lib/Repair/ClearFrontendCachesTest.php @@ -45,7 +45,7 @@ class ClearFrontendCachesTest extends \Test\TestCase { /** @var IOutput */ private $outputMock; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->outputMock = $this->createMock(IOutput::class); diff --git a/tests/lib/Repair/ClearGeneratedAvatarCacheTest.php b/tests/lib/Repair/ClearGeneratedAvatarCacheTest.php index e52fcbe7c21..218a59caa3b 100644 --- a/tests/lib/Repair/ClearGeneratedAvatarCacheTest.php +++ b/tests/lib/Repair/ClearGeneratedAvatarCacheTest.php @@ -42,7 +42,7 @@ class ClearGeneratedAvatarCacheTest extends \Test\TestCase { /** @var ClearGeneratedAvatarCache */ protected $repair; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->outputMock = $this->createMock(IOutput::class); diff --git a/tests/lib/Repair/NC11/FixMountStoragesTest.php b/tests/lib/Repair/NC11/FixMountStoragesTest.php index fe1b75cac9b..891f7d600e5 100644 --- a/tests/lib/Repair/NC11/FixMountStoragesTest.php +++ b/tests/lib/Repair/NC11/FixMountStoragesTest.php @@ -43,7 +43,7 @@ class FixMountStoragesTest extends TestCase { /** @var FixMountStorages */ private $repair; - public function setUp() { + public function setUp(): void { parent::setUp(); $this->db = \OC::$server->getDatabaseConnection(); diff --git a/tests/lib/Repair/OldGroupMembershipSharesTest.php b/tests/lib/Repair/OldGroupMembershipSharesTest.php index cc04a80eef9..331a86d01d0 100644 --- a/tests/lib/Repair/OldGroupMembershipSharesTest.php +++ b/tests/lib/Repair/OldGroupMembershipSharesTest.php @@ -30,7 +30,7 @@ class OldGroupMembershipSharesTest extends \Test\TestCase { /** @var \OCP\IGroupManager|\PHPUnit_Framework_MockObject_MockObject */ protected $groupManager; - protected function setUp() { + protected function setUp(): void { parent::setUp(); /** \OCP\IGroupManager|\PHPUnit_Framework_MockObject_MockObject */ @@ -42,7 +42,7 @@ class OldGroupMembershipSharesTest extends \Test\TestCase { $this->deleteAllShares(); } - protected function tearDown() { + protected function tearDown(): void { $this->deleteAllShares(); parent::tearDown(); diff --git a/tests/lib/Repair/RepairCollationTest.php b/tests/lib/Repair/RepairCollationTest.php index d84f689cc52..62471fbbe3a 100644 --- a/tests/lib/Repair/RepairCollationTest.php +++ b/tests/lib/Repair/RepairCollationTest.php @@ -58,7 +58,7 @@ class RepairCollationTest extends TestCase { /** @var ILogger */ private $logger; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->connection = \OC::$server->getDatabaseConnection(); @@ -75,7 +75,7 @@ class RepairCollationTest extends TestCase { $this->repair = new TestCollationRepair($this->config, $this->logger, $this->connection, false); } - protected function tearDown() { + protected function tearDown(): void { $this->connection->getSchemaManager()->dropTable($this->tableName); parent::tearDown(); } diff --git a/tests/lib/Repair/RepairInvalidSharesTest.php b/tests/lib/Repair/RepairInvalidSharesTest.php index f28d6807d6a..1baaf89e0a0 100644 --- a/tests/lib/Repair/RepairInvalidSharesTest.php +++ b/tests/lib/Repair/RepairInvalidSharesTest.php @@ -31,7 +31,7 @@ class RepairInvalidSharesTest extends TestCase { /** @var \OCP\IDBConnection */ private $connection; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $config = $this->getMockBuilder(IConfig::class) @@ -49,7 +49,7 @@ class RepairInvalidSharesTest extends TestCase { $this->repair = new RepairInvalidShares($config, $this->connection); } - protected function tearDown() { + protected function tearDown(): void { $this->deleteAllShares(); parent::tearDown(); diff --git a/tests/lib/Repair/RepairMimeTypesTest.php b/tests/lib/Repair/RepairMimeTypesTest.php index 6579c3213c4..013e170cc9d 100644 --- a/tests/lib/Repair/RepairMimeTypesTest.php +++ b/tests/lib/Repair/RepairMimeTypesTest.php @@ -33,7 +33,7 @@ class RepairMimeTypesTest extends \Test\TestCase { /** @var IMimeTypeLoader */ private $mimetypeLoader; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->savedMimetypeLoader = \OC::$server->getMimeTypeLoader(); @@ -53,7 +53,7 @@ class RepairMimeTypesTest extends \Test\TestCase { $this->repair = new \OC\Repair\RepairMimeTypes($config); } - protected function tearDown() { + protected function tearDown(): void { $this->storage->getCache()->clear(); $qb = \OC::$server->getDatabaseConnection()->getQueryBuilder(); diff --git a/tests/lib/Repair/RepairSqliteAutoincrementTest.php b/tests/lib/Repair/RepairSqliteAutoincrementTest.php index 22186283779..c7008179a0d 100644 --- a/tests/lib/Repair/RepairSqliteAutoincrementTest.php +++ b/tests/lib/Repair/RepairSqliteAutoincrementTest.php @@ -36,7 +36,7 @@ class RepairSqliteAutoincrementTest extends \Test\TestCase { */ private $config; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->connection = \OC::$server->getDatabaseConnection(); @@ -52,7 +52,7 @@ class RepairSqliteAutoincrementTest extends \Test\TestCase { $this->repair = new \OC\Repair\SqliteAutoincrement($this->connection); } - protected function tearDown() { + protected function tearDown(): void { $this->connection->getSchemaManager()->dropTable($this->tableName); parent::tearDown(); } diff --git a/tests/lib/RepairStepTest.php b/tests/lib/RepairStepTest.php index 1ec28de8768..53b743cf13c 100644 --- a/tests/lib/RepairStepTest.php +++ b/tests/lib/RepairStepTest.php @@ -39,7 +39,7 @@ class RepairTest extends TestCase { /** @var string[] */ private $outputArray; - public function setUp() { + public function setUp(): void { parent::setUp(); $dispatcher = new EventDispatcher(); $this->repair = new \OC\Repair([], $dispatcher); diff --git a/tests/lib/Security/Bruteforce/CapabilitiesTest.php b/tests/lib/Security/Bruteforce/CapabilitiesTest.php index e9b998c7bc8..001d9983617 100644 --- a/tests/lib/Security/Bruteforce/CapabilitiesTest.php +++ b/tests/lib/Security/Bruteforce/CapabilitiesTest.php @@ -36,7 +36,7 @@ class CapabilitiesTest extends TestCase { /** @var Throttler|\PHPUnit_Framework_MockObject_MockObject */ private $throttler; - public function setUp() { + public function setUp(): void { parent::setUp(); $this->request = $this->createMock(IRequest::class); diff --git a/tests/lib/Security/Bruteforce/ThrottlerTest.php b/tests/lib/Security/Bruteforce/ThrottlerTest.php index e68ae70e152..7fbcd763ce6 100644 --- a/tests/lib/Security/Bruteforce/ThrottlerTest.php +++ b/tests/lib/Security/Bruteforce/ThrottlerTest.php @@ -44,7 +44,7 @@ class ThrottlerTest extends TestCase { /** @var IConfig|\PHPUnit_Framework_MockObject_MockObject */ private $config; - public function setUp() { + public function setUp(): void { $this->dbConnection = $this->createMock(IDBConnection::class); $this->logger = $this->createMock(ILogger::class); $this->config = $this->createMock(IConfig::class); diff --git a/tests/lib/Security/CSP/ContentSecurityPolicyManagerTest.php b/tests/lib/Security/CSP/ContentSecurityPolicyManagerTest.php index 7ee7350c661..e96111a06df 100644 --- a/tests/lib/Security/CSP/ContentSecurityPolicyManagerTest.php +++ b/tests/lib/Security/CSP/ContentSecurityPolicyManagerTest.php @@ -37,7 +37,7 @@ class ContentSecurityPolicyManagerTest extends TestCase { /** @var ContentSecurityPolicyManager */ private $contentSecurityPolicyManager; - public function setUp() { + public function setUp(): void { parent::setUp(); $this->dispatcher = \OC::$server->query(IEventDispatcher::class); $this->contentSecurityPolicyManager = new ContentSecurityPolicyManager($this->dispatcher); diff --git a/tests/lib/Security/CSP/ContentSecurityPolicyNonceManagerTest.php b/tests/lib/Security/CSP/ContentSecurityPolicyNonceManagerTest.php index 705a0b22db8..cb2a8f0d931 100644 --- a/tests/lib/Security/CSP/ContentSecurityPolicyNonceManagerTest.php +++ b/tests/lib/Security/CSP/ContentSecurityPolicyNonceManagerTest.php @@ -35,7 +35,7 @@ class ContentSecurityPolicyNonceManagerTest extends TestCase { /** @var ContentSecurityPolicyNonceManager */ private $nonceManager; - public function setUp() { + public function setUp(): void { $this->csrfTokenManager = $this->createMock(CsrfTokenManager::class); $this->request = $this->createMock(Request::class); $this->nonceManager = new ContentSecurityPolicyNonceManager( diff --git a/tests/lib/Security/CSRF/CsrfTokenGeneratorTest.php b/tests/lib/Security/CSRF/CsrfTokenGeneratorTest.php index 424f620b619..314902fb725 100644 --- a/tests/lib/Security/CSRF/CsrfTokenGeneratorTest.php +++ b/tests/lib/Security/CSRF/CsrfTokenGeneratorTest.php @@ -27,7 +27,7 @@ class CsrfTokenGeneratorTest extends \Test\TestCase { /** @var \OC\Security\CSRF\CsrfTokenGenerator */ private $csrfTokenGenerator; - public function setUp() { + public function setUp(): void { parent::setUp(); $this->random = $this->getMockBuilder('\OCP\Security\ISecureRandom') ->disableOriginalConstructor()->getMock(); diff --git a/tests/lib/Security/CSRF/CsrfTokenManagerTest.php b/tests/lib/Security/CSRF/CsrfTokenManagerTest.php index f9dd8127e5a..0f9755c2251 100644 --- a/tests/lib/Security/CSRF/CsrfTokenManagerTest.php +++ b/tests/lib/Security/CSRF/CsrfTokenManagerTest.php @@ -29,7 +29,7 @@ class CsrfTokenManagerTest extends \Test\TestCase { /** @var \OC\Security\CSRF\TokenStorage\SessionStorage */ private $storageInterface; - public function setUp() { + public function setUp(): void { parent::setUp(); $this->tokenGenerator = $this->getMockBuilder('\OC\Security\CSRF\CsrfTokenGenerator') ->disableOriginalConstructor()->getMock(); diff --git a/tests/lib/Security/CSRF/TokenStorage/SessionStorageTest.php b/tests/lib/Security/CSRF/TokenStorage/SessionStorageTest.php index 92a6557f8e3..19b13f76d86 100644 --- a/tests/lib/Security/CSRF/TokenStorage/SessionStorageTest.php +++ b/tests/lib/Security/CSRF/TokenStorage/SessionStorageTest.php @@ -29,7 +29,7 @@ class SessionStorageTest extends \Test\TestCase { /** @var \OC\Security\CSRF\TokenStorage\SessionStorage */ private $sessionStorage; - public function setUp() { + public function setUp(): void { parent::setUp(); $this->session = $this->getMockBuilder(ISession::class) ->disableOriginalConstructor()->getMock(); diff --git a/tests/lib/Security/CertificateManagerTest.php b/tests/lib/Security/CertificateManagerTest.php index 04da057a14c..e7d15e65c52 100644 --- a/tests/lib/Security/CertificateManagerTest.php +++ b/tests/lib/Security/CertificateManagerTest.php @@ -31,7 +31,7 @@ class CertificateManagerTest extends \Test\TestCase { /** @var ISecureRandom */ private $random; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->username = $this->getUniqueID('', 20); @@ -62,7 +62,7 @@ class CertificateManagerTest extends \Test\TestCase { ); } - protected function tearDown() { + protected function tearDown(): void { $user = \OC::$server->getUserManager()->get($this->username); if ($user !== null) { $user->delete(); diff --git a/tests/lib/Security/CertificateTest.php b/tests/lib/Security/CertificateTest.php index 21d1dab4ab8..c9d6ea90bd6 100644 --- a/tests/lib/Security/CertificateTest.php +++ b/tests/lib/Security/CertificateTest.php @@ -32,7 +32,7 @@ class CertificateTest extends \Test\TestCase { /** @var Certificate That contains an expired certificate */ protected $expiredCertificate; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $goodCertificate = file_get_contents(__DIR__ . '/../../data/certificates/goodCertificate.crt'); diff --git a/tests/lib/Security/CredentialsManagerTest.php b/tests/lib/Security/CredentialsManagerTest.php index d1cbdcd3366..0b93c704b5c 100644 --- a/tests/lib/Security/CredentialsManagerTest.php +++ b/tests/lib/Security/CredentialsManagerTest.php @@ -38,7 +38,7 @@ class CredentialsManagerTest extends \Test\TestCase { /** @var CredentialsManager */ protected $manager; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->crypto = $this->createMock(ICrypto::class); $this->dbConnection = $this->getMockBuilder('\OC\DB\Connection') diff --git a/tests/lib/Security/CryptoTest.php b/tests/lib/Security/CryptoTest.php index ff164cddc9d..b0032a555fd 100644 --- a/tests/lib/Security/CryptoTest.php +++ b/tests/lib/Security/CryptoTest.php @@ -24,7 +24,7 @@ class CryptoTest extends \Test\TestCase { /** @var Crypto */ protected $crypto; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->crypto = new Crypto(\OC::$server->getConfig(), \OC::$server->getSecureRandom()); } diff --git a/tests/lib/Security/FeaturePolicy/FeaturePolicyManagerTest.php b/tests/lib/Security/FeaturePolicy/FeaturePolicyManagerTest.php index b4182068b8a..ec8ffbee77b 100644 --- a/tests/lib/Security/FeaturePolicy/FeaturePolicyManagerTest.php +++ b/tests/lib/Security/FeaturePolicy/FeaturePolicyManagerTest.php @@ -42,7 +42,7 @@ class FeaturePolicyManagerTest extends TestCase { /** @var FeaturePolicyManager */ private $manager; - public function setUp() { + public function setUp(): void { parent::setUp(); $this->dispatcher = \OC::$server->query(IEventDispatcher::class); $this->manager = new FeaturePolicyManager($this->dispatcher); diff --git a/tests/lib/Security/HasherTest.php b/tests/lib/Security/HasherTest.php index c994b68f781..3222b5d0984 100644 --- a/tests/lib/Security/HasherTest.php +++ b/tests/lib/Security/HasherTest.php @@ -97,7 +97,7 @@ class HasherTest extends \Test\TestCase { /** @var IConfig */ protected $config; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->config = $this->createMock(IConfig::class); diff --git a/tests/lib/Security/IdentityProof/KeyTest.php b/tests/lib/Security/IdentityProof/KeyTest.php index bb550bd1b2a..34493df9878 100644 --- a/tests/lib/Security/IdentityProof/KeyTest.php +++ b/tests/lib/Security/IdentityProof/KeyTest.php @@ -30,7 +30,7 @@ class KeyTest extends TestCase { /** @var Key */ private $key; - public function setUp() { + public function setUp(): void { parent::setUp(); $this->key = new Key('public', 'private'); diff --git a/tests/lib/Security/IdentityProof/ManagerTest.php b/tests/lib/Security/IdentityProof/ManagerTest.php index 2d66845ba8d..9e58ac5c00f 100644 --- a/tests/lib/Security/IdentityProof/ManagerTest.php +++ b/tests/lib/Security/IdentityProof/ManagerTest.php @@ -50,7 +50,7 @@ class ManagerTest extends TestCase { /** @var ILogger|MockObject */ private $logger; - public function setUp() { + public function setUp(): void { parent::setUp(); /** @var Factory|\PHPUnit_Framework_MockObject_MockObject $factory */ diff --git a/tests/lib/Security/IdentityProof/SignerTest.php b/tests/lib/Security/IdentityProof/SignerTest.php index 114c03348f6..850ae08d4f0 100644 --- a/tests/lib/Security/IdentityProof/SignerTest.php +++ b/tests/lib/Security/IdentityProof/SignerTest.php @@ -89,7 +89,7 @@ gQIDAQAB /** @var Signer */ private $signer; - public function setUp() { + public function setUp(): void { parent::setUp(); $this->key = new Key($this->public, $this->private); diff --git a/tests/lib/Security/RateLimiting/Backend/MemoryCacheTest.php b/tests/lib/Security/RateLimiting/Backend/MemoryCacheTest.php index 098c40ba0e8..d117f7d8c70 100644 --- a/tests/lib/Security/RateLimiting/Backend/MemoryCacheTest.php +++ b/tests/lib/Security/RateLimiting/Backend/MemoryCacheTest.php @@ -37,7 +37,7 @@ class MemoryCacheTest extends TestCase { /** @var MemoryCache */ private $memoryCache; - public function setUp() { + public function setUp(): void { parent::setUp(); $this->cacheFactory = $this->createMock(ICacheFactory::class); diff --git a/tests/lib/Security/RateLimiting/LimiterTest.php b/tests/lib/Security/RateLimiting/LimiterTest.php index 5d42104ba82..1e72f8e4960 100644 --- a/tests/lib/Security/RateLimiting/LimiterTest.php +++ b/tests/lib/Security/RateLimiting/LimiterTest.php @@ -38,7 +38,7 @@ class LimiterTest extends TestCase { /** @var Limiter */ private $limiter; - public function setUp() { + public function setUp(): void { parent::setUp(); $this->timeFactory = $this->createMock(ITimeFactory::class); diff --git a/tests/lib/Security/SecureRandomTest.php b/tests/lib/Security/SecureRandomTest.php index 500e18d0ca6..71839115a3c 100644 --- a/tests/lib/Security/SecureRandomTest.php +++ b/tests/lib/Security/SecureRandomTest.php @@ -35,7 +35,7 @@ class SecureRandomTest extends \Test\TestCase { /** @var SecureRandom */ protected $rng; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->rng = new \OC\Security\SecureRandom(); } diff --git a/tests/lib/Security/TrustedDomainHelperTest.php b/tests/lib/Security/TrustedDomainHelperTest.php index 3fe0889b796..26158401f79 100644 --- a/tests/lib/Security/TrustedDomainHelperTest.php +++ b/tests/lib/Security/TrustedDomainHelperTest.php @@ -18,7 +18,7 @@ class TrustedDomainHelperTest extends \Test\TestCase { /** @var IConfig */ protected $config; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->config = $this->getMockBuilder(IConfig::class)->getMock(); diff --git a/tests/lib/ServerTest.php b/tests/lib/ServerTest.php index 604e11ec11e..54eaa159d1d 100644 --- a/tests/lib/ServerTest.php +++ b/tests/lib/ServerTest.php @@ -38,7 +38,7 @@ class ServerTest extends \Test\TestCase { protected $server; - public function setUp() { + public function setUp(): void { parent::setUp(); $config = new \OC\Config(\OC::$configDir); $this->server = new \OC\Server('', $config); diff --git a/tests/lib/Session/CryptoSessionDataTest.php b/tests/lib/Session/CryptoSessionDataTest.php index ee6bcbf11c1..472856b90d9 100644 --- a/tests/lib/Session/CryptoSessionDataTest.php +++ b/tests/lib/Session/CryptoSessionDataTest.php @@ -30,7 +30,7 @@ class CryptoSessionDataTest extends Session { /** @var \OCP\ISession */ protected $wrappedSession; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->wrappedSession = new \OC\Session\Memory($this->getUniqueID()); diff --git a/tests/lib/Session/CryptoWrappingTest.php b/tests/lib/Session/CryptoWrappingTest.php index f34148fb50e..493d16bfbfb 100644 --- a/tests/lib/Session/CryptoWrappingTest.php +++ b/tests/lib/Session/CryptoWrappingTest.php @@ -35,7 +35,7 @@ class CryptoWrappingTest extends TestCase { /** @var \OC\Session\CryptoSessionData */ protected $instance; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->wrappedSession = $this->getMockBuilder(ISession::class) diff --git a/tests/lib/Session/MemoryTest.php b/tests/lib/Session/MemoryTest.php index d92d7b90e5e..7b60e0197f4 100644 --- a/tests/lib/Session/MemoryTest.php +++ b/tests/lib/Session/MemoryTest.php @@ -11,7 +11,7 @@ namespace Test\Session; class MemoryTest extends Session { - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->instance = new \OC\Session\Memory($this->getUniqueID()); } diff --git a/tests/lib/Session/Session.php b/tests/lib/Session/Session.php index a1ed01b2ec8..0c947b8d302 100644 --- a/tests/lib/Session/Session.php +++ b/tests/lib/Session/Session.php @@ -15,7 +15,7 @@ abstract class Session extends \Test\TestCase { */ protected $instance; - protected function tearDown() { + protected function tearDown(): void { $this->instance->clear(); parent::tearDown(); } diff --git a/tests/lib/Settings/ManagerTest.php b/tests/lib/Settings/ManagerTest.php index 8d1c9f768e8..f82a623b3d5 100644 --- a/tests/lib/Settings/ManagerTest.php +++ b/tests/lib/Settings/ManagerTest.php @@ -51,7 +51,7 @@ class ManagerTest extends TestCase { /** @var IServerContainer|\PHPUnit_Framework_MockObject_MockObject */ private $container; - public function setUp() { + public function setUp(): void { parent::setUp(); $this->logger = $this->createMock(ILogger::class); diff --git a/tests/lib/SetupTest.php b/tests/lib/SetupTest.php index 176a5b19f29..93c04ce8449 100644 --- a/tests/lib/SetupTest.php +++ b/tests/lib/SetupTest.php @@ -36,7 +36,7 @@ class SetupTest extends \Test\TestCase { /** @var Installer|\PHPUnit_Framework_MockObject_MockObject */ protected $installer; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->config = $this->createMock(SystemConfig::class); diff --git a/tests/lib/Share/ShareTest.php b/tests/lib/Share/ShareTest.php index 7db58d744d5..af05d0c4bdd 100644 --- a/tests/lib/Share/ShareTest.php +++ b/tests/lib/Share/ShareTest.php @@ -67,7 +67,7 @@ class ShareTest extends \Test\TestCase { /** @var IUserManager */ protected $userManager; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->groupManager = \OC::$server->getGroupManager(); @@ -113,7 +113,7 @@ class ShareTest extends \Test\TestCase { $this->dateInFuture = date($dateFormat, $now + 20 * 60); } - protected function tearDown() { + protected function tearDown(): void { $query = \OC_DB::prepare('DELETE FROM `*PREFIX*share` WHERE `item_type` = ?'); $query->execute(array('test')); \OC::$server->getConfig()->setAppValue('core', 'shareapi_allow_resharing', $this->resharing); diff --git a/tests/lib/Share20/DefaultShareProviderTest.php b/tests/lib/Share20/DefaultShareProviderTest.php index a9852882fa8..0f0e77c3207 100644 --- a/tests/lib/Share20/DefaultShareProviderTest.php +++ b/tests/lib/Share20/DefaultShareProviderTest.php @@ -73,7 +73,7 @@ class DefaultShareProviderTest extends \Test\TestCase { /** @var \PHPUnit_Framework_MockObject_MockObject|IURLGenerator */ protected $urlGenerator; - public function setUp() { + public function setUp(): void { $this->dbConn = \OC::$server->getDatabaseConnection(); $this->userManager = $this->createMock(IUserManager::class); $this->groupManager = $this->createMock(IGroupManager::class); @@ -100,7 +100,7 @@ class DefaultShareProviderTest extends \Test\TestCase { ); } - public function tearDown() { + public function tearDown(): void { $this->dbConn->getQueryBuilder()->delete('share')->execute(); $this->dbConn->getQueryBuilder()->delete('filecache')->execute(); $this->dbConn->getQueryBuilder()->delete('storages')->execute(); diff --git a/tests/lib/Share20/LegacyHooksTest.php b/tests/lib/Share20/LegacyHooksTest.php index 057173c4f33..d761d011794 100644 --- a/tests/lib/Share20/LegacyHooksTest.php +++ b/tests/lib/Share20/LegacyHooksTest.php @@ -42,7 +42,7 @@ class LegacyHooksTest extends TestCase { /** @var Manager */ private $manager; - public function setUp() { + public function setUp(): void { parent::setUp(); $this->eventDispatcher = new EventDispatcher(); diff --git a/tests/lib/Share20/ManagerTest.php b/tests/lib/Share20/ManagerTest.php index 3e34a64acf3..45e56114472 100644 --- a/tests/lib/Share20/ManagerTest.php +++ b/tests/lib/Share20/ManagerTest.php @@ -101,7 +101,7 @@ class ManagerTest extends \Test\TestCase { /** @var \OC_Defaults|MockObject */ protected $defaults; - public function setUp() { + public function setUp(): void { $this->logger = $this->createMock(ILogger::class); $this->config = $this->createMock(IConfig::class); diff --git a/tests/lib/Share20/ShareHelperTest.php b/tests/lib/Share20/ShareHelperTest.php index 39141418f35..2562f16e2a4 100644 --- a/tests/lib/Share20/ShareHelperTest.php +++ b/tests/lib/Share20/ShareHelperTest.php @@ -37,7 +37,7 @@ class ShareHelperTest extends TestCase { /** @var ShareHelper */ private $helper; - public function setUp() { + public function setUp(): void { parent::setUp(); $this->manager = $this->createMock(IManager::class); diff --git a/tests/lib/Share20/ShareTest.php b/tests/lib/Share20/ShareTest.php index 9e5c4970d3b..45975d5996c 100644 --- a/tests/lib/Share20/ShareTest.php +++ b/tests/lib/Share20/ShareTest.php @@ -36,7 +36,7 @@ class ShareTest extends \Test\TestCase { /** @var \OCP\Share\IShare */ protected $share; - public function setUp() { + public function setUp(): void { $this->rootFolder = $this->createMock(IRootFolder::class); $this->userManager = $this->createMock(IUserManager::class); $this->share = new \OC\Share20\Share($this->rootFolder, $this->userManager); diff --git a/tests/lib/SubAdminTest.php b/tests/lib/SubAdminTest.php index 8b293426e75..67d4bd1eb2b 100644 --- a/tests/lib/SubAdminTest.php +++ b/tests/lib/SubAdminTest.php @@ -41,7 +41,7 @@ class SubAdminTest extends \Test\TestCase { /** @var \OCP\IGroup[] */ private $groups; - public function setup() { + public function setUp(): void { $this->users = []; $this->groups = []; @@ -83,7 +83,7 @@ class SubAdminTest extends \Test\TestCase { ->execute(); } - public function tearDown() { + public function tearDown(): void { foreach($this->users as $user) { $user->delete(); } diff --git a/tests/lib/Support/CrashReport/RegistryTest.php b/tests/lib/Support/CrashReport/RegistryTest.php index be769e257fc..c45848b6186 100644 --- a/tests/lib/Support/CrashReport/RegistryTest.php +++ b/tests/lib/Support/CrashReport/RegistryTest.php @@ -36,7 +36,7 @@ class RegistryTest extends TestCase { /** @var Registry */ private $registry; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->registry = new Registry(); diff --git a/tests/lib/Support/Subscription/RegistryTest.php b/tests/lib/Support/Subscription/RegistryTest.php index c9557def0fd..a2246bf1b1f 100644 --- a/tests/lib/Support/Subscription/RegistryTest.php +++ b/tests/lib/Support/Subscription/RegistryTest.php @@ -32,7 +32,7 @@ class RegistryTest extends TestCase { /** @var Registry */ private $registry; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->registry = new Registry(); diff --git a/tests/lib/SystemTag/SystemTagManagerTest.php b/tests/lib/SystemTag/SystemTagManagerTest.php index 41c838914c7..2eb52889ab0 100644 --- a/tests/lib/SystemTag/SystemTagManagerTest.php +++ b/tests/lib/SystemTag/SystemTagManagerTest.php @@ -49,7 +49,7 @@ class SystemTagManagerTest extends TestCase { */ private $dispatcher; - public function setUp() { + public function setUp(): void { parent::setUp(); $this->connection = \OC::$server->getDatabaseConnection(); @@ -67,7 +67,7 @@ class SystemTagManagerTest extends TestCase { $this->pruneTagsTables(); } - public function tearDown() { + public function tearDown(): void { $this->pruneTagsTables(); parent::tearDown(); } diff --git a/tests/lib/SystemTag/SystemTagObjectMapperTest.php b/tests/lib/SystemTag/SystemTagObjectMapperTest.php index 69cf7e8f816..9c0545c241d 100644 --- a/tests/lib/SystemTag/SystemTagObjectMapperTest.php +++ b/tests/lib/SystemTag/SystemTagObjectMapperTest.php @@ -64,7 +64,7 @@ class SystemTagObjectMapperTest extends TestCase { */ private $tag3; - public function setUp() { + public function setUp(): void { parent::setUp(); $this->connection = \OC::$server->getDatabaseConnection(); @@ -108,7 +108,7 @@ class SystemTagObjectMapperTest extends TestCase { $this->tagMapper->assignTags('3', 'anothertype', $this->tag1->getId()); } - public function tearDown() { + public function tearDown(): void { $this->pruneTagsTables(); parent::tearDown(); } diff --git a/tests/lib/TagsTest.php b/tests/lib/TagsTest.php index 268521bed51..db0a77f68f0 100644 --- a/tests/lib/TagsTest.php +++ b/tests/lib/TagsTest.php @@ -42,7 +42,7 @@ class TagsTest extends \Test\TestCase { /** @var \OCP\ITagManager */ protected $tagMgr; - protected function setUp() { + protected function setUp(): void { parent::setUp(); \OC_User::clearBackends(); @@ -65,7 +65,7 @@ class TagsTest extends \Test\TestCase { } - protected function tearDown() { + protected function tearDown(): void { $conn = \OC::$server->getDatabaseConnection(); $conn->executeQuery('DELETE FROM `*PREFIX*vcategory_to_object`'); $conn->executeQuery('DELETE FROM `*PREFIX*vcategory`'); diff --git a/tests/lib/TempManagerTest.php b/tests/lib/TempManagerTest.php index c9e069d9d0d..6262bd5a00a 100644 --- a/tests/lib/TempManagerTest.php +++ b/tests/lib/TempManagerTest.php @@ -26,7 +26,7 @@ class TempManagerTest extends \Test\TestCase { protected $baseDir = null; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->baseDir = $this->getManager()->getTempBaseDir() . $this->getUniqueID('/oc_tmp_test'); @@ -35,7 +35,7 @@ class TempManagerTest extends \Test\TestCase { } } - protected function tearDown() { + protected function tearDown(): void { \OC_Helper::rmdirr($this->baseDir); $this->baseDir = null; parent::tearDown(); diff --git a/tests/lib/Template/CSSResourceLocatorTest.php b/tests/lib/Template/CSSResourceLocatorTest.php index 790d1f44e1b..7c9f3585038 100644 --- a/tests/lib/Template/CSSResourceLocatorTest.php +++ b/tests/lib/Template/CSSResourceLocatorTest.php @@ -54,7 +54,7 @@ class CSSResourceLocatorTest extends \Test\TestCase { /** @var ITimeFactory|\PHPUnit_Framework_MockObject_MockObject */ private $timeFactory; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->logger = $this->createMock(ILogger::class); diff --git a/tests/lib/Template/IconsCacherTest.php b/tests/lib/Template/IconsCacherTest.php index 50b678da6d3..8e36426393f 100644 --- a/tests/lib/Template/IconsCacherTest.php +++ b/tests/lib/Template/IconsCacherTest.php @@ -50,7 +50,7 @@ class IconsCacherTest extends \Test\TestCase { /** @var ITimeFactory|\PHPUnit_Framework_MockObject_MockObject */ private $timeFactory; - protected function setUp() { + protected function setUp(): void { $this->logger = $this->createMock(ILogger::class); $this->appData = $this->createMock(AppData::class); $this->timeFactory = $this->createMock(ITimeFactory::class); diff --git a/tests/lib/Template/JSCombinerTest.php b/tests/lib/Template/JSCombinerTest.php index 51b15b80405..b12124ea5a9 100644 --- a/tests/lib/Template/JSCombinerTest.php +++ b/tests/lib/Template/JSCombinerTest.php @@ -52,7 +52,7 @@ class JSCombinerTest extends \Test\TestCase { /** @var ICacheFactory|\PHPUnit_Framework_MockObject_MockObject */ protected $cacheFactory; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->appData = $this->createMock(IAppData::class); diff --git a/tests/lib/Template/JSResourceLocatorTest.php b/tests/lib/Template/JSResourceLocatorTest.php index 400637ae960..38c5fc0eadd 100644 --- a/tests/lib/Template/JSResourceLocatorTest.php +++ b/tests/lib/Template/JSResourceLocatorTest.php @@ -43,7 +43,7 @@ class JSResourceLocatorTest extends \Test\TestCase { /** @var ILogger|\PHPUnit_Framework_MockObject_MockObject */ protected $logger; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->appData = $this->createMock(IAppData::class); diff --git a/tests/lib/Template/ResourceLocatorTest.php b/tests/lib/Template/ResourceLocatorTest.php index 580dfd60d0e..90488071b4f 100644 --- a/tests/lib/Template/ResourceLocatorTest.php +++ b/tests/lib/Template/ResourceLocatorTest.php @@ -15,7 +15,7 @@ class ResourceLocatorTest extends \Test\TestCase { /** @var \PHPUnit_Framework_MockObject_MockObject */ protected $logger; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->logger = $this->createMock(ILogger::class); } diff --git a/tests/lib/Template/SCSSCacherTest.php b/tests/lib/Template/SCSSCacherTest.php index 421046b38f3..6f9fdf1e7fb 100644 --- a/tests/lib/Template/SCSSCacherTest.php +++ b/tests/lib/Template/SCSSCacherTest.php @@ -62,7 +62,7 @@ class SCSSCacherTest extends \Test\TestCase { /** @var ITimeFactory|\PHPUnit_Framework_MockObject_MockObject */ protected $timeFactory; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->logger = $this->createMock(ILogger::class); $this->appData = $this->createMock(AppData::class); diff --git a/tests/lib/TemplateFunctionsTest.php b/tests/lib/TemplateFunctionsTest.php index aa3c73d4743..ac73873ce37 100644 --- a/tests/lib/TemplateFunctionsTest.php +++ b/tests/lib/TemplateFunctionsTest.php @@ -24,7 +24,7 @@ namespace Test; class TemplateFunctionsTest extends \Test\TestCase { - protected function setUp() { + protected function setUp(): void { parent::setUp(); $loader = new \OC\Autoloader([\OC::$SERVERROOT . '/lib']); diff --git a/tests/lib/TestCase.php b/tests/lib/TestCase.php index 96ee0f06f8c..b80e720efd3 100644 --- a/tests/lib/TestCase.php +++ b/tests/lib/TestCase.php @@ -108,7 +108,7 @@ abstract class TestCase extends \PHPUnit\Framework\TestCase { }); } - protected function setUp() { + protected function setUp(): void { // overwrite the command bus with one we can run ourselves $this->commandBus = new QueueBus(); $this->overwriteService('AsyncCommandBus', $this->commandBus); @@ -134,7 +134,7 @@ abstract class TestCase extends \PHPUnit\Framework\TestCase { } } - protected function onNotSuccessfulTest(\Throwable $t) { + protected function onNotSuccessfulTest(\Throwable $t): void { $this->restoreAllServices(); // restore database connection @@ -147,7 +147,7 @@ abstract class TestCase extends \PHPUnit\Framework\TestCase { parent::onNotSuccessfulTest($t); } - protected function tearDown() { + protected function tearDown(): void { $this->restoreAllServices(); // restore database connection @@ -238,7 +238,7 @@ abstract class TestCase extends \PHPUnit\Framework\TestCase { ); } - public static function tearDownAfterClass() { + public static function tearDownAfterClass(): void { if (!self::$wasDatabaseAllowed && self::$realDatabase !== null) { // in case an error is thrown in a test, PHPUnit jumps straight to tearDownAfterClass, // so we need the database again diff --git a/tests/lib/Traits/EncryptionTrait.php b/tests/lib/Traits/EncryptionTrait.php index 1f389fc82c8..ad98ba91212 100644 --- a/tests/lib/Traits/EncryptionTrait.php +++ b/tests/lib/Traits/EncryptionTrait.php @@ -23,8 +23,8 @@ trait EncryptionTrait { abstract protected function registerStorageWrapper($name, $wrapper); // from phpunit - abstract protected function markTestSkipped($reason = ''); - abstract protected function assertTrue($condition, $message = ''); + abstract protected function markTestSkipped(string $message = ''): void; + abstract protected function assertTrue($condition, string $message = ''): void; private $encryptionWasEnabled; diff --git a/tests/lib/Updater/ChangesCheckTest.php b/tests/lib/Updater/ChangesCheckTest.php index fe25e8cebaf..b5aab5be65f 100644 --- a/tests/lib/Updater/ChangesCheckTest.php +++ b/tests/lib/Updater/ChangesCheckTest.php @@ -49,7 +49,7 @@ class ChangesCheckTest extends TestCase { /** @var ILogger|\PHPUnit_Framework_MockObject_MockObject */ protected $logger; - public function setUp() { + public function setUp(): void { parent::setUp(); $this->clientService = $this->createMock(IClientService::class); diff --git a/tests/lib/Updater/VersionCheckTest.php b/tests/lib/Updater/VersionCheckTest.php index eef16eeb520..911e883e99b 100644 --- a/tests/lib/Updater/VersionCheckTest.php +++ b/tests/lib/Updater/VersionCheckTest.php @@ -33,7 +33,7 @@ class VersionCheckTest extends \Test\TestCase { /** @var VersionCheck | \PHPUnit_Framework_MockObject_MockObject*/ private $updater; - public function setUp() { + public function setUp(): void { parent::setUp(); $this->config = $this->getMockBuilder(IConfig::class) ->disableOriginalConstructor() diff --git a/tests/lib/UpdaterTest.php b/tests/lib/UpdaterTest.php index 47028cf3f18..2df235b3840 100644 --- a/tests/lib/UpdaterTest.php +++ b/tests/lib/UpdaterTest.php @@ -40,7 +40,7 @@ class UpdaterTest extends TestCase { /** @var Installer|\PHPUnit_Framework_MockObject_MockObject */ private $installer; - public function setUp() { + public function setUp(): void { parent::setUp(); $this->config = $this->getMockBuilder(IConfig::class) ->disableOriginalConstructor() diff --git a/tests/lib/UrlGeneratorTest.php b/tests/lib/UrlGeneratorTest.php index 9a8e588a229..0582a7120b8 100644 --- a/tests/lib/UrlGeneratorTest.php +++ b/tests/lib/UrlGeneratorTest.php @@ -28,7 +28,7 @@ class UrlGeneratorTest extends \Test\TestCase { /** @var string */ private $originalWebRoot; - public function setUp() { + public function setUp(): void { parent::setUp(); $this->config = $this->createMock(IConfig::class); $this->cacheFactory = $this->createMock(ICacheFactory::class); @@ -41,7 +41,7 @@ class UrlGeneratorTest extends \Test\TestCase { $this->originalWebRoot = \OC::$WEBROOT; } - public function tearDown() { + public function tearDown(): void { // Reset webRoot \OC::$WEBROOT = $this->originalWebRoot; } diff --git a/tests/lib/User/DatabaseTest.php b/tests/lib/User/DatabaseTest.php index 8e52be50c75..202a8225f94 100644 --- a/tests/lib/User/DatabaseTest.php +++ b/tests/lib/User/DatabaseTest.php @@ -47,7 +47,7 @@ class DatabaseTest extends Backend { return $user; } - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->eventDispatcher = $this->createMock(IEventDispatcher::class); @@ -55,7 +55,7 @@ class DatabaseTest extends Backend { $this->backend=new \OC\User\Database($this->eventDispatcher); } - protected function tearDown() { + protected function tearDown(): void { if(!isset($this->users)) { return; } diff --git a/tests/lib/User/Dummy.php b/tests/lib/User/Dummy.php index 50382aa8fe6..7eb5cc41ba8 100644 --- a/tests/lib/User/Dummy.php +++ b/tests/lib/User/Dummy.php @@ -23,7 +23,7 @@ namespace Test\User; class Dummy extends Backend { - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->backend=new \Test\Util\User\Dummy(); } diff --git a/tests/lib/User/ManagerTest.php b/tests/lib/User/ManagerTest.php index b99d499b2a8..4d70e30273a 100644 --- a/tests/lib/User/ManagerTest.php +++ b/tests/lib/User/ManagerTest.php @@ -30,7 +30,7 @@ class ManagerTest extends TestCase { /** @var EventDispatcherInterface */ private $dispatcher; - public function setUp() { + public function setUp(): void { parent::setUp(); $this->config = $this->createMock(IConfig::class); diff --git a/tests/lib/User/SessionTest.php b/tests/lib/User/SessionTest.php index a37181c504c..a9d466e5408 100644 --- a/tests/lib/User/SessionTest.php +++ b/tests/lib/User/SessionTest.php @@ -61,7 +61,7 @@ class SessionTest extends \Test\TestCase { /** @var IEventDispatcher|MockObject */ private $dispatcher; - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->timeFactory = $this->createMock(ITimeFactory::class); diff --git a/tests/lib/User/UserTest.php b/tests/lib/User/UserTest.php index a800e790370..b4964e28206 100644 --- a/tests/lib/User/UserTest.php +++ b/tests/lib/User/UserTest.php @@ -33,7 +33,7 @@ class UserTest extends TestCase { /** @var EventDispatcherInterface|MockObject */ protected $dispatcher; - public function setUp() { + public function setUp(): void { parent::setUp(); $this->dispatcher = $this->createMock(EventDispatcherInterface::class); } diff --git a/tests/lib/UtilCheckServerTest.php b/tests/lib/UtilCheckServerTest.php index c597a6b770b..3f956601ce4 100644 --- a/tests/lib/UtilCheckServerTest.php +++ b/tests/lib/UtilCheckServerTest.php @@ -36,7 +36,7 @@ class UtilCheckServerTest extends \Test\TestCase { return $config; } - protected function setUp() { + protected function setUp(): void { parent::setUp(); $this->datadir = \OC::$server->getTempManager()->getTemporaryFolder(); @@ -45,7 +45,7 @@ class UtilCheckServerTest extends \Test\TestCase { \OC::$server->getSession()->set('checkServer_succeeded', false); } - protected function tearDown() { + protected function tearDown(): void { // clean up @unlink($this->datadir . '/.ocdata'); parent::tearDown(); diff --git a/tests/lib/UtilTest.php b/tests/lib/UtilTest.php index d731085af46..a5ddd50ab27 100644 --- a/tests/lib/UtilTest.php +++ b/tests/lib/UtilTest.php @@ -348,13 +348,13 @@ class UtilTest extends \Test\TestCase { $this->assertNotEmpty($errors); } - protected function setUp() { + protected function setUp(): void { parent::setUp(); \OC_Util::$scripts = []; \OC_Util::$styles = []; } - protected function tearDown() { + protected function tearDown(): void { parent::tearDown(); \OC_Util::$scripts = []; diff --git a/tests/phpunit-autotest.xml b/tests/phpunit-autotest.xml index b09b571c1c7..da786c765f8 100644 --- a/tests/phpunit-autotest.xml +++ b/tests/phpunit-autotest.xml @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> <phpunit bootstrap="bootstrap.php" - strict="true" verbose="true" backupGlobals="false" timeoutForSmallTests="900" diff --git a/tests/startsessionlistener.php b/tests/startsessionlistener.php index 24a72db0065..d9d23ee6db8 100644 --- a/tests/startsessionlistener.php +++ b/tests/startsessionlistener.php @@ -18,7 +18,7 @@ class StartSessionListener implements TestListener { use TestListenerDefaultImplementation; - public function endTest(Test $test, $time) { + public function endTest(Test $test, float $time): void { // reopen the session - only allowed for memory session if (\OC::$server->getSession() instanceof Memory) { /** @var $session Memory */ |