build: Updating minimatch to 3.0.8

* https://github.com/advisories/GHSA-f8q6-p94x-37v3

Change-Id: I002d3cdf55f8634ce02a13de7ea50cc08dfb52fd

.eslintrc.json

@@ -1,8 +1,10 @@
 {
 	"root": true,
 	"extends": [
-		"wikimedia/client-es5",
-		"wikimedia/jquery",
-		"wikimedia/mediawiki"
-	]
+		"wikimedia/client",
+		"wikimedia/jquery"
+	],
+	"globals": {
+		"mw": false
+	}
 }

.phpcs.xml

@@ -1,9 +1,11 @@
 <?xml version="1.0"?>
 <ruleset>
 	<rule ref="./vendor/mediawiki/mediawiki-codesniffer/MediaWiki">
-		<exclude name="MediaWiki.Commenting.FunctionComment.MissingDocumentationPublic" />
+		<exclude name="MediaWiki.Files.ClassMatchesFilename.NotMatch" />
+		<exclude name="MediaWiki.NamingConventions.PrefixedGlobalFunctions.allowedPrefix" />
 		<exclude name="MediaWiki.Usage.ExtendClassUsage.FunctionConfigUsage" />
-		<exclude name="PSR12.Properties.ConstantVisibility.NotFound" />
+		<exclude name="MediaWiki.Commenting.FunctionComment.MissingDocumentationProtected" />
+		<exclude name="MediaWiki.Commenting.FunctionComment.MissingDocumentationPublic" />
 		<exclude name="Squiz.Scope.MethodScope.Missing" />
 	</rule>
 	<file>.</file>

ContributionScores.alias.php

@@ -233,16 +233,6 @@ $specialPageAliases['sk'] = [
 	'ContributionScores' => [ 'SkórePríspevkov' ],
 ];
 
