Thiemo Mättig (WMDE) has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/351778 )
Change subject: Rename $…StorageFrontendUrl variables to $…StorageBaseUrl
......................................................................
Rename $…StorageFrontendUrl variables to $…StorageBaseUrl
Changing the name was a PM decision made when we started exposing
"wikibase-geoshapestoragebaseurl" via the API.
This patch is non-disruptive as it only changes internal variable
names.
Change-Id: I1d3a0cd965cab3c2483f9755785591431f8da8ba
---
M lib/includes/Formatters/WikibaseValueFormatterBuilders.php
1 file changed, 16 insertions(+), 16 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/78/351778/1
diff --git a/lib/includes/Formatters/WikibaseValueFormatterBuilders.php
b/lib/includes/Formatters/WikibaseValueFormatterBuilders.php
index d7d4f84..ddeb194 100644
--- a/lib/includes/Formatters/WikibaseValueFormatterBuilders.php
+++ b/lib/includes/Formatters/WikibaseValueFormatterBuilders.php
@@ -58,7 +58,7 @@
/**
* @var string
*/
- private $geoShapeStorageFrontendUrl;
+ private $geoShapeStorageBaseUrl;
/**
* @var EntityTitleLookup|null
@@ -80,15 +80,15 @@
/**
* @var string
*/
- private $tabularDataStorageFrontendUrl;
+ private $tabularDataStorageBaseUrl;
/**
* @param Language $defaultLanguage
* @param FormatterLabelDescriptionLookupFactory
$labelDescriptionLookupFactory
* @param LanguageNameLookup $languageNameLookup
* @param EntityIdParser $repoItemUriParser
- * @param string $geoShapeStorageFrontendUrl
- * @param string $tabularDataStorageFrontendUrl
+ * @param string $geoShapeStorageBaseUrl
+ * @param string $tabularDataStorageBaseUrl
* @param EntityTitleLookup|null $entityTitleLookup
*/
public function __construct(
@@ -96,29 +96,29 @@
FormatterLabelDescriptionLookupFactory
$labelDescriptionLookupFactory,
LanguageNameLookup $languageNameLookup,
EntityIdParser $repoItemUriParser,
- $geoShapeStorageFrontendUrl,
- $tabularDataStorageFrontendUrl,
+ $geoShapeStorageBaseUrl,
+ $tabularDataStorageBaseUrl,
EntityTitleLookup $entityTitleLookup = null
) {
Assert::parameterType(
'string',
- $geoShapeStorageFrontendUrl,
- '$geoShapeStorageFrontendUrl'
+ $geoShapeStorageBaseUrl,
+ '$geoShapeStorageBaseUrl'
);
Assert::parameterType(
'string',
- $tabularDataStorageFrontendUrl,
- '$tabularDataStorageFrontendUrl'
+ $tabularDataStorageBaseUrl,
+ '$tabularDataStorageBaseUrl'
);
$this->defaultLanguage = $defaultLanguage;
$this->labelDescriptionLookupFactory =
$labelDescriptionLookupFactory;
$this->languageNameLookup = $languageNameLookup;
$this->repoItemUriParser = $repoItemUriParser;
- $this->geoShapeStorageFrontendUrl = $geoShapeStorageFrontendUrl;
+ $this->geoShapeStorageBaseUrl = $geoShapeStorageBaseUrl;
+ $this->tabularDataStorageBaseUrl = $tabularDataStorageBaseUrl;
$this->entityTitleLookup = $entityTitleLookup;
- $this->tabularDataStorageFrontendUrl =
$tabularDataStorageFrontendUrl;
}
private function newPlainEntityIdFormatter( FormatterOptions $options )
{
@@ -271,9 +271,9 @@
public function newGeoShapeFormatter( $format, FormatterOptions
$options ) {
switch ( $this->getBaseFormat( $format ) ) {
case SnakFormatter::FORMAT_HTML:
- return new InterWikiLinkHtmlFormatter(
$this->geoShapeStorageFrontendUrl );
+ return new InterWikiLinkHtmlFormatter(
$this->geoShapeStorageBaseUrl );
case SnakFormatter::FORMAT_WIKI:
- return new InterWikiLinkWikitextFormatter(
$this->geoShapeStorageFrontendUrl );
+ return new InterWikiLinkWikitextFormatter(
$this->geoShapeStorageBaseUrl );
default:
return $this->newStringFormatter( $format,
$options );
}
@@ -288,9 +288,9 @@
public function newTabularDataFormatter( $format, FormatterOptions
$options ) {
switch ( $this->getBaseFormat( $format ) ) {
case SnakFormatter::FORMAT_HTML:
- return new InterWikiLinkHtmlFormatter(
$this->tabularDataStorageFrontendUrl );
+ return new InterWikiLinkHtmlFormatter(
$this->tabularDataStorageBaseUrl );
case SnakFormatter::FORMAT_WIKI:
- return new InterWikiLinkWikitextFormatter(
$this->tabularDataStorageFrontendUrl );
+ return new InterWikiLinkWikitextFormatter(
$this->tabularDataStorageBaseUrl );
default:
return $this->newStringFormatter( $format,
$options );
}
--
To view, visit https://gerrit.wikimedia.org/r/351778
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1d3a0cd965cab3c2483f9755785591431f8da8ba
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
