Update phpunit and friends

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>

7 files changed, 19 insertions, 29 deletions

diff --git a/tests/Unit/Activity/ProviderTest.php b/tests/Unit/Activity/ProviderTest.php
index 900d73f..ce29540 100644
--- a/tests/Unit/Activity/ProviderTest.php
+++ b/tests/Unit/Activity/ProviderTest.php
@@ -39,7 +39,7 @@ class ProviderTest extends TestCase {
 	/** @var Provider */
 	private $provider;
 
-	protected function setUp() {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->l10n = $this->createMock(IFactory::class);
diff --git a/tests/Unit/Activity/SettingTest.php b/tests/Unit/Activity/SettingTest.php
index 3ad95ec..fa81e7a 100644
--- a/tests/Unit/Activity/SettingTest.php
+++ b/tests/Unit/Activity/SettingTest.php
@@ -32,7 +32,7 @@ class SettingTest extends TestCase {
 	/** @var Setting */
 	private $setting;
 
-	protected function setUp() {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->l10n = $this->createMock(IL10N::class);
diff --git a/tests/Unit/Controller/SettingsControllerTest.php b/tests/Unit/Controller/SettingsControllerTest.php
index 10fd2ed..fe9f8af 100644
--- a/tests/Unit/Controller/SettingsControllerTest.php
+++ b/tests/Unit/Controller/SettingsControllerTest.php
@@ -35,7 +35,7 @@ class SettingsControllerTest extends TestCase {
 	/** @var SettingsController */
 	private $controller;
 
-	protected function setUp() {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->request = $this->createMock(IRequest::class);
diff --git a/tests/Unit/Listener/StateChangeActivityTest.php b/tests/Unit/Listener/StateChangeActivityTest.php
index b6ed4a2..46585b6 100644
--- a/tests/Unit/Listener/StateChangeActivityTest.php
+++ b/tests/Unit/Listener/StateChangeActivityTest.php
@@ -20,7 +20,7 @@ class StateChangeActivityTest extends TestCase {
 	/** @var StateChangeActivity */
 	private $listener;
 
-	protected function setUp() {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->activityManager = $this->createMock(IManager::class);
diff --git a/tests/Unit/Listener/StateChangeRegistryUpdaterTest.php b/tests/Unit/Listener/StateChangeRegistryUpdaterTest.php
index 06e205b..1fa42d5 100644
--- a/tests/Unit/Listener/StateChangeRegistryUpdaterTest.php
+++ b/tests/Unit/Listener/StateChangeRegistryUpdaterTest.php
@@ -32,7 +32,7 @@ class StateChangeRegistryUpdaterTest extends TestCase {
 	/** @var StateChangeRegistryUpdater */
 	private $listener;
 
-	protected function setUp() {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->providerRegistry = $this->createMock(IRegistry::class);
diff --git a/tests/Unit/Service/U2FManagerTest.php b/tests/Unit/Service/U2FManagerTest.php
index a41f5f7..96088fd 100644
--- a/tests/Unit/Service/U2FManagerTest.php
+++ b/tests/Unit/Service/U2FManagerTest.php
@@ -45,7 +45,7 @@ class U2FManagerTest extends TestCase {
 	/** @var IEventDispatcher */
 	private $eventDispatcher;
 
-	protected function setUp() {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->mapper = $this->createMock(RegistrationMapper::class);
diff --git a/tests/phpunit.xml b/tests/phpunit.xml
index a9436ca..6fb421c 100644
--- a/tests/phpunit.xml
+++ b/tests/phpunit.xml
@@ -1,24 +1,14 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<phpunit bootstrap="bootstrap.php"
-	 verbose="true"
-	 timeoutForSmallTests="900"
-	 timeoutForMediumTests="900"
-	 timeoutForLargeTests="900">
-	<testsuite name="U2F app tests">
-		<directory suffix="Test.php">.</directory>
-	</testsuite><!-- filters for code coverage -->
-	<filter>
-		<whitelist>
-			<directory suffix=".php">../</directory>
-			<exclude>
-				<directory suffix=".php">../l10n</directory>
-				<directory suffix=".php">../tests</directory>
-			</exclude>
-		</whitelist>
-	</filter>
-	<logging>
-		<!-- and this is where your report will be written -->
-		<log type="coverage-clover" target="./clover.unit.xml"/>
-	</logging>
+<?xml version="1.0" encoding="utf-8"?>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="bootstrap.php" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
+  <coverage>
+    <include>
+      <directory suffix=".php">../lib</directory>
+    </include>
+    <report>
+      <clover outputFile="./clover.unit.xml"/>
+    </report>
+  </coverage>
+  <testsuite name="U2F app tests">
+    <directory>.</directory>
+  </testsuite>
 </phpunit>
-