build: Upgrade mediawiki/mediawiki-codesniffer to v43.0.0

umherirrender · umherirrender · commit bef7fb31f964 · 2024-03-12T22:35:07.000+01:00
Change-Id: Id7f68fd608b2ce47755ce4eec5b85e8f6d525993
diff --git a/composer.json b/composer.json
@@ -22,7 +22,7 @@
 		"php": ">=7.4"
 	},
 	"require-dev": {
-		"mediawiki/mediawiki-codesniffer": "41.0.0",
+		"mediawiki/mediawiki-codesniffer": "43.0.0",
 		"mediawiki/mediawiki-phan-config": "0.14.0",
 		"mediawiki/minus-x": "1.1.1",
 		"ockcyp/covers-validator": "1.6.0",
@@ -46,5 +46,10 @@
 		],
 		"phan": "phan --allow-polyfill-parser --long-progress-bar",
 		"phpcs": "phpcs -sp"
+	},
+	"config": {
+		"allow-plugins": {
+			"dealerdirect/phpcodesniffer-composer-installer": true
+		}
 	}
 }
diff --git a/lm2php.php b/lm2php.php
@@ -19,7 +19,7 @@
 	}
 	$ngrams = [];
 	foreach ( file( $file->getPathname(), FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES ) as $line ) {
-		list( $word, $score ) = explode( "\t", $line, 2 );
+		[ $word, $score ] = explode( "\t", $line, 2 );
 		$ngrams[$word] = intval( $score );
 	}
 	$cat->writeLanguageFile( $ngrams, $argv[2] . "/" . $file->getBasename() );
diff --git a/src/TextCat.php b/src/TextCat.php
@@ -221,10 +221,10 @@ public function createLM( $text, $maxNgrams ) {
 			} );
 		}
 		uksort( $ngram, static function ( $k1, $k2 ) use ( $ngram ) {
-				if ( $ngram[$k1] == $ngram[$k2] ) {
-					return strcmp( $k1, $k2 );
-				}
-				return $ngram[$k2] - $ngram[$k1];
+			if ( $ngram[$k1] == $ngram[$k2] ) {
+				return strcmp( $k1, $k2 );
+			}
+			return $ngram[$k2] - $ngram[$k1];
 		} );
 		if ( count( $ngram ) > $maxNgrams ) {
 			array_splice( $ngram, $maxNgrams );
diff --git a/tests/TextCatTest.php b/tests/TextCatTest.php
@@ -109,8 +109,8 @@ public function testFileLines( $textFile ) {
 	public function multiCatData() {
 		return [
 		  [ 'this is english text français bisschen',
-				[ 'sco', 'en', 'fr',  'de' ],
-				[ 'fr',  'de', 'sco', 'en' ], ],
+				[ 'sco', 'en', 'fr', 'de' ],
+				[ 'fr', 'de', 'sco', 'en' ], ],
 		  [ 'الاسم العلمي: Felis catu',
 				[ 'ar', 'la', 'fa', 'fr' ],
 				[ 'ar', 'fr', 'la', 'fa' ], ],
@@ -192,18 +192,18 @@ public function ambiguityData() {
 		  // check effects of results ratio and max returned langs
 		  [ 'espanol português', 1.05, 10, 3000, 1.00, [ 'pt' ], '' ],
 		  [ 'espanol português', 1.20, 10, 3000, 1.00, [ 'pt', 'es' ], '' ],
-		  [ 'espanol português', 1.20,  2, 3000, 1.00, [ 'pt', 'es' ], '' ],
-		  [ 'espanol português', 1.20,  1, 3000, 1.00, [], TextCat::STATUSAMBIGUOUS ],
+		  [ 'espanol português', 1.20, 2, 3000, 1.00, [ 'pt', 'es' ], '' ],
+		  [ 'espanol português', 1.20, 1, 3000, 1.00, [], TextCat::STATUSAMBIGUOUS ],
 		  [ 'espanol português', 1.30, 10, 3000, 1.00,
 				[ 'pt', 'es', 'fr', 'it', 'en', 'pl' ], '' ],
-		  [ 'espanol português', 1.30,  6, 3000, 1.00,
+		  [ 'espanol português', 1.30, 6, 3000, 1.00,
 				 [ 'pt', 'es', 'fr', 'it', 'en', 'pl' ], '' ],
-		  [ 'espanol português', 1.30,  5, 3000, 1.00, [], TextCat::STATUSAMBIGUOUS ],
+		  [ 'espanol português', 1.30, 5, 3000, 1.00, [], TextCat::STATUSAMBIGUOUS ],
 
 		  // check effects of model size
-		  [ 'espanol português', 1.10, 20,  500, 1.00,
+		  [ 'espanol português', 1.10, 20, 500, 1.00,
 				 [ 'pt', 'es', 'it', 'fr', 'pl', 'cs', 'en', 'sv', 'de', 'id', 'nl' ], '' ],
-		  [ 'espanol português', 1.10, 20,  700, 1.00,
+		  [ 'espanol português', 1.10, 20, 700, 1.00,
 				 [ 'pt', 'es', 'it', 'fr', 'en', 'de' ], '' ],
 		  [ 'espanol português', 1.10, 20, 1000, 1.00, [ 'pt', 'es', 'it', 'fr' ], '' ],
 		  [ 'espanol português', 1.10, 20, 2000, 1.00, [ 'pt', 'es' ], '' ],
@@ -273,13 +273,13 @@ public function boostedLangData() {
 				[ [ 'en', 'de' ], 0.01 ] ],
 
 		  [ 'this is english text français bisschen',
-				[ 'sco', 'en', 'fr',  'de' ],
-				[ 'en',  'de', 'sco', 'fr' ],
+				[ 'sco', 'en', 'fr', 'de' ],
+				[ 'en', 'de', 'sco', 'fr' ],
 				[ [ 'en', 'de' ], 0.02 ] ],
 
 		  [ 'this is english text français bisschen',
-				[ 'sco', 'en', 'fr',  'de' ],
-				[ 'en',  'fr', 'sco', 'de' ],
+				[ 'sco', 'en', 'fr', 'de' ],
+				[ 'en', 'fr', 'sco', 'de' ],
 				[ [ 'en', 'fr' ], 0.02 ] ],
 
 		  [ 'this is english text français bisschen',

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@`
`19`	`19`	`}`
`20`	`20`	`$ngrams = [];`
`21`	`21`	`foreach ( file( $file->getPathname(), FILE_IGNORE_NEW_LINES \| FILE_SKIP_EMPTY_LINES ) as $line ) {`
`22`		`- list( $word, $score ) = explode( "\t", $line, 2 );`
	`22`	`+ [ $word, $score ] = explode( "\t", $line, 2 );`
`23`	`23`	`$ngrams[$word] = intval( $score );`
`24`	`24`	`}`
`25`	`25`	`$cat->writeLanguageFile( $ngrams, $argv[2] . "/" . $file->getBasename() );`