Thiemo Mättig (WMDE) has uploaded a new change for review.
https://gerrit.wikimedia.org/r/177200
Change subject: Rename ambiguous $repo to $wikibaseRepo
......................................................................
Rename ambiguous $repo to $wikibaseRepo
This is split from I04767f2.
Change-Id: Idc31b4b81fca351358f659f8f3f8fbaa2ebe61d5
---
M repo/includes/View/SiteLinksView.php
M repo/includes/api/EditEntity.php
M repo/includes/api/MergeItems.php
M repo/includes/api/ModifyEntity.php
M repo/includes/content/EntityContent.php
M repo/includes/specials/SpecialEntityData.php
M repo/includes/specials/SpecialMergeItems.php
M repo/includes/specials/SpecialSetSiteLink.php
8 files changed, 41 insertions(+), 45 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/00/177200/1
diff --git a/repo/includes/View/SiteLinksView.php
b/repo/includes/View/SiteLinksView.php
index cbc15d7..d158e46 100644
--- a/repo/includes/View/SiteLinksView.php
+++ b/repo/includes/View/SiteLinksView.php
@@ -63,9 +63,7 @@
$this->languageCode = $languageCode;
// @todo inject option/objects instead of using the singleton
- $repo = WikibaseRepo::getDefaultInstance();
-
- $settings = $repo->getSettings();
+ $settings = WikibaseRepo::getDefaultInstance()->getSettings();
$this->specialSiteLinkGroups = $settings->getSetting(
'specialSiteLinkGroups' );
$this->badgeItems = $settings->getSetting( 'badgeItems' );
}
diff --git a/repo/includes/api/EditEntity.php b/repo/includes/api/EditEntity.php
index 2d246d0..5445a54 100644
--- a/repo/includes/api/EditEntity.php
+++ b/repo/includes/api/EditEntity.php
@@ -84,8 +84,7 @@
$this->validLanguageCodes = array_flip(
Utils::getLanguageCodes() );
- $repo = WikibaseRepo::getDefaultInstance();
- $changeOpFactoryProvider = $repo->getChangeOpFactoryProvider();
+ $changeOpFactoryProvider =
WikibaseRepo::getDefaultInstance()->getChangeOpFactoryProvider();
$this->termChangeOpFactory =
$changeOpFactoryProvider->getFingerprintChangeOpFactory();
$this->claimChangeOpFactory =
$changeOpFactoryProvider->getClaimChangeOpFactory();
$this->siteLinkChangeOpFactory =
$changeOpFactoryProvider->getSiteLinkChangeOpFactory();
diff --git a/repo/includes/api/MergeItems.php b/repo/includes/api/MergeItems.php
index 4c6484f..9d4dab6 100644
--- a/repo/includes/api/MergeItems.php
+++ b/repo/includes/api/MergeItems.php
@@ -53,18 +53,18 @@
public function __construct( ApiMain $mainModule, $moduleName,
$modulePrefix = '' ) {
parent::__construct( $mainModule, $moduleName, $modulePrefix );
- $repo = WikibaseRepo::getDefaultInstance();
+ $wikibaseRepo = WikibaseRepo::getDefaultInstance();
$this->setServices(
- $repo->getEntityIdParser(),
- $repo->getApiHelperFactory()->getErrorReporter( $this ),
- $repo->getApiHelperFactory()->getResultBuilder( $this ),
+ $wikibaseRepo->getEntityIdParser(),
+ $wikibaseRepo->getApiHelperFactory()->getErrorReporter(
$this ),
+ $wikibaseRepo->getApiHelperFactory()->getResultBuilder(
$this ),
new ItemMergeInteractor(
-
$repo->getChangeOpFactoryProvider()->getMergeChangeOpFactory(),
- $repo->getEntityRevisionLookup( 'uncached' ),
- $repo->getEntityStore(),
- $repo->getEntityPermissionChecker(),
- $repo->getSummaryFormatter(),
+
$wikibaseRepo->getChangeOpFactoryProvider()->getMergeChangeOpFactory(),
+ $wikibaseRepo->getEntityRevisionLookup(
'uncached' ),
+ $wikibaseRepo->getEntityStore(),
+ $wikibaseRepo->getEntityPermissionChecker(),
+ $wikibaseRepo->getSummaryFormatter(),
$this->getUser()
)
);
diff --git a/repo/includes/api/ModifyEntity.php
b/repo/includes/api/ModifyEntity.php
index 8696afe..6ad1065 100644
--- a/repo/includes/api/ModifyEntity.php
+++ b/repo/includes/api/ModifyEntity.php
@@ -81,19 +81,20 @@
public function __construct( ApiMain $mainModule, $moduleName,
$modulePrefix = '' ) {
parent::__construct( $mainModule, $moduleName, $modulePrefix );
- $repo = WikibaseRepo::getDefaultInstance();
+ $wikibaseRepo = WikibaseRepo::getDefaultInstance();
+ $settings = $wikibaseRepo->getSettings();
//TODO: provide a mechanism to override the services
- $this->stringNormalizer = $repo->getStringNormalizer();
+ $this->stringNormalizer = $wikibaseRepo->getStringNormalizer();
$this->siteLinkTargetProvider = new SiteLinkTargetProvider(
- $repo->getSiteStore(),
- $repo->getSettings()->getSetting(
'specialSiteLinkGroups' )
+ $wikibaseRepo->getSiteStore(),
+ $settings->getSetting( 'specialSiteLinkGroups' )
);
- $this->siteLinkGroups = $repo->getSettings()->getSetting(
'siteLinkGroups' );
- $this->siteLinkLookup = $repo->getStore()->newSiteLinkCache();
- $this->badgeItems = $repo->getSettings()->getSetting(
'badgeItems' );
+ $this->siteLinkGroups = $settings->getSetting( 'siteLinkGroups'
);
+ $this->siteLinkLookup =
$wikibaseRepo->getStore()->newSiteLinkCache();
+ $this->badgeItems = $settings->getSetting( 'badgeItems' );
}
/**
diff --git a/repo/includes/content/EntityContent.php
b/repo/includes/content/EntityContent.php
index 973d23e..4468291 100644
--- a/repo/includes/content/EntityContent.php
+++ b/repo/includes/content/EntityContent.php
@@ -258,8 +258,7 @@
ParserOptions $options = null, $generateHtml = true
) {
// @todo: move this to the ContentHandler
- $wikibaseRepo = WikibaseRepo::getDefaultInstance();
- $entityParserOutputGeneratorFactory =
$wikibaseRepo->getEntityParserOutputGeneratorFactory();
+ $entityParserOutputGeneratorFactory =
WikibaseRepo::getDefaultInstance()->getEntityParserOutputGeneratorFactory();
$outputGenerator =
$entityParserOutputGeneratorFactory->getEntityParserOutputGenerator(
$options
diff --git a/repo/includes/specials/SpecialEntityData.php
b/repo/includes/specials/SpecialEntityData.php
index 10d1e22..dbc3a06 100644
--- a/repo/includes/specials/SpecialEntityData.php
+++ b/repo/includes/specials/SpecialEntityData.php
@@ -73,30 +73,30 @@
private function newDefaultRequestHandler() {
global $wgUseSquid, $wgApiFrameOptions;
- $repo = WikibaseRepo::getDefaultInstance();
+ $wikibaseRepo = WikibaseRepo::getDefaultInstance();
- $entityRevisionLookup = $repo->getEntityRevisionLookup();
- $titleLookup = $repo->getEntityTitleLookup();
- $entityIdParser = $repo->getEntityIdParser();
+ $entityRevisionLookup =
$wikibaseRepo->getEntityRevisionLookup();
+ $titleLookup = $wikibaseRepo->getEntityTitleLookup();
+ $entityIdParser = $wikibaseRepo->getEntityIdParser();
$serializationOptions = new SerializationOptions();
$serializerFactory = new SerializerFactory(
$serializationOptions,
- $repo->getPropertyDataTypeLookup(),
+ $wikibaseRepo->getPropertyDataTypeLookup(),
EntityFactory::singleton()
);
$serializationService = new EntityDataSerializationService(
- $repo->getSettings()->getSetting( 'conceptBaseUri' ),
+ $wikibaseRepo->getSettings()->getSetting(
'conceptBaseUri' ),
$this->getPageTitle()->getCanonicalURL() . '/',
- $repo->getStore()->getEntityLookup(),
+ $wikibaseRepo->getStore()->getEntityLookup(),
$titleLookup,
$serializerFactory,
- $repo->getSiteStore()->getSites()
+ $wikibaseRepo->getSiteStore()->getSites()
);
- $maxAge = $repo->getSettings()->getSetting( 'dataSquidMaxage' );
- $formats = $repo->getSettings()->getSetting(
'entityDataFormats' );
+ $maxAge = $wikibaseRepo->getSettings()->getSetting(
'dataSquidMaxage' );
+ $formats = $wikibaseRepo->getSettings()->getSetting(
'entityDataFormats' );
$serializationService->setFormatWhiteList( $formats );
$defaultFormat = empty( $formats ) ? 'html' : $formats[0];
diff --git a/repo/includes/specials/SpecialMergeItems.php
b/repo/includes/specials/SpecialMergeItems.php
index a5862dd..358750f 100644
--- a/repo/includes/specials/SpecialMergeItems.php
+++ b/repo/includes/specials/SpecialMergeItems.php
@@ -50,20 +50,20 @@
public function __construct() {
parent::__construct( 'MergeItems', 'item-merge' );
- $repo = WikibaseRepo::getDefaultInstance();
+ $wikibaseRepo = WikibaseRepo::getDefaultInstance();
$this->initServices(
- $repo->getEntityIdParser(),
- $repo->getExceptionLocalizer(),
+ $wikibaseRepo->getEntityIdParser(),
+ $wikibaseRepo->getExceptionLocalizer(),
new TokenCheckInteractor(
$this->getUser()
),
new ItemMergeInteractor(
-
$repo->getChangeOpFactoryProvider()->getMergeChangeOpFactory(),
- $repo->getEntityRevisionLookup( 'uncached' ),
- $repo->getEntityStore(),
- $repo->getEntityPermissionChecker(),
- $repo->getSummaryFormatter(),
+
$wikibaseRepo->getChangeOpFactoryProvider()->getMergeChangeOpFactory(),
+ $wikibaseRepo->getEntityRevisionLookup(
'uncached' ),
+ $wikibaseRepo->getEntityStore(),
+ $wikibaseRepo->getEntityPermissionChecker(),
+ $wikibaseRepo->getSummaryFormatter(),
$this->getUser()
)
);
diff --git a/repo/includes/specials/SpecialSetSiteLink.php
b/repo/includes/specials/SpecialSetSiteLink.php
index 07f46fa..4cdcd9e 100644
--- a/repo/includes/specials/SpecialSetSiteLink.php
+++ b/repo/includes/specials/SpecialSetSiteLink.php
@@ -79,15 +79,14 @@
public function __construct() {
parent::__construct( 'SetSiteLink' );
- $repo = WikibaseRepo::getDefaultInstance();
-
- $settings = $repo->getSettings();
+ $wikibaseRepo = WikibaseRepo::getDefaultInstance();
+ $settings = $wikibaseRepo->getSettings();
$this->rightsUrl = $settings->getSetting( 'dataRightsUrl' );
$this->rightsText = $settings->getSetting( 'dataRightsText' );
$this->badgeItems = $settings->getSetting( 'badgeItems' );
- $this->siteLinkChangeOpFactory =
$repo->getChangeOpFactoryProvider()->getSiteLinkChangeOpFactory();
+ $this->siteLinkChangeOpFactory =
$wikibaseRepo->getChangeOpFactoryProvider()->getSiteLinkChangeOpFactory();
}
/**
--
To view, visit https://gerrit.wikimedia.org/r/177200
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Idc31b4b81fca351358f659f8f3f8fbaa2ebe61d5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
