Addshore has uploaded a new change for review.
https://gerrit.wikimedia.org/r/92636
Change subject: Remove use of deprecated apibase result methods
......................................................................
Remove use of deprecated apibase result methods
Change-Id: I8fcc9680a9a16aa189e7919939183f4749e63e0b
---
M repo/includes/api/ApiWikibase.php
M repo/includes/api/EditEntity.php
M repo/includes/api/LinkTitles.php
M repo/includes/api/SetAliases.php
M repo/includes/api/SetDescription.php
M repo/includes/api/SetLabel.php
M repo/includes/api/SetSiteLink.php
7 files changed, 20 insertions(+), 37 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/36/92636/1
diff --git a/repo/includes/api/ApiWikibase.php
b/repo/includes/api/ApiWikibase.php
index 352dd4b..8c3a117 100644
--- a/repo/includes/api/ApiWikibase.php
+++ b/repo/includes/api/ApiWikibase.php
@@ -97,32 +97,6 @@
return 'https://www.mediawiki.org/wiki/Extension:Wikibase/API#'
. $this->getModuleName();
}
- /** @deprecated */
- protected function addAliasesToResult( array $aliases, $path, $name =
'aliases', $tag = 'alias' ) {
- $builder = new ResultBuilder( $this->getResult() );
- $builder->addAliases( $aliases, $path, $name, $tag );
- }
- /** @deprecated */
- protected function addSiteLinksToResult( array $siteLinks, $path, $name
= 'sitelinks', $tag = 'sitelink', $options = null ) {
- $builder = new ResultBuilder( $this->getResult() );
- $builder->addSiteLinks( $siteLinks, $path, $name, $tag,
$options );
- }
- /** @deprecated */
- protected function addDescriptionsToResult( array $descriptions, $path,
$name = 'descriptions', $tag = 'description' ) {
- $builder = new ResultBuilder( $this->getResult() );
- $builder->addDescriptions( $descriptions, $path, $name, $tag );
- }
- /** @deprecated */
- protected function addLabelsToResult( array $labels, $path, $name =
'labels', $tag = 'label' ) {
- $builder = new ResultBuilder( $this->getResult() );
- $builder->addLabels( $labels, $path, $name, $tag );
- }
- /** @deprecated */
- protected function addClaimsToResult( array $claims, $path, $name =
'claims', $tag = 'claim' ) {
- $builder = new ResultBuilder( $this->getResult() );
- $builder->addClaims( $claims, $path, $name, $tag );
- }
-
/**
* Returns the permissions that are required to perform the operation
specified by
* the parameters.
diff --git a/repo/includes/api/EditEntity.php b/repo/includes/api/EditEntity.php
index 3d05727..c5afeba 100644
--- a/repo/includes/api/EditEntity.php
+++ b/repo/includes/api/EditEntity.php
@@ -467,15 +467,17 @@
* @param Entity $entity
*/
protected function buildResult( Entity $entity ) {
- $this->addLabelsToResult( $entity->getLabels(), 'entity' );
- $this->addDescriptionsToResult( $entity->getDescriptions(),
'entity' );
- $this->addAliasesToResult( $entity->getAllAliases(), 'entity' );
+ $builder = new ResultBuilder( $this->getResult() );
+
+ $builder->addLabels( $entity->getLabels(), 'entity' );
+ $builder->addDescriptions( $entity->getDescriptions(), 'entity'
);
+ $builder->addAliases( $entity->getAllAliases(), 'entity' );
if ( $entity instanceof Item ) {
- $this->addSiteLinksToResult(
$entity->getSimpleSiteLinks(), 'entity' );
+ $builder->addSiteLinks( $entity->getSimpleSiteLinks(),
'entity' );
}
- $this->addClaimsToResult( $entity->getClaims(), 'entity' );
+ $builder->addClaims( $entity->getClaims(), 'entity' );
}
/**
diff --git a/repo/includes/api/LinkTitles.php b/repo/includes/api/LinkTitles.php
index ca170dd..2d5b0a7 100644
--- a/repo/includes/api/LinkTitles.php
+++ b/repo/includes/api/LinkTitles.php
@@ -109,7 +109,8 @@
$this->dieUsage( 'No common item detected, unable to
link titles' , 'no-common-item' );
}
- $this->addSiteLinksToResult( $return, 'entity' );
+ $builder = new ResultBuilder( $this->getResult() );
+ $builder->addSiteLinks( $return, 'entity' );
$status = $this->getAttemptSaveStatus( $itemContent, $summary,
$flags );
$this->buildResult( $itemContent, $status );
wfProfileOut( __METHOD__ );
diff --git a/repo/includes/api/SetAliases.php b/repo/includes/api/SetAliases.php
index 4a8afe8..3f1ce5a 100644
--- a/repo/includes/api/SetAliases.php
+++ b/repo/includes/api/SetAliases.php
@@ -89,8 +89,9 @@
}
$aliases = $entity->getAliases( $language );
+ $builder = new ResultBuilder( $this->getResult() );
if ( count( $aliases ) ) {
- $this->addAliasesToResult( array( $language => $aliases
), 'entity' );
+ $builder->addAliases( array( $language => $aliases ),
'entity' );
}
wfProfileOut( __METHOD__ );
diff --git a/repo/includes/api/SetDescription.php
b/repo/includes/api/SetDescription.php
index daea4d1..01a3eea 100644
--- a/repo/includes/api/SetDescription.php
+++ b/repo/includes/api/SetDescription.php
@@ -43,7 +43,9 @@
$this->getChangeOp( $params )->apply( $entity, $summary );
$descriptions = array( $language => ( $entity->getDescription(
$language ) !== false ) ? $entity->getDescription( $language ) : "" );
- $this->addDescriptionsToResult( $descriptions, 'entity' );
+
+ $builder = new ResultBuilder( $this->getResult() );
+ $builder->addDescriptions( $descriptions, 'entity' );
wfProfileOut( __METHOD__ );
return $summary;
diff --git a/repo/includes/api/SetLabel.php b/repo/includes/api/SetLabel.php
index 5816160..44a6586 100644
--- a/repo/includes/api/SetLabel.php
+++ b/repo/includes/api/SetLabel.php
@@ -43,7 +43,9 @@
$this->getChangeOp( $params )->apply( $entity, $summary );
$labels = array( $language => ( $entity->getLabel( $language )
!== false ) ? $entity->getLabel( $language ) : "" );
- $this->addLabelsToResult( $labels, 'entity' );
+
+ $builder = new ResultBuilder( $this->getResult() );
+ $builder->addLabels( $labels, 'entity' );
wfProfileOut( __METHOD__ );
return $summary;
diff --git a/repo/includes/api/SetSiteLink.php
b/repo/includes/api/SetSiteLink.php
index 5508998..3ee4a43 100644
--- a/repo/includes/api/SetSiteLink.php
+++ b/repo/includes/api/SetSiteLink.php
@@ -61,6 +61,7 @@
$item = $entityContent->getItem();
$linksite = $this->stringNormalizer->trimToNFC(
$params['linksite'] );
+ $builder = new ResultBuilder( $this->getResult() );
if (
isset( $params['linksite'] ) &&
( is_null( $params['linktitle'] ) ||
$params['linktitle'] === '' ) )
@@ -68,12 +69,12 @@
if ( $item->hasLinkToSite( $linksite ) ) {
$link = $item->getSimpleSiteLink( $linksite );
$this->getChangeOp( $params )->apply( $item,
$summary );
- $this->addSiteLinksToResult( array( $link ),
'entity', 'sitelinks', 'sitelink', array( 'removed' ) );
+ $builder->addSiteLinks( array( $link ),
'entity', 'sitelinks', 'sitelink', array( 'removed' ) );
}
} else {
$this->getChangeOp( $params )->apply( $item, $summary );
$link = $item->getSimpleSiteLink( $linksite );
- $this->addSiteLinksToResult( array( $link ), 'entity',
'sitelinks', 'sitelink', array( 'url' ) );
+ $builder->addSiteLinks( array( $link ), 'entity',
'sitelinks', 'sitelink', array( 'url' ) );
}
wfProfileOut( __METHOD__ );
--
To view, visit https://gerrit.wikimedia.org/r/92636
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8fcc9680a9a16aa189e7919939183f4749e63e0b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Addshore <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
