Addshore has uploaded a new change for review.
https://gerrit.wikimedia.org/r/87671
Change subject: Remove deprecated shouldUseKeys method
......................................................................
Remove deprecated shouldUseKeys method
This patch removes all uses of the method
as well as the method itself
Change-Id: I463532c187e9c4bbae081f5808effcad8c8fe0a5
---
M lib/includes/serializers/AliasSerializer.php
M lib/includes/serializers/DescriptionSerializer.php
M lib/includes/serializers/LabelSerializer.php
M lib/includes/serializers/MultilingualSerializer.php
M lib/includes/serializers/SerializationOptions.php
M lib/includes/serializers/SiteLinkSerializer.php
6 files changed, 9 insertions(+), 21 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/71/87671/1
diff --git a/lib/includes/serializers/AliasSerializer.php
b/lib/includes/serializers/AliasSerializer.php
index cc0083c..6652ab4 100644
--- a/lib/includes/serializers/AliasSerializer.php
+++ b/lib/includes/serializers/AliasSerializer.php
@@ -72,7 +72,7 @@
$value = array();
- if ( $this->options->shouldUseKeys() ) {
+ if ( !$this->options->shouldIndexTags() ) {
foreach ( $aliases as $languageCode => $alarr ) {
$arr = array();
foreach ( $alarr as $alias ) {
@@ -101,7 +101,7 @@
}
}
- if ( !$this->options->shouldUseKeys() ) {
+ if ( $this->options->shouldIndexTags() ) {
$this->setIndexedTagName( $value, 'alias' );
}
diff --git a/lib/includes/serializers/DescriptionSerializer.php
b/lib/includes/serializers/DescriptionSerializer.php
index 6ed669a..c2d859d 100644
--- a/lib/includes/serializers/DescriptionSerializer.php
+++ b/lib/includes/serializers/DescriptionSerializer.php
@@ -84,7 +84,7 @@
$value =
$this->multilingualSerializer->serializeMultilingualValues( $descriptions );
- if ( !$this->options->shouldUseKeys() ) {
+ if ( $this->options->shouldIndexTags() ) {
$this->setIndexedTagName( $value, 'description' );
}
diff --git a/lib/includes/serializers/LabelSerializer.php
b/lib/includes/serializers/LabelSerializer.php
index 84cf213..3bfe10a 100644
--- a/lib/includes/serializers/LabelSerializer.php
+++ b/lib/includes/serializers/LabelSerializer.php
@@ -84,7 +84,7 @@
$value =
$this->multilingualSerializer->serializeMultilingualValues( $labels );
- if ( !$this->options->shouldUseKeys() ) {
+ if ( $this->options->shouldIndexTags() ) {
$this->setIndexedTagName( $value, 'label' );
}
diff --git a/lib/includes/serializers/MultilingualSerializer.php
b/lib/includes/serializers/MultilingualSerializer.php
index 95fbdd9..5db2070 100644
--- a/lib/includes/serializers/MultilingualSerializer.php
+++ b/lib/includes/serializers/MultilingualSerializer.php
@@ -66,7 +66,7 @@
$idx = 0;
foreach ( $data as $languageCode => $valueData ) {
- $key = $this->options->shouldUseKeys() ? $languageCode
: $idx++;
+ $key = $this->options->shouldIndexTags() ? $idx++ :
$languageCode;
if ( is_array( $valueData ) ) {
$value = $valueData['value'];
$valueLanguageCode = $valueData['language'];
@@ -85,7 +85,7 @@
if ( $valueSourceLanguageCode !== null ) {
$values[$key]['source-language'] =
$valueSourceLanguageCode;
}
- if ( !$this->options->shouldUseKeys() && $languageCode
!== $valueLanguageCode ) {
+ if ( $this->options->shouldIndexTags() && $languageCode
!== $valueLanguageCode ) {
// To have $languageCode kept somewhere
$values[$key]['for-language'] = $languageCode;
}
diff --git a/lib/includes/serializers/SerializationOptions.php
b/lib/includes/serializers/SerializationOptions.php
index 453a945..334d403 100644
--- a/lib/includes/serializers/SerializationOptions.php
+++ b/lib/includes/serializers/SerializationOptions.php
@@ -64,18 +64,6 @@
}
/**
- * Returns if keys should be used in the serialization.
- *
- * @since 0.2
- * @deprecated
- *
- * @return boolean
- */
- public function shouldUseKeys() {
- return !$this->indexTags;
- }
-
- /**
* Returns whether lower case entities IDs should be used as keys in
the serialized data structure.
*
* @see setIdKeyMode()
diff --git a/lib/includes/serializers/SiteLinkSerializer.php
b/lib/includes/serializers/SiteLinkSerializer.php
index d9fbc24..6e33ade 100644
--- a/lib/includes/serializers/SiteLinkSerializer.php
+++ b/lib/includes/serializers/SiteLinkSerializer.php
@@ -109,7 +109,7 @@
$badges[] = $badge->getSerialization();
}
- if ( !$this->options->shouldUseKeys() ) {
+ if ( $this->options->shouldIndexTags() ) {
$this->setIndexedTagName( $badges ,
'badge' );
}
@@ -120,7 +120,7 @@
$response['removed'] = '';
}
- if ( $this->options->shouldUseKeys() ) {
+ if ( !$this->options->shouldIndexTags() ) {
$serialization[$link->getSiteId()] = $response;
}
else {
@@ -128,7 +128,7 @@
}
}
- if ( !$this->options->shouldUseKeys() ) {
+ if ( $this->options->shouldIndexTags() ) {
$this->setIndexedTagName( $serialization, 'sitelink' );
}
--
To view, visit https://gerrit.wikimedia.org/r/87671
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I463532c187e9c4bbae081f5808effcad8c8fe0a5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Addshore <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
