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

Merge "ApiCategoryTree: Use config from $this->getConfig()."

Browse source
This commit is contained in:
jenkins-bot 2024-08-21 20:25:52 +00:00 committed by Gerrit Code Review
parent a280b49f7e 6b65422769
commit ab8c7c15cb
2 changed files with 4 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
extension.json
View file

@ -8,9 +8,6 @@
"requires": {
"MediaWiki": ">= 1.42"
},
"ConfigRegistry": {
"categorytree": "GlobalVarConfig::newInstance"
},
"SpecialPages": {
"CategoryTree": {
"class": "MediaWiki\\Extension\\CategoryTree\\CategoryTreePage",
@ -24,7 +21,6 @@
"categorytree": {
"class": "MediaWiki\\Extension\\CategoryTree\\ApiCategoryTree",
"services": [
"ConfigFactory",
"DBLoadBalancerFactory",
"LanguageConverterFactory",
"LinkRenderer",

15
includes/ApiCategoryTree.php
View file

@ -5,8 +5,6 @@ namespace MediaWiki\Extension\CategoryTree;
use ApiBase;
use ApiMain;
use FormatJson;
use MediaWiki\Config\Config;
use MediaWiki\Config\ConfigFactory;
use MediaWiki\Languages\LanguageConverterFactory;
use MediaWiki\Linker\LinkRenderer;
use MediaWiki\MainConfigNames;
@ -33,7 +31,6 @@ use Wikimedia\Rdbms\IConnectionProvider;
*/
class ApiCategoryTree extends ApiBase {
private ConfigFactory $configFactory;
private LanguageConverterFactory $languageConverterFactory;
private LinkRenderer $linkRenderer;
private IConnectionProvider $dbProvider;
@ -42,14 +39,12 @@ class ApiCategoryTree extends ApiBase {
public function __construct(
ApiMain $main,
string $action,
ConfigFactory $configFactory,
IConnectionProvider $dbProvider,
LanguageConverterFactory $languageConverterFactory,
LinkRenderer $linkRenderer,
WANObjectCache $wanCache
) {
parent::__construct( $main, $action );
$this->configFactory = $configFactory;
$this->languageConverterFactory = $languageConverterFactory;
$this->linkRenderer = $linkRenderer;
$this->dbProvider = $dbProvider;
@ -73,8 +68,7 @@ class ApiCategoryTree extends ApiBase {
$ct = new CategoryTree( $options, $this->getConfig(), $this->dbProvider, $this->linkRenderer );
$depth = $ct->optionManager->capDepth( $depth );
$ctConfig = $this->configFactory->makeConfig( 'categorytree' );
$html = $this->getHTML( $ct, $title, $depth, $ctConfig );
$html = $this->getHTML( $ct, $title, $depth );
$this->getMain()->setCacheMode( 'public' );
@ -132,15 +126,14 @@ class ApiCategoryTree extends ApiBase {
}
/**
* Get category tree HTML for the given tree, title, depth and config
* Get category tree HTML for the given tree, title and depth
*
* @param CategoryTree $ct
* @param Title $title
* @param int $depth
* @param Config $ctConfig Config for CategoryTree
* @return string HTML
*/
private function getHTML( CategoryTree $ct, Title $title, int $depth, Config $ctConfig ): string {
private function getHTML( CategoryTree $ct, Title $title, int $depth ): string {
$langConv = $this->languageConverterFactory->getLanguageConverter();
return $this->wanCache->getWithSetCallback(
@ -150,7 +143,7 @@ class ApiCategoryTree extends ApiBase {
md5( $ct->optionManager->getOptionsAsCacheKey( $depth ) ),
$this->getLanguage()->getCode(),
$langConv->getExtraHashOptions(),
$ctConfig->get( MainConfigNames::RenderHashAppend )
$this->getConfig()->get( MainConfigNames::RenderHashAppend )
),
$this->wanCache::TTL_DAY,
static function () use ( $ct, $title, $depth ) {