Addshore has uploaded a new change for review.
https://gerrit.wikimedia.org/r/222854
Change subject: Remove ResultBuilder interaction out of ModifyClaim::saveChanges
......................................................................
Remove ResultBuilder interaction out of ModifyClaim::saveChanges
Fixes a TODO..
Slightly helps use move away from these base
classes
Change-Id: Ieb42afe8577b8e8b94acebbd0c8c1ae7e46150df
---
M repo/includes/api/CreateClaim.php
M repo/includes/api/ModifyClaim.php
M repo/includes/api/RemoveClaims.php
M repo/includes/api/RemoveQualifiers.php
M repo/includes/api/RemoveReferences.php
M repo/includes/api/SetClaim.php
M repo/includes/api/SetClaimValue.php
M repo/includes/api/SetQualifier.php
M repo/includes/api/SetReference.php
9 files changed, 20 insertions(+), 12 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/54/222854/1
diff --git a/repo/includes/api/CreateClaim.php
b/repo/includes/api/CreateClaim.php
index bccc1a5..87d64f6 100644
--- a/repo/includes/api/CreateClaim.php
+++ b/repo/includes/api/CreateClaim.php
@@ -71,7 +71,8 @@
$statement =
$entity->getStatements()->getFirstStatementWithGuid(
$changeOp->getStatementGuid() );
- $this->saveChanges( $entity, $summary );
+ $status = $this->saveChanges( $entity, $summary );
+ $this->getResultBuilder()->addRevisionIdFromStatusToResult(
$status, 'pageinfo' );
$this->getResultBuilder()->markSuccess();
$this->getResultBuilder()->addClaim( $statement );
}
diff --git a/repo/includes/api/ModifyClaim.php
b/repo/includes/api/ModifyClaim.php
index 5e41650..7a5f762 100644
--- a/repo/includes/api/ModifyClaim.php
+++ b/repo/includes/api/ModifyClaim.php
@@ -4,6 +4,7 @@
use ApiBase;
use ApiMain;
+use Status;
use Wikibase\DataModel\Statement\StatementGuidParser;
use Wikibase\DataModel\Entity\Entity;
use Wikibase\Repo\WikibaseRepo;
@@ -59,16 +60,15 @@
*
* @param Entity $entity
* @param Summary $summary
+ *
+ * @returns Status
*/
public function saveChanges( Entity $entity, Summary $summary ) {
- $status = $this->attemptSaveEntity(
+ return $this->attemptSaveEntity(
$entity,
$summary,
$this->getFlags()
);
-
- //@todo this doesnt belong here!...
- $this->getResultBuilder()->addRevisionIdFromStatusToResult(
$status, 'pageinfo' );
}
/**
diff --git a/repo/includes/api/RemoveClaims.php
b/repo/includes/api/RemoveClaims.php
index 9ec9fdc..23ce5e1 100644
--- a/repo/includes/api/RemoveClaims.php
+++ b/repo/includes/api/RemoveClaims.php
@@ -69,7 +69,8 @@
$this->dieException( $e, 'failed-save' );
}
- $this->saveChanges( $entity, $summary );
+ $status = $this->saveChanges( $entity, $summary );
+ $this->getResultBuilder()->addRevisionIdFromStatusToResult(
$status, 'pageinfo' );
$this->getResultBuilder()->markSuccess();
$this->getResultBuilder()->setList( null, 'claims',
$params['claim'], 'claim' );
}
diff --git a/repo/includes/api/RemoveQualifiers.php
b/repo/includes/api/RemoveQualifiers.php
index 3ef8dda..1046be5 100644
--- a/repo/includes/api/RemoveQualifiers.php
+++ b/repo/includes/api/RemoveQualifiers.php
@@ -68,7 +68,8 @@
$this->dieException( $e, 'failed-save' );
}
- $this->saveChanges( $entity, $summary );
+ $status = $this->saveChanges( $entity, $summary );
+ $this->getResultBuilder()->addRevisionIdFromStatusToResult(
$status, 'pageinfo' );
$this->getResultBuilder()->markSuccess();
}
diff --git a/repo/includes/api/RemoveReferences.php
b/repo/includes/api/RemoveReferences.php
index 7c5faf5..0609503 100644
--- a/repo/includes/api/RemoveReferences.php
+++ b/repo/includes/api/RemoveReferences.php
@@ -72,7 +72,8 @@
$this->dieException( $e, 'failed-save' );
}
- $this->saveChanges( $entity, $summary );
+ $status = $this->saveChanges( $entity, $summary );
+ $this->getResultBuilder()->addRevisionIdFromStatusToResult(
$status, 'pageinfo' );
$this->getResultBuilder()->markSuccess();
}
diff --git a/repo/includes/api/SetClaim.php b/repo/includes/api/SetClaim.php
index b0dc22f..f4050f8 100644
--- a/repo/includes/api/SetClaim.php
+++ b/repo/includes/api/SetClaim.php
@@ -84,7 +84,8 @@
$this->modificationHelper->applyChangeOp( $changeop, $entity,
$summary );
- $this->saveChanges( $entity, $summary );
+ $status = $this->saveChanges( $entity, $summary );
+ $this->getResultBuilder()->addRevisionIdFromStatusToResult(
$status, 'pageinfo' );
$this->getResultBuilder()->markSuccess();
$this->getResultBuilder()->addClaim( $claim );
}
diff --git a/repo/includes/api/SetClaimValue.php
b/repo/includes/api/SetClaimValue.php
index a8bac3f..89d0c95 100644
--- a/repo/includes/api/SetClaimValue.php
+++ b/repo/includes/api/SetClaimValue.php
@@ -60,7 +60,8 @@
$this->modificationHelper->applyChangeOp( $changeOp, $entity,
$summary );
- $this->saveChanges( $entity, $summary );
+ $status = $this->saveChanges( $entity, $summary );
+ $this->getResultBuilder()->addRevisionIdFromStatusToResult(
$status, 'pageinfo' );
$this->getResultBuilder()->markSuccess();
$this->getResultBuilder()->addClaim( $claim );
}
diff --git a/repo/includes/api/SetQualifier.php
b/repo/includes/api/SetQualifier.php
index 7efbdfc..880d2d4 100644
--- a/repo/includes/api/SetQualifier.php
+++ b/repo/includes/api/SetQualifier.php
@@ -64,7 +64,8 @@
$changeOp = $this->getChangeOp();
$this->modificationHelper->applyChangeOp( $changeOp, $entity,
$summary );
- $this->saveChanges( $entity, $summary );
+ $status = $this->saveChanges( $entity, $summary );
+ $this->getResultBuilder()->addRevisionIdFromStatusToResult(
$status, 'pageinfo' );
$this->getResultBuilder()->markSuccess();
$this->getResultBuilder()->addClaim( $statement );
}
diff --git a/repo/includes/api/SetReference.php
b/repo/includes/api/SetReference.php
index 26fb3d0..8c7519f 100644
--- a/repo/includes/api/SetReference.php
+++ b/repo/includes/api/SetReference.php
@@ -84,7 +84,8 @@
$changeOp = $this->getChangeOp( $newReference );
$this->modificationHelper->applyChangeOp( $changeOp, $entity,
$summary );
- $this->saveChanges( $entity, $summary );
+ $status = $this->saveChanges( $entity, $summary );
+ $this->getResultBuilder()->addRevisionIdFromStatusToResult(
$status, 'pageinfo' );
$this->getResultBuilder()->markSuccess();
$this->getResultBuilder()->addReference( $newReference );
}
--
To view, visit https://gerrit.wikimedia.org/r/222854
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ieb42afe8577b8e8b94acebbd0c8c1ae7e46150df
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
