wikimedia/mediawiki-extensions-Linter
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/Linter synced 2024-09-23 10:21:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

[DI] Use dependency injection for SpecialLintErrors

Browse source 
Change-Id: I211d70d5fb4a321cf302cc10f6e160480468a347
This commit is contained in:
C. Scott Ananian 2024-04-04 17:41:29 -04:00
parent 6304fc5e08
commit d8970278d1
3 changed files with 36 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
extension.json
View file

@ -51,7 +51,14 @@
"linterstats": "MediaWiki\\Linter\\ApiQueryLinterStats"
},
"SpecialPages": {
"LintErrors": "MediaWiki\\Linter\\SpecialLintErrors"
"LintErrors": {
"class": "MediaWiki\\Linter\\SpecialLintErrors",
"services": [
"MainWANObjectCache",
"NamespaceInfo",
"TitleParser"
]
}
},
"JobClasses": {
"RecordLintJob": "MediaWiki\\Linter\\RecordLintJob"

30
includes/SpecialLintErrors.php
View file

@ -22,21 +22,35 @@ namespace MediaWiki\Linter;
use HTMLForm;
use MediaWiki\Html\Html;
use MediaWiki\MediaWikiServices;
use MediaWiki\Output\OutputPage;
use MediaWiki\Request\WebRequest;
use MediaWiki\SpecialPage\SpecialPage;
use MediaWiki\Title\MalformedTitleException;
use MediaWiki\Title\NamespaceInfo;
use MediaWiki\Title\TitleParser;
use WANObjectCache;
class SpecialLintErrors extends SpecialPage {
private WANObjectCache $cache;
private NamespaceInfo $namespaceInfo;
private TitleParser $titleParser;
/**
* @var string|null
*/
private $category;
public function __construct() {
/**
* @param WANObjectCache $cache
* @param NamespaceInfo $namespaceInfo
* @param TitleParser $titleParser
*/
public function __construct( WANObjectCache $cache, NamespaceInfo $namespaceInfo, TitleParser $titleParser ) {
parent::__construct( 'LintErrors' );
$this->cache = $cache;
$this->namespaceInfo = $namespaceInfo;
$this->titleParser = $titleParser;
}
/**
@ -73,9 +87,8 @@ class SpecialLintErrors extends SpecialPage {
]
];
$mwServices = MediaWikiServices::getInstance();
$config = $mwServices->getMainConfig();
$enableUserInterfaceTagAndTemplateStage = $config->get( 'LinterUserInterfaceTagAndTemplateStage' );
$enableUserInterfaceTagAndTemplateStage =
$this->getConfig()->get( 'LinterUserInterfaceTagAndTemplateStage' );
if ( $enableUserInterfaceTagAndTemplateStage ) {
$selectTemplateOptions = [
(string)$this->msg( 'linter-form-template-option-all' )->escaped() => 'all',
@ -120,7 +133,7 @@ class SpecialLintErrors extends SpecialPage {
public function cleanTitle( string $title, $namespaces ): array {
// Check all titles for malformation regardless of exact match or prefix match
try {
$titleElements = MediaWikiServices::getInstance()->getTitleParser()->parseTitle( $title );
$titleElements = $this->titleParser->parseTitle( $title );
} catch ( MalformedTitleException $e ) {
return [ 'titlefield' => null, 'error' => 'linter-invalid-title' ];
}
@ -174,7 +187,8 @@ class SpecialLintErrors extends SpecialPage {
protected function findNamespaces( $request ) {
$namespaces = [];
$activeNamespaces = array_keys(
MediaWikiServices::getInstance()->getNamespaceInfo()->getCanonicalNamespaces() );
$this->namespaceInfo->getCanonicalNamespaces()
);
// Remove -2 = "media" and -1 = "Special" namespace elements
$activeNamespaces = array_filter( $activeNamespaces,
static function ( $x ) {
@ -305,7 +319,7 @@ class SpecialLintErrors extends SpecialPage {
private function showCategoryListings( CategoryManager $catManager ) {
$lookup = new TotalsLookup(
$catManager,
MediaWikiServices::getInstance()->getMainWANObjectCache(),
$this->cache,
new Database( 0 )
);
$totals = $lookup->getTotals();

7
tests/phpunit/SpecialLintErrorsTest.php
View file

@ -38,7 +38,12 @@ use SpecialPageTestBase;
class SpecialLintErrorsTest extends SpecialPageTestBase {
protected function newSpecialPage() {
return new SpecialLintErrors();
$services = $this->getServiceContainer();
return new SpecialLintErrors(
$services->getMainWANObjectCache(),
$services->getNamespaceInfo(),
$services->getTitleParser()
);
}
public function testExecute() {