-/** Serbian Cyrillic (српски (ћирилица)) */
-$specialPageAliases['sr-ec'] = [
-	'ContributionScores' => [ 'ОценеДоприноса' ],
-];
-
-/** Serbian Latin (srpski (latinica)) */
-$specialPageAliases['sr-el'] = [
-	'ContributionScores' => [ 'OceneDoprinosa' ],
-];
-
 /** Swedish (svenska) */
 $specialPageAliases['sv'] = [
 	'ContributionScores' => [ 'Bidragspoäng' ],

ContributionScores.php

@@ -1,16 +1,109 @@
 <?php
+/** \file
+ * \brief Contains setup code for the Contribution Scores Extension.
+ */
 
-if ( function_exists( 'wfLoadExtension' ) ) {
-	wfLoadExtension( 'ContributionScores' );
-	// Keep i18n globals so mergeMessageFileList.php doesn't break
-	$wgMessageDirs['ContributionScores'] = __DIR__ . '/i18n';
-	$wgExtensionMessagesFiles['ContributionScoresAlias'] = __DIR__ . '/ContributionScores.alias.php';
-	$wgExtensionMessagesFiles['ContributionScoresMagic'] = __DIR__ . '/ContributionScores.i18n.magic.php';
-	wfWarn(
-		'Deprecated PHP entry point used for ContributionScores extension. ' .
-		'Please use wfLoadExtension instead, ' .
-		'see https://www.mediawiki.org/wiki/Extension_registration for more details.'
-	);
-} else {
-	die( 'This version of the ContributionScores extension requires MediaWiki 1.29+' );
+# Not a valid entry point, skip unless MEDIAWIKI is defined
+if ( !defined( 'MEDIAWIKI' ) ) {
+	echo 'Contribution Scores extension';
+	exit( 1 );
+}
+
+$wgExtensionCredits['specialpage'][] = [
+	'path' => __FILE__,
+	'name' => 'Contribution Scores',
+	'url' => 'https://www.mediawiki.org/wiki/Extension:Contribution_Scores',
+	'author' => 'Tim Laqua',
+	'descriptionmsg' => 'contributionscores-desc',
+	'version' => '1.25.0'
+];
+
+define( 'CONTRIBUTIONSCORES_MAXINCLUDELIMIT', 50 );
+$wgContribScoreReports = null;
+
+// These settings can be overridden in LocalSettings.php.
+
+// Set to true to exclude bots from the reporting.
+$wgContribScoreIgnoreBlockedUsers = false;
+
+// Set to true to exclude blocked users from the reporting.
+$wgContribScoreIgnoreBots = false;
+
+// Set to true to use real user names when available. Only for MediaWiki 1.19 and later.
+$wgContribScoresUseRealName = false;
+
+// Set to true to disable cache for parser function and inclusion of table.
+$wgContribScoreDisableCache = false;
+
+$wgAutoloadClasses['ContributionScores'] = __DIR__ . '/ContributionScores_body.php';
+$wgSpecialPages['ContributionScores'] = 'ContributionScores';
+
+$wgMessagesDirs['ContributionScores'] = __DIR__ . '/i18n';
+$wgExtensionMessagesFiles['ContributionScoresAlias'] = __DIR__ . '/ContributionScores.alias.php';
+$wgExtensionMessagesFiles['ContributionScoresMagic'] =
+	__DIR__ . '/ContributionScores.i18n.magic.php';
+
+$wgHooks['ParserFirstCallInit'][] = 'efContributionScores_Setup';
+
+function efContributionScores_Setup( &$parser ) {
+	$parser->setFunctionHook( 'cscore', 'efContributionScores_Render' );
+
+	return true;
+}
+
+function efContributionScores_Render( &$parser, $usertext, $metric = 'score' ) {
+	global $wgContribScoreDisableCache;
+
+	if ( $wgContribScoreDisableCache ) {
+		$parser->getOutput()->updateCacheExpiry( 0 );
+	}
+
+	$user = User::newFromName( $usertext );
+	$dbr = wfGetDB( DB_REPLICA );
+
+	if ( $user instanceof User && $user->isLoggedIn() ) {
+		global $wgLang;
+
+		$revWhere = ActorMigration::newMigration()->getWhere( $dbr, 'rev_user', $user );
+		if ( $metric == 'score' ) {
+			$res = $dbr->select(
+				[ 'revision' ] + $revWhere['tables'],
+				'COUNT(DISTINCT rev_page)+SQRT(COUNT(rev_id)-COUNT(DISTINCT rev_page))*2 AS wiki_rank',
+				$revWhere['conds'],
+				__METHOD__,
+				[],
+				$revWhere['joins']
+			);
+			$row = $dbr->fetchObject( $res );
+			$output = $wgLang->formatNum( round( $row->wiki_rank, 0 ) );
+		} elseif ( $metric == 'changes' ) {
+			$res = $dbr->select(
+				[ 'revision' ] + $revWhere['tables'],
+				'COUNT(rev_id) AS rev_count',
+				$revWhere['conds'],
+				__METHOD__,
+				[],
+				$revWhere['joins']
+			);
+			$row = $dbr->fetchObject( $res );
+			$output = $wgLang->formatNum( $row->rev_count );
+		} elseif ( $metric == 'pages' ) {
+			$res = $dbr->select(
+				[ 'revision' ] + $revWhere['tables'],
+				'COUNT(DISTINCT rev_page) AS page_count',
+				$revWhere['conds'],
+				__METHOD__,
+				[],
+				$revWhere['joins']
+			);
+			$row = $dbr->fetchObject( $res );
+			$output = $wgLang->formatNum( $row->page_count );
+		} else {
+			$output = wfMessage( 'contributionscores-invalidmetric' )->text();
+		}
+	} else {
+		$output = wfMessage( 'contributionscores-invalidusername' )->text();
+	}
+
+	return $parser->insertStripItem( $output, $parser->mStripState );
 }

ContributionScores_body.php

@@ -15,72 +15,10 @@ use MediaWiki\MediaWikiServices;
  * @author Tim Laqua <t.laqua@gmail.com>
  */
 class ContributionScores extends IncludableSpecialPage {
-	const CONTRIBUTIONSCORES_MAXINCLUDELIMIT = 50;
-
 	public function __construct() {
 		parent::__construct( 'ContributionScores' );
 	}
 
-	public static function onParserFirstCallInit( Parser $parser ) {
-		$parser->setFunctionHook( 'cscore', [ self::class, 'efContributionScoresRender' ] );
-	}
-
-	public static function efContributionScoresRender( $parser, $usertext, $metric = 'score' ) {
-		global $wgContribScoreDisableCache;
-
-		if ( $wgContribScoreDisableCache ) {
-			$parser->getOutput()->updateCacheExpiry( 0 );
-		}
-
-		$user = User::newFromName( $usertext );
-		$dbr = wfGetDB( DB_REPLICA );
-
-		if ( $user instanceof User && $user->isLoggedIn() ) {
-			global $wgLang;
-
-			$revWhere = ActorMigration::newMigration()->getWhere( $dbr, 'rev_user', $user );
-			if ( $metric == 'score' ) {
-				$res = $dbr->select(
-					[ 'revision' ] + $revWhere['tables'],
-					'COUNT(DISTINCT rev_page)+SQRT(COUNT(rev_id)-COUNT(DISTINCT rev_page))*2 AS wiki_rank',
-					$revWhere['conds'],
-					__METHOD__,
-					[],
-					$revWhere['joins']
-				);
-				$row = $dbr->fetchObject( $res );
-				$output = $wgLang->formatNum( round( $row->wiki_rank, 0 ) );
-			} elseif ( $metric == 'changes' ) {
-				$res = $dbr->select(
-					[ 'revision' ] + $revWhere['tables'],
-					'COUNT(rev_id) AS rev_count',
-					$revWhere['conds'],
-					__METHOD__,
-					[],
-					$revWhere['joins']
-				);
-				$row = $dbr->fetchObject( $res );
-				$output = $wgLang->formatNum( $row->rev_count );
-			} elseif ( $metric == 'pages' ) {
-				$res = $dbr->select(
-					[ 'revision' ] + $revWhere['tables'],
-					'COUNT(DISTINCT rev_page) AS page_count',
-					$revWhere['conds'],
-					__METHOD__,
-					[],
-					$revWhere['joins']
-				);
-				$row = $dbr->fetchObject( $res );
-				$output = $wgLang->formatNum( $row->page_count );
-			} else {
-				$output = wfMessage( 'contributionscores-invalidmetric' )->text();
-			}
-		} else {
-			$output = wfMessage( 'contributionscores-invalidusername' )->text();
-		}
-		return $parser->insertStripItem( $output, $parser->mStripState );
-	}
-
 	/// Generates a "Contribution Scores" table for a given LIMIT and date range
 
 	/**
@@ -121,10 +59,8 @@ class ContributionScores extends IncludableSpecialPage {
 
 		if ( $wgContribScoreIgnoreBots ) {
 			$sqlWhere[] = "{$revUser} NOT IN " .
-				$dbr->buildSelectSubquery( 'user_groups', 'ug_user', [
-					'ug_group' => 'bot',
-					'ug_expiry IS NULL OR ug_expiry >= ' . $dbr->addQuotes( $dbr->timestamp() )
-				], __METHOD__ );
+				$dbr->buildSelectSubquery( 'user_groups', 'ug_user', [ 'ug_group' => 'bot' ], __METHOD__ );
+
 		}
 
 		if ( $dbr->unionSupportsOrderAndLimit() ) {
@@ -321,7 +257,7 @@ class ContributionScores extends IncludableSpecialPage {
 			}
 		}
 
-		if ( empty( $limit ) || $limit < 1 || $limit > self::CONTRIBUTIONSCORES_MAXINCLUDELIMIT ) {
+		if ( empty( $limit ) || $limit < 1 || $limit > CONTRIBUTIONSCORES_MAXINCLUDELIMIT ) {
 			$limit = 10;
 		}
 		if ( $days === null || $days < 0 ) {
@@ -380,9 +316,6 @@ class ContributionScores extends IncludableSpecialPage {
 		}
 	}
 
-	/**
-	 * @inheritDoc
-	 */
 	protected function getGroupName() {
 		return 'wiki';
 	}

Gruntfile.js

@@ -11,6 +11,7 @@ module.exports = function ( grunt ) {
 		},
 		eslint: {
 			options: {
+				extensions: [ '.js', '.json' ],
 				cache: true
 			},
 			all: [

composer.json

@@ -1,7 +1,7 @@
 {
 	"require-dev": {
 		"mediawiki/mediawiki-codesniffer": "38.0.0",
-		"mediawiki/minus-x": "1.1.1",
+		"mediawiki/minus-x": "1.1.0",
 		"php-parallel-lint/php-console-highlighter": "0.5.0",
 		"php-parallel-lint/php-parallel-lint": "1.2.0"
 	},

extension.json

@@ -1,52 +0,0 @@
-{
-	"name": "ContributionScores",
-	"author": "Tim Laqua",
-	"url": "https://www.mediawiki.org/wiki/Extension:Contribution_Scores",
-	"descriptionmsg": "contributionscores-desc",
-	"version": "1.26.0",
-	"type": "specialpage",
-	"requires": {
-		"MediaWiki": ">= 1.33.0"
-	},
-	"SpecialPages": {
-		"ContributionScores": "ContributionScores"
-	},
-	"AutoloadClasses": {
-		"ContributionScores": "src/ContributionScores.php"
-	},
-	"Hooks": {
-		"ParserFirstCallInit": "ContributionScores::onParserFirstCallInit"
-	},
-	"MessagesDirs": {
-		"ContributionScores": [
-			"i18n"
-		]
-	},
-	"ExtensionMessagesFiles": {
-		"ContribScoreAlias": "ContributionScores.alias.php",
-		"ContribScoreMagic": "ContributionScores.i18n.magic.php"
-	},
-	"config": {
-		"ContribScoreReports": {
-			"value": null,
-			"description": "Each array defines a report - 7,50 is \"past 7 days \" and \"LIMIT 50 \" - Can be omitted."
-		},
-		"ContribScoreIgnoreBlockedUsers": {
-			"value": false,
-			"description": "Set to true to exclude blocked users from the reporting."
-		},
-		"ContribScoreIgnoreBots": {
-			"value": false,
-			"description": "Set to true to exclude bots users from the reporting."
-		},
-		"ContribScoresUseRealName": {
-			"value": false,
-			"description": "Set to true to use real user names when available."
-		},
-		"ContribScoreDisableCache": {
-			"value": false,
-			"description": "Set to true to disable cache for parser function and inclusion of table."
-		}
-	},
-	"manifest_version": 2
-}

i18n/bs.json

@@ -3,8 +3,7 @@
 		"authors": [
 			"CERminator",
 			"KWiki",
-			"Srdjan m",
-			"Srđan"
+			"Srdjan m"
 		]
 	},
 	"contributionscores": "Rezultat doprinosa",

i18n/da.json

@@ -4,8 +4,7 @@
 			"Byrial",
 			"Christian List",
 			"Kaare",
-			"Peter Alberti",
-			"Saederup92"
+			"Peter Alberti"
 		]
 	},
 	"contributionscores": "Bidragspoint",
@@ -15,7 +14,6 @@
 	"contributionscores-days": "Sidste {{PLURAL:$1|dag|$1 dage}}",
 	"contributionscores-allrevisions": "Gennem tiden",
 	"contributionscores-score": "Point",
-	"contributionscores-rank": "Rang",
 	"contributionscores-pages": "Sider",
 	"contributionscores-changes": "Ændringer",
 	"contributionscores-username": "Brugernavn",

i18n/diq.json

@@ -11,7 +11,7 @@
 	"contributionscores-info": "Ebe pawıtışê hecmê tedqiqê berzi ra, puwan raveri pelanê bêemsalanê vurniyayeyan senceno.",
 	"contributionscores-top": "(Tewr Gırde $1)",
 	"contributionscores-days": "{{PLURAL:$1|Roca peyêne|$1 Rocê peyêni}}",
-	"contributionscores-allrevisions": "Her dem",
+	"contributionscores-allrevisions": "Çaxan de hemi",
 	"contributionscores-score": "Puwan",
 	"contributionscores-rank": "Rêze",
 	"contributionscores-pages": "Peli",

i18n/en.json

@@ -15,4 +15,4 @@
 	"contributionscores-username": "Username",
 	"contributionscores-invalidusername": "Invalid username",
 	"contributionscores-invalidmetric": "Invalid metric"
-}
+}

i18n/fi.json

@@ -1,7 +1,6 @@
 {
 	"@metadata": {
 		"authors": [
-			"01miki10",
 			"Crt",
 			"Nike",
 			"Pxos",
@@ -19,7 +18,7 @@
 	"contributionscores-rank": "Sija",
 	"contributionscores-pages": "Sivuja",
 	"contributionscores-changes": "Muutoksia",
-	"contributionscores-username": "Käyttäjänimi",
-	"contributionscores-invalidusername": "Virheellinen käyttäjänimi",
+	"contributionscores-username": "Käyttäjätunnus",
+	"contributionscores-invalidusername": "Virheellinen käyttäjätunnus",
 	"contributionscores-invalidmetric": "Virheellinen muuttuja"
 }

i18n/fr.json

@@ -21,6 +21,6 @@
 	"contributionscores-pages": "Pages",
 	"contributionscores-changes": "Changements",
 	"contributionscores-username": "Nom d’utilisateur",
-	"contributionscores-invalidusername": "Nom d’utilisateur incorrect",
+	"contributionscores-invalidusername": "Nom d’utilisateur invalide",
 	"contributionscores-invalidmetric": "Métrique incorrecte"
 }

i18n/ku-latn.json

@@ -1,12 +1,10 @@
 {
 	"@metadata": {
 		"authors": [
-			"Balyozxane",
 			"George Animal"
 		]
 	},
 	"contributionscores-allrevisions": "Hemû dem",
 	"contributionscores-pages": "Rûpel",
-	"contributionscores-changes": "Guhartin",
 	"contributionscores-username": "Navê bikarhêner"
 }

i18n/pnb.json

@@ -1,11 +1,9 @@
 {
 	"@metadata": {
 		"authors": [
-			"Abbas dhothar",
 			"BukhariSaeed"
 		]
 	},
-	"contributionscores-days": "پچھلے{{PLURAL:$1|دن|$1 دناں}}",
 	"contributionscores-changes": "تبدیلیاں",
 	"contributionscores-username": "ورتن آلے دا ناں"
 }

i18n/sk.json

@@ -3,18 +3,16 @@
 		"authors": [
 			"Helix84",
 			"Luky001",
-			"Teslaton",
-			"Yardom78"
+			"Teslaton"
 		]
 	},
 	"contributionscores": "Skóre príspevkov",
-	"contributionscores-desc": "Získava údaje z databázy wiki o [[Special:ContributionScores|množstve používateľských príspevkov]]",
+	"contributionscores-desc": "Zisťuje naväčší [[Special:ContributionScores|objem používateľských príspevkov]] z databázy wiki",
 	"contributionscores-info": "Skóre primárne meria jedinečné editované stránky s ohľadom na veľké množstvo úprav.",
 	"contributionscores-top": "(Najlepších $1)",
 	"contributionscores-days": "{{PLURAL:$1|Posledný $1 deň|Posledné $1 dni|Posledných $1 dní}}",
-	"contributionscores-allrevisions": "Celkom",
+	"contributionscores-allrevisions": "Celá história",
 	"contributionscores-score": "Skóre",
-	"contributionscores-rank": "Poradie",
 	"contributionscores-pages": "Stránky",
 	"contributionscores-changes": "Zmeny",
 	"contributionscores-username": "Používateľské meno",

i18n/sr-ec.json

@@ -2,7 +2,6 @@
 	"@metadata": {
 		"authors": [
 			"Acamicamacaraca",
-			"Kizule",
 			"Milicevic01",
 			"Rancher",
 			"Sasa Stefanovic",

i18n/yue.json

@@ -1,9 +1,7 @@
 {
 	"@metadata": {
 		"authors": [
-			"Moon0319",
 			"PhiLiP",
-			"Roy17",
 			"Shinjiman",
 			"Shirayuki",
 			"Yueman"
@@ -14,7 +12,7 @@
 	"contributionscores-info": "呢個分數係會依主要嘅唯一編輯過嘅頁，同埋考慮高編輯量。",
 	"contributionscores-top": "(最高$1名)",
 	"contributionscores-days": "最近$1日",
-	"contributionscores-allrevisions": "有史以來",
+	"contributionscores-allrevisions": "全部時間",
 	"contributionscores-score": "分數",
 	"contributionscores-rank": "等級",
 	"contributionscores-pages": "版",

package.json

@@ -5,9 +5,9 @@
 		"test": "grunt test"
 	},
 	"devDependencies": {
-		"eslint-config-wikimedia": "0.19.0",
+		"eslint-config-wikimedia": "0.15.3",
 		"grunt": "1.5.3",
 		"grunt-banana-checker": "0.9.0",
-		"grunt-eslint": "23.0.0"
+		"grunt-eslint": "22.0.0"
 	}
 }