jenkins-bot has submitted this change and it was merged.
Change subject: Remove hidden infomation flow in ChangeOpsMerge
......................................................................
Remove hidden infomation flow in ChangeOpsMerge
Also remove todos that are done
Change-Id: Ibcb6f180dbafae2dac3dc81cad1fc044afecce87
---
M repo/includes/ChangeOp/ChangeOpsMerge.php
1 file changed, 4 insertions(+), 6 deletions(-)
Approvals:
Daniel Kinzler: Looks good to me, approved
jenkins-bot: Verified
diff --git a/repo/includes/ChangeOp/ChangeOpsMerge.php
b/repo/includes/ChangeOp/ChangeOpsMerge.php
index 3b8e2cf..7eb5869 100644
--- a/repo/includes/ChangeOp/ChangeOpsMerge.php
+++ b/repo/includes/ChangeOp/ChangeOpsMerge.php
@@ -36,15 +36,15 @@
$this->toItemContent = $toItemContent;
$this->fromChangeOps = new ChangeOps();
$this->toChangeOps = new ChangeOps();
+ $this->assertValidIgnoreConflictValues( $ignoreConflicts );
$this->ignoreConflicts = $ignoreConflicts;
- $this->assertValidIgnoreConflictValues();
}
- private function assertValidIgnoreConflictValues() {
- if( !is_array( $this->ignoreConflicts ) ){
+ private function assertValidIgnoreConflictValues( $ignoreConflicts ) {
+ if( !is_array( $ignoreConflicts ) ){
throw new InvalidArgumentException( '$ignoreConflicts
must be an array' );
}
- foreach( $this->ignoreConflicts as $ignoreConflict ){
+ foreach( $ignoreConflicts as $ignoreConflict ){
if( $ignoreConflict !== 'label' && $ignoreConflict !==
'description' && $ignoreConflict !== 'sitelink' ){
throw new InvalidArgumentException(
'$ignoreConflicts array can only contain "label", "description" and or
"sitelink" values' );
}
@@ -72,7 +72,6 @@
$this->fromChangeOps->add( new ChangeOpLabel(
$langCode, null ) );
$this->toChangeOps->add( new ChangeOpLabel(
$langCode, $label ) );
} else {
- //todo add the option to merge conflicting
labels into the aliases
if( !in_array( 'label', $this->ignoreConflicts
) ){
throw new ChangeOpException(
"Conflicting labels for language {$langCode}" );
}
@@ -87,7 +86,6 @@
$this->fromChangeOps->add( new
ChangeOpDescription( $langCode, null ) );
$this->toChangeOps->add( new
ChangeOpDescription( $langCode, $desc ) );
} else {
- //todo add the option to ignore description
conflicts, or prioritise one
if( !in_array( 'description',
$this->ignoreConflicts ) ){
throw new ChangeOpException(
"Conflicting descriptions for language {$langCode}" );
}
--
To view, visit https://gerrit.wikimedia.org/r/94338
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibcb6f180dbafae2dac3dc81cad1fc044afecce87
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Addshore <addshorew...@gmail.com>
Gerrit-Reviewer: Daniel Kinzler <daniel.kinz...@wikimedia.de>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
