Aleksey Bekh-Ivanov (WMDE) has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/367397 )
Change subject: Use consistent naming for `preparedParameters` argument
......................................................................
Use consistent naming for `preparedParameters` argument
Change-Id: I6b04be514297f38e49c19579341aa6989bcf87c7
---
M repo/includes/Api/SetAliases.php
M repo/includes/Api/SetDescription.php
M repo/includes/Api/SetLabel.php
M repo/includes/Api/SetSiteLink.php
4 files changed, 29 insertions(+), 29 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/97/367397/1
diff --git a/repo/includes/Api/SetAliases.php b/repo/includes/Api/SetAliases.php
index 36610d9..5571a7d 100644
--- a/repo/includes/Api/SetAliases.php
+++ b/repo/includes/Api/SetAliases.php
@@ -164,38 +164,38 @@
}
/**
- * @param array $params
+ * @param array $preparedParameters
*
* @return ChangeOpAliases[]
*/
- private function getChangeOps( array $params ) {
+ private function getChangeOps( array $preparedParameters ) {
$changeOps = [];
- $language = $params['language'];
+ $language = $preparedParameters['language'];
// Set the list of aliases to a user given one OR add/ remove
certain entries
- if ( isset( $params['set'] ) ) {
+ if ( isset( $preparedParameters['set'] ) ) {
$changeOps[] =
$this->termChangeOpFactory->newSetAliasesOp(
$language,
- $this->normalizeAliases( $params['set']
)
+ $this->normalizeAliases(
$preparedParameters['set'] )
);
} else {
// FIXME: if we have ADD and REMOVE operations in the
same call,
// we will also have two ChangeOps updating the same
edit summary.
// This will cause the edit summary to be overwritten
by the last ChangeOp beeing applied.
- if ( !empty( $params['add'] ) ) {
+ if ( !empty( $preparedParameters['add'] ) ) {
$changeOps[] =
$this->termChangeOpFactory->newAddAliasesOp(
$language,
- $this->normalizeAliases(
$params['add'] )
+ $this->normalizeAliases(
$preparedParameters['add'] )
);
}
- if ( !empty( $params['remove'] ) ) {
+ if ( !empty( $preparedParameters['remove'] ) ) {
$changeOps[] =
$this->termChangeOpFactory->newRemoveAliasesOp(
$language,
- $this->normalizeAliases(
$params['remove'] )
+ $this->normalizeAliases(
$preparedParameters['remove'] )
);
}
}
diff --git a/repo/includes/Api/SetDescription.php
b/repo/includes/Api/SetDescription.php
index 9377a9c..8c3c3c1 100644
--- a/repo/includes/Api/SetDescription.php
+++ b/repo/includes/Api/SetDescription.php
@@ -73,16 +73,16 @@
}
/**
- * @param array $params
+ * @param array $preparedParameters
*
* @return ChangeOpDescription
*/
- private function getChangeOp( array $params ) {
+ private function getChangeOp( array $preparedParameters ) {
$description = "";
- $language = $params['language'];
+ $language = $preparedParameters['language'];
- if ( isset( $params['value'] ) ) {
- $description = $this->stringNormalizer->trimToNFC(
$params['value'] );
+ if ( isset( $preparedParameters['value'] ) ) {
+ $description = $this->stringNormalizer->trimToNFC(
$preparedParameters['value'] );
}
if ( $description === "" ) {
diff --git a/repo/includes/Api/SetLabel.php b/repo/includes/Api/SetLabel.php
index 2f355a6..c9a5ce6 100644
--- a/repo/includes/Api/SetLabel.php
+++ b/repo/includes/Api/SetLabel.php
@@ -73,16 +73,16 @@
}
/**
- * @param array $params
+ * @param array $preparedParameters
*
* @return ChangeOpLabel
*/
- private function getChangeOp( array $params ) {
+ private function getChangeOp( array $preparedParameters ) {
$label = "";
- $language = $params['language'];
+ $language = $preparedParameters['language'];
- if ( isset( $params['value'] ) ) {
- $label = $this->stringNormalizer->trimToNFC(
$params['value'] );
+ if ( isset( $preparedParameters['value'] ) ) {
+ $label = $this->stringNormalizer->trimToNFC(
$preparedParameters['value'] );
}
if ( $label === "" ) {
diff --git a/repo/includes/Api/SetSiteLink.php
b/repo/includes/Api/SetSiteLink.php
index 1f7c1cf..f842e75 100644
--- a/repo/includes/Api/SetSiteLink.php
+++ b/repo/includes/Api/SetSiteLink.php
@@ -136,16 +136,16 @@
}
/**
- * @param array $params
+ * @param array $preparedParameters
*
* @return ChangeOpSiteLink
*/
- private function getChangeOp( array $params ) {
- if ( $this->shouldRemove( $params ) ) {
- $linksite = $this->stringNormalizer->trimToNFC(
$params['linksite'] );
+ private function getChangeOp( array $preparedParameters ) {
+ if ( $this->shouldRemove( $preparedParameters ) ) {
+ $linksite = $this->stringNormalizer->trimToNFC(
$preparedParameters['linksite'] );
return
$this->siteLinkChangeOpFactory->newRemoveSiteLinkOp( $linksite );
} else {
- $linksite = $this->stringNormalizer->trimToNFC(
$params['linksite'] );
+ $linksite = $this->stringNormalizer->trimToNFC(
$preparedParameters['linksite'] );
$sites = $this->siteLinkTargetProvider->getSiteList(
$this->siteLinkGroups );
$site = $sites->getSite( $linksite );
@@ -156,12 +156,12 @@
);
}
- if ( isset( $params['linktitle'] ) ) {
- $page = $site->normalizePageName(
$this->stringNormalizer->trimWhitespace( $params['linktitle'] ) );
+ if ( isset( $preparedParameters['linktitle'] ) ) {
+ $page = $site->normalizePageName(
$this->stringNormalizer->trimWhitespace( $preparedParameters['linktitle'] ) );
if ( $page === false ) {
$this->errorReporter->dieWithError(
- [
'wikibase-api-no-external-page', $linksite, $params['linktitle'] ],
+ [
'wikibase-api-no-external-page', $linksite, $preparedParameters['linktitle'] ],
'no-external-page'
);
}
@@ -169,8 +169,8 @@
$page = null;
}
- $badges = ( isset( $params['badges'] ) )
- ? $this->parseSiteLinkBadges( $params['badges']
)
+ $badges = ( isset( $preparedParameters['badges'] ) )
+ ? $this->parseSiteLinkBadges(
$preparedParameters['badges'] )
: null;
return
$this->siteLinkChangeOpFactory->newSetSiteLinkOp( $linksite, $page, $badges );
--
To view, visit https://gerrit.wikimedia.org/r/367397
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6b04be514297f38e49c19579341aa6989bcf87c7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Aleksey Bekh-Ivanov (WMDE) <aleksey.bekh-iva...@wikimedia.de>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
