jenkins-bot has submitted this change and it was merged.
Change subject: Move wbgetclaims validation to validateParameters
......................................................................
Move wbgetclaims validation to validateParameters
Change-Id: I7545e0cda88989dd98e85f0b645d3170c0334dc7
---
M repo/includes/api/GetClaims.php
1 file changed, 14 insertions(+), 7 deletions(-)
Approvals:
Daniel Kinzler: Looks good to me, approved
jenkins-bot: Verified
diff --git a/repo/includes/api/GetClaims.php b/repo/includes/api/GetClaims.php
index 68ca8cc..0bba4a1 100644
--- a/repo/includes/api/GetClaims.php
+++ b/repo/includes/api/GetClaims.php
@@ -61,7 +61,10 @@
//@todo validate
//@todo check permissions
- list( $id, $claimGuid ) = $this->getIdentifiers();
+ $params = $this->extractRequestParams();
+ $this->validateParameters( $params );
+
+ list( $id, $claimGuid ) = $this->getIdentifiers( $params );
$entityId = EntityId::newFromPrefixedId( $id );
$entity = $entityId ? $this->getEntity( $entityId ) : null;
@@ -75,8 +78,15 @@
wfProfileOut( __METHOD__ );
}
+ protected function validateParameters( array $params ) {
+ if ( !isset( $params['entity'] ) && !isset( $params['claim'] )
) {
+ $this->dieUsage( 'Either the entity parameter or the
claim parameter need to be set', 'param-missing' );
+ }
+ }
+
/**
* @see \ApiBase::getPossibleErrors()
+ * @return array
*/
public function getPossibleErrors() {
return array_merge( parent::getPossibleErrors(), array(
@@ -89,6 +99,7 @@
/**
* @since 0.3
*
+ * @param array $claims
* @param \Wikibase\Claim[] $claims
*/
protected function outputClaims( array $claims ) {
@@ -171,16 +182,12 @@
*
* @since 0.3
*
+ * @param $params
* @return array
* First element is a prefixed entity id
* Second element is either null or a claim GUID
*/
- protected function getIdentifiers() {
- $params = $this->extractRequestParams();
-
- if ( !isset( $params['entity'] ) && !isset( $params['claim'] )
) {
- $this->dieUsage( 'Either the entity parameter or the
key parameter need to be set', 'param-missing' );
- }
+ protected function getIdentifiers( $params ) {
$claimGuid = null;
--
To view, visit https://gerrit.wikimedia.org/r/73742
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7545e0cda88989dd98e85f0b645d3170c0334dc7
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Addshore <addshorew...@gmail.com>
Gerrit-Reviewer: Addshore <addshorew...@gmail.com>
Gerrit-Reviewer: Anja Jentzsch <a...@anjeve.de>
Gerrit-Reviewer: Ataherivand <abraham.taheriv...@wikimedia.de>
Gerrit-Reviewer: Aude <aude.w...@gmail.com>
Gerrit-Reviewer: Daniel Kinzler <daniel.kinz...@wikimedia.de>
Gerrit-Reviewer: Daniel Werner <daniel.wer...@wikimedia.de>
Gerrit-Reviewer: Denny Vrandecic <denny.vrande...@wikimedia.de>
Gerrit-Reviewer: Henning Snater <henning.sna...@wikimedia.de>
Gerrit-Reviewer: Hoo man <h...@online.de>
Gerrit-Reviewer: Jens Ohlig <jens.oh...@wikimedia.de>
Gerrit-Reviewer: Jeroen De Dauw <jeroended...@gmail.com>
Gerrit-Reviewer: John Erling Blad <jeb...@gmail.com>
Gerrit-Reviewer: Liangent <liang...@gmail.com>
Gerrit-Reviewer: Lydia Pintscher <lydia.pintsc...@wikimedia.de>
Gerrit-Reviewer: Markus Kroetzsch <mar...@semantic-mediawiki.org>
Gerrit-Reviewer: Nikola Smolenski <smole...@eunet.rs>
Gerrit-Reviewer: Nilesh <nil...@nileshc.com>
Gerrit-Reviewer: Tobias Gritschacher <tobias.gritschac...@wikimedia.de>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
