Fix tests against latest Nextcloud master

Signed-off-by: Christoph Wurst <[email protected]>

Author: ChristophWurst

.travis.yml

@@ -1,8 +1,8 @@
 language: php
 php:
-  - 7.1
   - 7.2
   - 7.3
+  - 7.4
 
 env:
   global:

tests/unit/AppWhitelistTest.php

@@ -28,24 +28,25 @@
 use OCP\IL10N;
 use OCP\IURLGenerator;
 use OCP\IUser;
+use PHPUnit\Framework\MockObject\MockObject;
 use Test\TestCase;
 
 class AppWhitelistTest extends TestCase {
-	/** @var Config|\PHPUnit_Framework_MockObject_MockObject */
+	/** @var Config|MockObject */
 	private $config;
-	/** @var GuestManager|\PHPUnit_Framework_MockObject_MockObject */
+	/** @var GuestManager|MockObject */
 	private $guestManager;
-	/** @var IL10N|\PHPUnit_Framework_MockObject_MockObject */
+	/** @var IL10N|MockObject */
 	private $l10n;
-	/** @var IAppManager|\PHPUnit_Framework_MockObject_MockObject */
+	/** @var IAppManager|MockObject */
 	private $appManager;
-	/** @var IURLGenerator|\PHPUnit_Framework_MockObject_MockObject */
+	/** @var IURLGenerator|MockObject */
 	private $urlGenerator;
 
 	/** @var AppWhitelist */
 	private $appWhitelist;
 
-	protected function setUp() {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->config = $this->createMock(Config::class);

tests/unit/GroupBackendTest.php

@@ -26,20 +26,21 @@
 use OCA\Guests\GuestManager;
 use OCP\IUser;
 use OCP\IUserSession;
+use PHPUnit\Framework\MockObject\MockObject;
 use Test\TestCase;
 
 class GroupBackendTest extends TestCase {
-	/** @var GuestManager|\PHPUnit_Framework_MockObject_MockObject */
+	/** @var GuestManager|MockObject */
 	private $guestManager;
-	/** @var Config|\PHPUnit_Framework_MockObject_MockObject */
+	/** @var Config|MockObject */
 	private $config;
-	/** @var IUserSession|\PHPUnit_Framework_MockObject_MockObject */
+	/** @var IUserSession|MockObject */
 	private $userSession;
 
 	/** @var GroupBackend */
 	private $backend;
 
-	protected function setUp() {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->guestManager = $this->createMock(GuestManager::class);

tests/unit/GuestManagerTest.php

@@ -31,30 +31,31 @@
 use OCP\Security\ICrypto;
 use OCP\Security\ISecureRandom;
 use OCP\Share\IManager;
+use PHPUnit\Framework\MockObject\MockObject;
 use Test\TestCase;
 
 class GuestManagerTest extends TestCase {
-	/** @var UserBackend|\PHPUnit_Framework_MockObject_MockObject */
+	/** @var UserBackend|MockObject */
 	private $userBackend;
-	/** @var IUserSession|\PHPUnit_Framework_MockObject_MockObject */
+	/** @var IUserSession|MockObject */
 	private $userSession;
-	/** @var IConfig|\PHPUnit_Framework_MockObject_MockObject */
+	/** @var IConfig|MockObject */
 	private $config;
-	/** @var ISecureRandom|\PHPUnit_Framework_MockObject_MockObject */
+	/** @var ISecureRandom|MockObject */
 	private $random;
-	/** @var ICrypto|\PHPUnit_Framework_MockObject_MockObject */
+	/** @var ICrypto|MockObject */
 	private $crypto;
-	/** @var IManager|\PHPUnit_Framework_MockObject_MockObject */
+	/** @var IManager|MockObject */
 	private $shareManager;
-	/** @var IDBConnection|\PHPUnit_Framework_MockObject_MockObject */
+	/** @var IDBConnection|MockObject */
 	private $conneciton;
-	/** @var IEventDispatcher|\PHPUnit_Framework_MockObject_MockObject */
+	/** @var IEventDispatcher|MockObject */
 	private $eventDispatcher;
 
 	/** @var GuestManager */
 	private $guestManager;
 
-	protected function setUp() {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->userBackend = $this->createMock(UserBackend::class);

tests/unit/UserBackendTest.php

@@ -44,7 +44,7 @@ private function clearGuests() {
 		$query->delete('guests_users')->execute();
 	}
 
-	protected function setUp() {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->clearGuests();
@@ -59,10 +59,10 @@ protected function setUp() {
 		);
 	}
 
-	protected function tearDown() {
+	protected function tearDown(): void {
 		$this->clearGuests();
 
-		return parent::tearDown();
+		parent::tearDown();
 	}
 
 	public function testCreate() {