Declare testCase methods void to match modern phpunit declaration

owncloud · Jul 16, 2019 · 6026ba0 · 6026ba0
1 parent 7480e0d
commit 6026ba0
Show file tree

Hide file tree

Showing 518 changed files with 666 additions and 666 deletions.
diff --git a/apps/comments/tests/unit/ActivityListenerTest.php b/apps/comments/tests/unit/ActivityListenerTest.php
@@ -71,7 +71,7 @@ class ActivityListenerTest extends \Test\TestCase {
 	 */
 	private $activityManager;
 
-	protected function setUp() {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->activityManager = $this->createMock(IManager::class);

diff --git a/apps/comments/tests/unit/Dav/CommentsNodeTest.php b/apps/comments/tests/unit/Dav/CommentsNodeTest.php
@@ -35,7 +35,7 @@ class CommentsNodeTest extends \Test\TestCase {
 	protected $logger;
 	protected $userSession;
 
-	public function setUp() {
+	public function setUp(): void {
 		parent::setUp();
 
 		$this->commentsManager = $this->createMock('\OCP\Comments\ICommentsManager');

diff --git a/apps/comments/tests/unit/Dav/CommentsPluginTest.php b/apps/comments/tests/unit/Dav/CommentsPluginTest.php
@@ -44,7 +44,7 @@ class CommentsPluginTest extends \Test\TestCase {
 	/** @var CommentsPluginImplementation */
 	private $plugin;
 
-	public function setUp() {
+	public function setUp(): void {
 		parent::setUp();
 		$this->tree = $this->getMockBuilder('\Sabre\DAV\Tree')
 			->disableOriginalConstructor()

diff --git a/apps/comments/tests/unit/Dav/EntityCollectionTest.php b/apps/comments/tests/unit/Dav/EntityCollectionTest.php
@@ -46,7 +46,7 @@ class EntityCollectionTest extends \Test\TestCase {
 	/** @var EventDispatcherInterface | \PHPUnit\Framework\MockObject\MockObject */
 	private $dispatcher;
 
-	public function setUp() {
+	public function setUp(): void {
 		parent::setUp();
 
 		$this->commentsManager = $this->createMock(ICommentsManager::class);

diff --git a/apps/comments/tests/unit/Dav/EntityTypeCollectionTest.php b/apps/comments/tests/unit/Dav/EntityTypeCollectionTest.php
@@ -48,7 +48,7 @@ class EntityTypeCollectionTest extends \Test\TestCase {
 	/** @var EventDispatcherInterface | \PHPUnit\Framework\MockObject\MockObject */
 	private $dispatcher;
 
-	public function setUp() {
+	public function setUp(): void {
 		parent::setUp();
 
 		$this->commentsManager = $this->createMock(ICommentsManager::class);

diff --git a/apps/comments/tests/unit/Dav/RootCollectionTest.php b/apps/comments/tests/unit/Dav/RootCollectionTest.php
@@ -45,7 +45,7 @@ class RootCollectionTest extends \Test\TestCase {
 	/** @var \OCP\IUser|\PHPUnit\Framework\MockObject\MockObject */
 	protected $user;
 
-	public function setUp() {
+	public function setUp(): void {
 		parent::setUp();
 
 		$this->user = $this->createMock('\OCP\IUser');

diff --git a/apps/dav/tests/unit/Avatars/AvatarHomeTest.php b/apps/dav/tests/unit/Avatars/AvatarHomeTest.php
@@ -37,7 +37,7 @@ class AvatarHomeTest extends TestCase {
 	/** @var IAvatarManager | \PHPUnit\Framework\MockObject\MockObject */
 	private $avatarManager;
 
-	public function setUp() {
+	public function setUp(): void {
 		$this->avatarManager = $this->createMock(IAvatarManager::class);
 		$this->home = new AvatarHome(['uri' => 'principals/users/admin'], $this->avatarManager);
 	}

diff --git a/apps/dav/tests/unit/BackgroundJob/CleanPropertiesTest.php b/apps/dav/tests/unit/BackgroundJob/CleanPropertiesTest.php
@@ -44,7 +44,7 @@ class CleanPropertiesTest extends TestCase {
 	/** @var string */
 	private $username;
 
-	public function setUp() {
+	public function setUp(): void {
 		parent::setUp();
 
 		$this->connection = \OC::$server->getDatabaseConnection();

diff --git a/apps/dav/tests/unit/CalDAV/AbstractCalDavBackendTest.php b/apps/dav/tests/unit/CalDAV/AbstractCalDavBackendTest.php
@@ -59,7 +59,7 @@ abstract class AbstractCalDavBackendTest extends TestCase {
 	/** @var ISecureRandom */
 	private $random;
 
-	public function setUp() {
+	public function setUp(): void {
 		parent::setUp();
 
 		$this->principal = $this->getMockBuilder(Principal::class)
@@ -83,7 +83,7 @@ public function setUp() {
 		$this->tearDown();
 	}
 
-	public function tearDown() {
+	public function tearDown(): void {
 		parent::tearDown();
 
 		if ($this->backend === null) {

diff --git a/apps/dav/tests/unit/CalDAV/CalendarTest.php b/apps/dav/tests/unit/CalDAV/CalendarTest.php
@@ -36,7 +36,7 @@ class CalendarTest extends TestCase {
 	/** @var IL10N */
 	private $l10n;
 
-	public function setUp() {
+	public function setUp(): void {
 		parent::setUp();
 		$this->l10n = $this->getMockBuilder(IL10N::class)
 			->disableOriginalConstructor()->getMock();

diff --git a/apps/dav/tests/unit/CalDAV/PluginTest.php b/apps/dav/tests/unit/CalDAV/PluginTest.php
@@ -14,7 +14,7 @@ class PluginTest extends TestCase {
 	/** @var Plugin */
 	private $plugin;
 
-	protected function setUp() {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->plugin = new Plugin();

diff --git a/apps/dav/tests/unit/CalDAV/PublicCalendarRootTest.php b/apps/dav/tests/unit/CalDAV/PublicCalendarRootTest.php
@@ -61,7 +61,7 @@ class PublicCalendarRootTest extends TestCase {
 	/** @var ISecureRandom */
 	private $random;
 
-	public function setUp() {
+	public function setUp(): void {
 		parent::setUp();
 
 		$db = \OC::$server->getDatabaseConnection();
@@ -81,7 +81,7 @@ public function setUp() {
 			->disableOriginalConstructor()->getMock();
 	}
 
-	public function tearDown() {
+	public function tearDown(): void {
 		parent::tearDown();
 
 		if ($this->backend === null) {

diff --git a/apps/dav/tests/unit/CalDAV/Publishing/PublishingTest.php b/apps/dav/tests/unit/CalDAV/Publishing/PublishingTest.php
@@ -44,7 +44,7 @@ class PluginTest extends TestCase {
 	/** @var IURLGenerator | \PHPUnit\Framework\MockObject\MockObject */
 	private $urlGenerator;
 
-	public function setUp() {
+	public function setUp(): void {
 		parent::setUp();
 
 		$this->config = $this->getMockBuilder('\OCP\IConfig')->

diff --git a/apps/dav/tests/unit/CardDAV/AddressBookImplTest.php b/apps/dav/tests/unit/CardDAV/AddressBookImplTest.php
@@ -52,7 +52,7 @@ class AddressBookImplTest extends TestCase {
 	/** @var  VCard | \PHPUnit\Framework\MockObject\MockObject */
 	private $vCard;
 
-	public function setUp() {
+	public function setUp(): void {
 		parent::setUp();
 
 		$this->addressBookInfo = [

diff --git a/apps/dav/tests/unit/CardDAV/BirthdayServiceTest.php b/apps/dav/tests/unit/CardDAV/BirthdayServiceTest.php
@@ -42,7 +42,7 @@ class BirthdayServiceTest extends TestCase {
 	/** @var GroupPrincipalBackend | \PHPUnit\Framework\MockObject\MockObject */
 	private $groupPrincipalBackend;
 
-	public function setUp() {
+	public function setUp(): void {
 		parent::setUp();
 
 		$this->calDav = $this->getMockBuilder(CalDavBackend::class)->disableOriginalConstructor()->getMock();

diff --git a/apps/dav/tests/unit/CardDAV/CardDavBackendTest.php b/apps/dav/tests/unit/CardDAV/CardDavBackendTest.php
@@ -68,7 +68,7 @@ class CardDavBackendTest extends TestCase {
 	const UNIT_TEST_USER1 = 'principals/users/carddav-unit-test1';
 	const UNIT_TEST_GROUP = 'principals/groups/carddav-unit-test-group';
 
-	public function setUp() {
+	public function setUp(): void {
 		parent::setUp();
 
 		$this->principal = $this->getMockBuilder(Principal::class)
@@ -98,7 +98,7 @@ public function setUp() {
 		$this->tearDown();
 	}
 
-	public function tearDown() {
+	public function tearDown(): void {
 		parent::tearDown();
 
 		if ($this->backend === null) {

diff --git a/apps/dav/tests/unit/CardDAV/ImageExportPluginTest.php b/apps/dav/tests/unit/CardDAV/ImageExportPluginTest.php
@@ -46,7 +46,7 @@ class ImageExportPluginTest extends TestCase {
 	/** @var ILogger | \PHPUnit\Framework\MockObject\MockObject */
 	private $logger;
 
-	public function setUp() {
+	public function setUp(): void {
 		parent::setUp();
 
 		$this->request = $this->getMockBuilder('Sabre\HTTP\RequestInterface')->getMock();

diff --git a/apps/dav/tests/unit/CardDAV/Sharing/PluginTest.php b/apps/dav/tests/unit/CardDAV/Sharing/PluginTest.php
@@ -41,7 +41,7 @@ class PluginTest extends TestCase {
 	/** @var IShareable | \PHPUnit\Framework\MockObject\MockObject */
 	private $book;
 
-	public function setUp() {
+	public function setUp(): void {
 		parent::setUp();
 
 		/** @var Auth | \PHPUnit\Framework\MockObject\MockObject $authBackend */

diff --git a/apps/dav/tests/unit/Command/CleanupChunksTest.php b/apps/dav/tests/unit/Command/CleanupChunksTest.php
@@ -42,7 +42,7 @@ class CleanupChunksTest extends TestCase {
 	/** @var IUser */
 	private $user;
 
-	public function setUp() {
+	public function setUp(): void {
 		parent::setUp();
 
 		$command = new CleanupChunks(\OC::$server->getUserManager());

diff --git a/apps/dav/tests/unit/Connector/PublicAuthTest.php b/apps/dav/tests/unit/Connector/PublicAuthTest.php
@@ -49,7 +49,7 @@ class PublicAuthTest extends \Test\TestCase {
 	/** @var string */
 	private $oldUser;
 
-	protected function setUp() {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->session = $this->createMock('\OCP\ISession');
@@ -66,7 +66,7 @@ protected function setUp() {
 		$this->oldUser = \OC_User::getUser();
 	}
 
-	protected function tearDown() {
+	protected function tearDown(): void {
 		\OC_User::setIncognitoMode(false);
 
 		// Set old user

diff --git a/apps/dav/tests/unit/Connector/Sabre/AuthTest.php b/apps/dav/tests/unit/Connector/Sabre/AuthTest.php
@@ -60,7 +60,7 @@ class AuthTest extends TestCase {
 	/** @var AccountModuleManager | \PHPUnit\Framework\MockObject\MockObject */
 	private $accountModuleManager;
 
-	public function setUp() {
+	public function setUp(): void {
 		parent::setUp();
 		$this->session = $this->createMock(ISession::class);
 		$this->userSession = $this->createMock(Session::class);

diff --git a/apps/dav/tests/unit/Connector/Sabre/BlockLegacyClientPluginTest.php b/apps/dav/tests/unit/Connector/Sabre/BlockLegacyClientPluginTest.php
@@ -39,7 +39,7 @@ class BlockLegacyClientPluginTest extends TestCase {
 	/** @var BlockLegacyClientPlugin */
 	private $blockLegacyClientVersionPlugin;
 
-	public function setUp() {
+	public function setUp(): void {
 		parent::setUp();
 
 		$this->config = $this->createMock('\OCP\IConfig');

diff --git a/apps/dav/tests/unit/Connector/Sabre/CommentsPropertiesPluginTest.php b/apps/dav/tests/unit/Connector/Sabre/CommentsPropertiesPluginTest.php
@@ -34,7 +34,7 @@ class CommentsPropertiesPluginTest extends \Test\TestCase {
 	protected $server;
 	protected $userFolder;
 
-	public function setUp() {
+	public function setUp(): void {
 		parent::setUp();
 
 		$this->commentsManager = $this->createMock('\OCP\Comments\ICommentsManager');

diff --git a/apps/dav/tests/unit/Connector/Sabre/CopyEtagHeaderPluginTest.php b/apps/dav/tests/unit/Connector/Sabre/CopyEtagHeaderPluginTest.php
@@ -42,7 +42,7 @@ class CopyEtagHeaderPluginTest extends TestCase {
 	/** @var Server */
 	private $server;
 
-	public function setUp() {
+	public function setUp(): void {
 		parent::setUp();
 		$this->server = new \Sabre\DAV\Server();
 		$this->plugin = new CopyEtagHeaderPlugin();

diff --git a/apps/dav/tests/unit/Connector/Sabre/CorsPluginTest.php b/apps/dav/tests/unit/Connector/Sabre/CorsPluginTest.php
@@ -52,7 +52,7 @@ class CorsPluginTest extends TestCase {
 	 */
 	private $config;
 
-	public function setUp() {
+	public function setUp(): void {
 		parent::setUp();
 		$this->server = new Server();
 
@@ -80,7 +80,7 @@ public function setUp() {
 		$this->server->addPlugin($extraMethodPlugin);
 	}
 
-	public function tearDown() {
+	public function tearDown(): void {
 		$this->restoreService('AllConfig');
 	}
 

diff --git a/apps/dav/tests/unit/Connector/Sabre/DirectoryTest.php b/apps/dav/tests/unit/Connector/Sabre/DirectoryTest.php
@@ -75,7 +75,7 @@ class DirectoryTest extends \Test\TestCase {
 	/** @var \OC\Files\FileInfo | \PHPUnit\Framework\MockObject\MockObject */
 	private $info;
 
-	protected function setUp() {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->view = $this->createMock('OC\Files\View', [], [], '', false);

diff --git a/apps/dav/tests/unit/Connector/Sabre/DummyGetResponsePluginTest.php b/apps/dav/tests/unit/Connector/Sabre/DummyGetResponsePluginTest.php
@@ -35,7 +35,7 @@ class DummyGetResponsePluginTest extends TestCase {
 	/** @var DummyGetResponsePlugin */
 	private $dummyGetResponsePlugin;
 
-	public function setUp() {
+	public function setUp(): void {
 		parent::setUp();
 
 		$this->dummyGetResponsePlugin = new DummyGetResponsePlugin();

diff --git a/apps/dav/tests/unit/Connector/Sabre/FileTest.php b/apps/dav/tests/unit/Connector/Sabre/FileTest.php
@@ -69,7 +69,7 @@ class FileTest extends TestCase {
 	/** @var IConfig | \PHPUnit\Framework\MockObject\MockObject */
 	protected $config;
 
-	public function setUp() {
+	public function setUp(): void {
 		parent::setUp();
 		unset($_SERVER['HTTP_OC_CHUNKED'], $_SERVER['CONTENT_LENGTH'], $_SERVER['REQUEST_METHOD']);
 
@@ -84,7 +84,7 @@ public function setUp() {
 		$this->config = $this->getMockBuilder('\OCP\IConfig')->getMock();
 	}
 
-	public function tearDown() {
+	public function tearDown(): void {
 		$userManager = \OC::$server->getUserManager();
 		if ($userManager->userExists($this->user)) {
 			$userManager->get($this->user)->delete();

diff --git a/apps/dav/tests/unit/Connector/Sabre/FilesPluginTest.php b/apps/dav/tests/unit/Connector/Sabre/FilesPluginTest.php
@@ -87,7 +87,7 @@ class FilesPluginTest extends TestCase {
 	 */
 	private $request;
 
-	public function setUp() {
+	public function setUp(): void {
 		parent::setUp();
 		$this->server = $this->getMockBuilder(Server::class)
 			->disableOriginalConstructor()

diff --git a/apps/dav/tests/unit/Connector/Sabre/FilesReportPluginTest.php b/apps/dav/tests/unit/Connector/Sabre/FilesReportPluginTest.php
@@ -66,7 +66,7 @@ class FilesReportPluginTest extends \Test\TestCase {
 	/** @var Folder|\PHPUnit\Framework\MockObject\MockObject **/
 	private $userFolder;
 
-	public function setUp() {
+	public function setUp(): void {
 		parent::setUp();
 		$this->tree = $this->getMockBuilder('\Sabre\DAV\Tree')
 			->disableOriginalConstructor()

diff --git a/apps/dav/tests/unit/Connector/Sabre/FilesSearchReportPluginTest.php b/apps/dav/tests/unit/Connector/Sabre/FilesSearchReportPluginTest.php
@@ -45,7 +45,7 @@ class FilesSearchReportPluginTest extends \Test\TestCase {
 	/** @var FilesSearchReportPlugin|\PHPUnit\Framework\MockObject\MockObject */
 	private $plugin;
 
-	public function setUp() {
+	public function setUp(): void {
 		parent::setUp();
 
 		$this->tree = $this->getMockBuilder(Tree::class)

diff --git a/apps/dav/tests/unit/Connector/Sabre/MaintenancePluginTest.php b/apps/dav/tests/unit/Connector/Sabre/MaintenancePluginTest.php
@@ -37,7 +37,7 @@ class MaintenancePluginTest extends TestCase {
 	/** @var MaintenancePlugin */
 	private $maintenancePlugin;
 
-	public function setUp() {
+	public function setUp(): void {
 		parent::setUp();
 
 		$this->config = $this->createMock('\OCP\IConfig');

diff --git a/apps/dav/tests/unit/Connector/Sabre/PrincipalTest.php b/apps/dav/tests/unit/Connector/Sabre/PrincipalTest.php
@@ -37,7 +37,7 @@ class PrincipalTest extends TestCase {
 	/** @var IGroupManager | \PHPUnit\Framework\MockObject\MockObject */
 	private $groupManager;
 
-	public function setUp() {
+	public function setUp(): void {
 		$this->userManager = $this->getMockBuilder('\OCP\IUserManager')
 			->disableOriginalConstructor()->getMock();
 		$this->groupManager = $this->getMockBuilder('\OCP\IGroupManager')

diff --git a/apps/dav/tests/unit/Connector/Sabre/RequestTest/PartFileInRootUploadTest.php b/apps/dav/tests/unit/Connector/Sabre/RequestTest/PartFileInRootUploadTest.php
@@ -33,18 +33,18 @@
 class PartFileInRootUploadTest extends UploadTest {
 	protected $original;
 
-	protected function setUp() {
+	protected function setUp(): void {
 		$config = \OC::$server->getConfig();
 		$this->original = $config->getSystemValue('part_file_in_storage', null);
 		$config->setSystemValue('part_file_in_storage', false);
 		parent::setUp();
 	}
 
-	protected function tearDown() {
+	protected function tearDown(): void {
 		if ($this->original !== null) {
 			$config = \OC::$server->getConfig();
 			$this->original = $config->setSystemValue('part_file_in_storage', $this->original);
 		}
-		return parent::tearDown();
+		parent::tearDown();
 	}
 }
diff --git a/apps/dav/tests/unit/Connector/Sabre/RequestTest/RequestTest.php b/apps/dav/tests/unit/Connector/Sabre/RequestTest/RequestTest.php
@@ -50,7 +50,7 @@ protected function getStream($string) {
 		return $stream;
 	}
 
-	protected function setUp() {
+	protected function setUp(): void {
 		parent::setUp();
 
 		unset($_SERVER['HTTP_OC_CHUNKED']);

diff --git a/apps/dav/tests/unit/Connector/Sabre/SharesPluginTest.php b/apps/dav/tests/unit/Connector/Sabre/SharesPluginTest.php
@@ -52,7 +52,7 @@ class SharesPluginTest extends \Test\TestCase {
 	 */
 	private $plugin;
 
-	public function setUp() {
+	public function setUp(): void {
 		parent::setUp();
 		$this->server = new \Sabre\DAV\Server();
 		$this->tree = $this->getMockBuilder('\Sabre\DAV\Tree')

diff --git a/apps/dav/tests/unit/Connector/Sabre/TagsPluginTest.php b/apps/dav/tests/unit/Connector/Sabre/TagsPluginTest.php
@@ -58,7 +58,7 @@ class TagsPluginTest extends \Test\TestCase {
 	 */
 	private $plugin;
 
-	public function setUp() {
+	public function setUp(): void {
 		parent::setUp();
 		$this->server = new \Sabre\DAV\Server();
 		$this->tree = $this->getMockBuilder('\Sabre\DAV\Tree')