Aleksey Bekh-Ivanov (WMDE) has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/367389 )
Change subject: Improve readability in `validateParameters` condition
......................................................................
Improve readability in `validateParameters` condition
Change-Id: I0e91b994c23db6808f1857f083c6a3dd923dda08
---
M repo/includes/Api/ModifyEntity.php
1 file changed, 10 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/89/367389/1
diff --git a/repo/includes/Api/ModifyEntity.php
b/repo/includes/Api/ModifyEntity.php
index 7bb82bd..b5047bb 100644
--- a/repo/includes/Api/ModifyEntity.php
+++ b/repo/includes/Api/ModifyEntity.php
@@ -204,9 +204,16 @@
* @param array $params
*/
protected function validateParameters( array $params ) {
- if ( ( isset( $params['id'] ) || isset( $params['new'] ) )
- === ( isset( $params['site'] ) && isset(
$params['title'] ) )
- ) {
+ $entityReferenceBySiteLinkGiven = isset( $params['site'] ) &&
isset( $params['title'] );
+ $entityIdGiven = isset( $params['id'] );
+ $shouldCreateNewWithSomeType = isset( $params['new'] );
+
+ $createNew_AndOr_IdIsGiven = $entityIdGiven ||
$shouldCreateNewWithSomeType;
+
+ $noReferenceIsGiven = !$createNew_AndOr_IdIsGiven &&
!$entityReferenceBySiteLinkGiven;
+ $bothReferencesAreGiven = $createNew_AndOr_IdIsGiven &&
$entityReferenceBySiteLinkGiven;
+
+ if ( $noReferenceIsGiven || $bothReferencesAreGiven ) {
$this->errorReporter->dieWithError(
'wikibase-api-illegal-entity-selector',
'param-illegal'
--
To view, visit https://gerrit.wikimedia.org/r/367389
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0e91b994c23db6808f1857f083c6a3dd923dda08
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Aleksey Bekh-Ivanov (WMDE) <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
