build: Update phpunit/phpunit to 10.5.58

umherirrender · umherirrender · commit 290e1fa4aa68 · 2025-10-11T11:38:03.000+02:00
- Update PHPUnit config for version 10 with `--migrate-configuration`
- Enabled options to display all notices, deprecations, etc.
- Make dataprovider static (T332865)

Change-Id: I4f4827fe41004d4fda628ea2964d272dcba47634
diff --git a/composer.json b/composer.json
@@ -28,7 +28,7 @@
 		"ockcyp/covers-validator": "1.7.0",
 		"php-parallel-lint/php-console-highlighter": "1.0.0",
 		"php-parallel-lint/php-parallel-lint": "1.4.0",
-		"phpunit/phpunit": "9.6.21"
+		"phpunit/phpunit": "10.5.58"
 	},
 	"scripts": {
 		"test": [
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,10 +1,21 @@
 <?xml version="1.0"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" colors="true" beStrictAboutTestsThatDoNotTestAnything="true" beStrictAboutOutputDuringTests="true" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
-  <coverage includeUncoveredFiles="true">
+<phpunit
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	colors="true"
+	displayDetailsOnTestsThatTriggerDeprecations="true"
+	displayDetailsOnTestsThatTriggerErrors="true"
+	displayDetailsOnTestsThatTriggerNotices="true"
+	displayDetailsOnTestsThatTriggerWarnings="true"
+	displayDetailsOnPhpunitDeprecations="true"
+	requireCoverageMetadata="true"
+	beStrictAboutTestsThatDoNotTestAnything="true"
+	beStrictAboutOutputDuringTests="true"
+	xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd">
+  <source>
     <include>
       <directory suffix=".php">./src</directory>
     </include>
-  </coverage>
+  </source>
   <testsuites>
     <testsuite name="textcat Tests">
       <directory>./tests</directory>
diff --git a/tests/TextCatTest.php b/tests/TextCatTest.php
@@ -68,7 +68,7 @@ public function testCreateLMLimit() {
 		$this->assertEquals( $result, $lm );
 	}
 
-	public function getTexts() {
+	public static function getTexts() {
 		$indir = __DIR__ . "/data/ShortTexts";
 		$outdir = __DIR__ . "/data/Models";
 		$data = [];
@@ -110,7 +110,7 @@ public function testFileLines( $textFile ) {
 		$this->assertEquals( basename( $textFile, ".txt" ), key( $detect ) );
 	}
 
-	public function multiCatData() {
+	public static function multiCatData() {
 		return [
 		  [ 'this is english text français bisschen',
 				[ 'sco', 'en', 'fr', 'de' ],
@@ -143,7 +143,7 @@ public function testMultiCat( $testLine, $res1, $res2 ) {
 							 array_values( $res2 ) );
 	}
 
-	public function minInputLengthData() {
+	public static function minInputLengthData() {
 		return [
 		  [ 'eso es español',
 				[ 'spanish', 'catalan', 'portuguese' ], null, ],
@@ -191,7 +191,7 @@ public function testMinInputLength( $testLine, $lang, $res ) {
 		$this->testcat->setResultsRatio( 1.05 );
 	}
 
-	public function ambiguityData() {
+	public static function ambiguityData() {
 		return [
 		  // check effects of results ratio and max returned langs
 		  [ 'espanol português', 1.05, 10, 3000, 1.00, [ 'pt' ], '' ],
@@ -264,7 +264,7 @@ public function testAmbiguity( $testLine, $resRatio, $maxRetLang, $modelSize, $m
 		$this->assertEquals( $this->ambiguouscat->getResultStatus(), $errMsg );
 	}
 
-	public function boostedLangData() {
+	public static function boostedLangData() {
 		return [
 		  [ 'this is english text français bisschen',
 				[ 'sco', 'en', 'fr', 'de' ],
@@ -335,7 +335,7 @@ public function testWordSep() {
 		$this->assertEquals( $this->testcat->classify( "espanol português" ), $weirdResults );
 	}
 
-	public function wrongData() {
+	public static function wrongData() {
 		return [
 		  // test wrong-keyboard input
 		  [ 'пукьфт сгшышту', [ 'en_cyr' ], '' ],
