Thiemo Mättig (WMDE) has uploaded a new change for review.
https://gerrit.wikimedia.org/r/173262
Change subject: Use $this->settings instead of $this->getSettings
......................................................................
Use $this->settings instead of $this->getSettings
Also see Ib5bb23d. Please merge this patch here first,
I will rebase the other later.
Change-Id: I083a9890f79c4d72f77f8ed7da52e9ed39f0b62e
---
M client/includes/WikibaseClient.php
1 file changed, 34 insertions(+), 44 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/62/173262/1
diff --git a/client/includes/WikibaseClient.php
b/client/includes/WikibaseClient.php
index c743255..137bb3b 100644
--- a/client/includes/WikibaseClient.php
+++ b/client/includes/WikibaseClient.php
@@ -15,8 +15,9 @@
use SiteSQLStore;
use SiteStore;
use ValueFormatters\FormatterOptions;
-use Wikibase\Client\Changes\ChangeHandler;
use Wikibase\Client\Changes\AffectedPagesFinder;
+use Wikibase\Client\Changes\ChangeHandler;
+use Wikibase\Client\Changes\WikiPageUpdater;
use Wikibase\Client\Hooks\LanguageLinkBadgeDisplay;
use Wikibase\Client\Hooks\OtherProjectsSidebarGenerator;
use Wikibase\Client\Hooks\ParserFunctionRegistrant;
@@ -52,7 +53,6 @@
use Wikibase\Settings;
use Wikibase\SettingsArray;
use Wikibase\StringNormalizer;
-use Wikibase\Client\Changes\WikiPageUpdater;
/**
* Top level factory for the WikibaseClient extension.
@@ -126,14 +126,14 @@
private $valueFormatterFactory;
/**
- * @var SiteList
- */
- private $siteList = null;
-
- /**
* @var SiteStore
*/
private $siteStore;
+
+ /**
+ * @var SiteList|null
+ */
+ private $siteList = null;
/**
* @var LangLinkHandler
@@ -169,7 +169,7 @@
*/
public function getDataTypeFactory() {
if ( $this->dataTypeFactory === null ) {
- $urlSchemes = $this->getSettings()->getSetting(
'urlSchemes' );
+ $urlSchemes = $this->settings->getSetting( 'urlSchemes'
);
$builders = new WikibaseDataTypeBuilders(
$this->getEntityLookup(),
$this->getEntityIdParser(),
@@ -481,9 +481,7 @@
$this->getDataTypeFactory()
);
- $factory = new OutputFormatSnakFormatterFactory(
$builders->getSnakFormatterBuildersForFormats() );
-
- return $factory;
+ return new OutputFormatSnakFormatterFactory(
$builders->getSnakFormatterBuildersForFormats() );
}
/**
@@ -509,9 +507,7 @@
$this->contentLanguage
);
- $factory = new OutputFormatValueFormatterFactory(
$builders->getValueFormatterBuildersForFormats() );
-
- return $factory;
+ return new OutputFormatValueFormatterFactory(
$builders->getValueFormatterBuildersForFormats() );
}
/**
@@ -519,11 +515,9 @@
*/
public function getNamespaceChecker() {
if ( !$this->namespaceChecker ) {
- $settings = $this->getSettings();
-
$this->namespaceChecker = new NamespaceChecker(
- $settings->getSetting( 'excludeNamespaces' ),
- $settings->getSetting( 'namespaces' )
+ $this->settings->getSetting(
'excludeNamespaces' ),
+ $this->settings->getSetting( 'namespaces' )
);
}
@@ -535,12 +529,10 @@
*/
public function getLangLinkHandler() {
if ( !$this->langLinkHandler ) {
- $settings = $this->getSettings();
-
$this->langLinkHandler = new LangLinkHandler(
$this->getOtherProjectsSidebarGenerator(),
$this->getLanguageLinkBadgeDisplay(),
- $settings->getSetting( 'siteGlobalID' ),
+ $this->settings->getSetting( 'siteGlobalID' ),
$this->getNamespaceChecker(),
$this->getStore()->getSiteLinkTable(),
$this->getStore()->getEntityLookup(),
@@ -558,24 +550,13 @@
public function getLanguageLinkBadgeDisplay() {
global $wgLang;
- $badgeClassNames = $this->getSettings()->getSetting(
'badgeClassNames' );
+ $badgeClassNames = $this->settings->getSetting(
'badgeClassNames' );
return new LanguageLinkBadgeDisplay(
$this->getEntityLookup(),
is_array( $badgeClassNames ) ? $badgeClassNames :
array(),
$wgLang
);
- }
-
- /**
- * @return SiteList
- */
- public function getSiteList() {
- if ( $this->siteList === null ) {
- $this->siteList = $this->getSiteStore()->getSites();
- }
-
- return $this->siteList;
}
/**
@@ -589,6 +570,17 @@
}
return $this->siteStore;
+ }
+
+ /**
+ * @return SiteList
+ */
+ public function getSiteList() {
+ if ( $this->siteList === null ) {
+ $this->siteList = $this->getSiteStore()->getSites();
+ }
+
+ return $this->siteList;
}
/**
@@ -660,13 +652,11 @@
* @return OtherProjectsSidebarGenerator
*/
public function getOtherProjectsSidebarGenerator() {
- $settings = $this->getSettings();
-
return new OtherProjectsSidebarGenerator(
- $settings->getSetting( 'siteGlobalID' ),
+ $this->settings->getSetting( 'siteGlobalID' ),
$this->getStore()->getSiteLinkTable(),
$this->getSiteList(),
- $settings->getSetting( 'otherProjectsLinks' )
+ $this->settings->getSetting( 'otherProjectsLinks' )
);
}
@@ -694,12 +684,12 @@
*/
public function getParserFunctionRegistrant() {
return new ParserFunctionRegistrant(
- $this->getSettings()->getSetting(
'allowDataTransclusion' )
+ $this->settings->getSetting( 'allowDataTransclusion' )
);
}
/**
- * @return RendererFactory
+ * @return PropertyClaimsRendererFactory
*/
private function getPropertyClaimsRendererFactory() {
$snaksFinder = new SnaksFinder(
@@ -725,7 +715,7 @@
return new Runner(
$this->getPropertyClaimsRendererFactory(),
$this->getStore()->getSiteLinkTable(),
- $this->getSettings()->getSetting( 'siteGlobalID' )
+ $this->settings->getSetting( 'siteGlobalID' )
);
}
@@ -739,7 +729,7 @@
return new OtherProjectsSitesProvider(
$this->getSiteList(),
$this->getSite(),
- $this->getSettings()->getSetting(
'specialSiteLinkGroups' )
+ $this->settings->getSetting( 'specialSiteLinkGroups' )
);
}
@@ -765,9 +755,9 @@
$this->getAffectedPagesFinder(),
new WikiPageUpdater(),
$this->getStore()->getEntityRevisionLookup(),
- $this->getSettings()->getSetting( 'siteGlobalID' ),
- $this->getSettings()->getSetting( 'injectRecentChanges'
),
- $this->getSettings()->getSetting(
'allowDataTransclusion' )
+ $this->settings->getSetting( 'siteGlobalID' ),
+ $this->settings->getSetting( 'injectRecentChanges' ),
+ $this->settings->getSetting( 'allowDataTransclusion' )
);
}
--
To view, visit https://gerrit.wikimedia.org/r/173262
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I083a9890f79c4d72f77f8ed7da52e9ed39f0b62e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) <thiemo.maet...@wikimedia.de>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
