Merge pull request #306 from owncloud/phpunit9.5

[tests-only] Ensure compatibility with PHPUnit v9.5

Author: phil-davis

.drone.star

@@ -22,12 +22,12 @@ config = {
     "phpunit": {
         "allDatabases": {
             "phpVersions": [
-                "7.3",
+                "7.4",
             ],
         },
         "reducedDatabases": {
             "phpVersions": [
-                "7.4",
+                "7.3",
             ],
             "databases": [
                 "mysql:8.0",

phpunit.xml

@@ -1,31 +1,34 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <phpunit bootstrap="tests/unit/bootstrap.php"
-		 beStrictAboutOutputDuringTests="true"
-		 verbose="true"
-		 failOnRisky="true"
- 		 failOnWarning="true"
-		 timeoutForSmallTests="900"
-		 timeoutForMediumTests="900"
-		 timeoutForLargeTests="900"
->
-	<testsuites>
-		<testsuite name='unit'>
-			<directory suffix='Test.php'>./tests/unit</directory>
-		</testsuite>
-	</testsuites>
-	<!-- filters for code coverage -->
-	<filter>
-		<whitelist>
-			<directory suffix=".php">.</directory>
-			<exclude>
-				<directory suffix=".php">./vendor</directory>
-				<directory suffix=".php">./templates</directory>
-				<directory suffix=".php">./tests</directory>
-			</exclude>
-		</whitelist>
-	</filter>
-	<logging>
-		<!-- and this is where your report will be written -->
-		<log type="coverage-clover" target="./tests/output/clover.xml"/>
-	</logging>
+        beStrictAboutOutputDuringTests="true"
+        verbose="true"
+        failOnRisky="true"
+        failOnWarning="true"
+        timeoutForSmallTests="900"
+        timeoutForMediumTests="900"
+        timeoutForLargeTests="900"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
+  <coverage>
+    <include>
+      <directory suffix=".php">.</directory>
+    </include>
+    <exclude>
+      <directory suffix=".php">./vendor</directory>
+      <directory suffix=".php">./templates</directory>
+      <directory suffix=".php">./tests</directory>
+    </exclude>
+    <report>
+      <clover outputFile="./tests/output/clover.xml"/>
+    </report>
+  </coverage>
+  <testsuites>
+    <testsuite name="unit">
+      <directory suffix="Test.php">./tests/unit</directory>
+    </testsuite>
+  </testsuites>
+  <!-- filters for code coverage -->
+  <logging>
+    <!-- and this is where your report will be written -->
+  </logging>
 </phpunit>

sonar-project.properties

@@ -29,5 +29,5 @@ sonar.pullrequest.branch=${env.SONAR_PULL_REQUEST_BRANCH}
 sonar.pullrequest.key=${env.SONAR_PULL_REQUEST_KEY}
 
 # Properties specific to language plugins:
-sonar.php.coverage.reportPaths=results/clover-phpunit-php7.2-mariadb10.2.xml,results/clover-phpunit-php7.2-mysql8.0.xml,results/clover-phpunit-php7.2-postgres9.4.xml,results/clover-phpunit-php7.2-oracle.xml,results/clover-phpunit-php7.2-sqlite.xml
+sonar.php.coverage.reportPaths=results/clover-phpunit-php7.4-mariadb10.2.xml,results/clover-phpunit-php7.4-mysql8.0.xml,results/clover-phpunit-php7.4-postgres9.4.xml,results/clover-phpunit-php7.4-oracle.xml,results/clover-phpunit-php7.4-sqlite.xml
 sonar.javascript.lcov.reportPaths=results/lcov.info