wikimedia/mediawiki-extensions-Gadgets
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/Gadgets synced 2024-11-23 23:13:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Content: Use DI for GadgetRepo service"

Browse source
This commit is contained in:
jenkins-bot 2024-02-24 16:51:09 +00:00 committed by Gerrit Code Review
parent 88e934c6cb 107428075e
commit af3ab84860
2 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
extension.json
View file

@ -12,7 +12,12 @@
},
"type": "other",
"ContentHandlers": {
"GadgetDefinition": "MediaWiki\\Extension\\Gadgets\\Content\\GadgetDefinitionContentHandler"
"GadgetDefinition": {
"class": "MediaWiki\\Extension\\Gadgets\\Content\\GadgetDefinitionContentHandler",
"services": [
"GadgetsRepo"
]
}
},
"SpecialPages": {
"Gadgets": {

14
includes/Content/GadgetDefinitionContentHandler.php
View file

@ -24,15 +24,18 @@ use Content;
use FormatJson;
use JsonContentHandler;
use MediaWiki\Content\Renderer\ContentParseParams;
use MediaWiki\Extension\Gadgets\GadgetRepo;
use MediaWiki\Extension\Gadgets\MediaWikiGadgetsJsonRepo;
use MediaWiki\Linker\Linker;
use MediaWiki\MediaWikiServices;
use MediaWiki\Parser\ParserOutput;
use MediaWiki\Title\Title;
class GadgetDefinitionContentHandler extends JsonContentHandler {
public function __construct() {
parent::__construct( 'GadgetDefinition' );
private GadgetRepo $gadgetRepo;
public function __construct( string $modelId, GadgetRepo $gadgetRepo ) {
parent::__construct( $modelId );
$this->gadgetRepo = $gadgetRepo;
}
/**
@ -108,12 +111,11 @@ class GadgetDefinitionContentHandler extends JsonContentHandler {
$this->makeLink( $parserOutput, $page, $title );
}
}
$gadgetRepo = MediaWikiServices::getInstance()->getService( 'GadgetsRepo' );
if ( isset( $data->module->dependencies ) ) {
foreach ( $data->module->dependencies as &$dep ) {
if ( str_starts_with( $dep, 'ext.gadget.' ) ) {
$gadgetId = explode( 'ext.gadget.', $dep )[ 1 ];
$title = $gadgetRepo->getGadgetDefinitionTitle( $gadgetId );
$title = $this->gadgetRepo->getGadgetDefinitionTitle( $gadgetId );
if ( $title ) {
$this->makeLink( $parserOutput, $dep, $title );
}
@ -122,7 +124,7 @@ class GadgetDefinitionContentHandler extends JsonContentHandler {
}
if ( isset( $data->module->peers ) ) {
foreach ( $data->module->peers as &$peer ) {
$title = $gadgetRepo->getGadgetDefinitionTitle( $peer );
$title = $this->gadgetRepo->getGadgetDefinitionTitle( $peer );
if ( $title ) {
$this->makeLink( $parserOutput, $peer, $title );
}