[MediaWiki-commits] [Gerrit] Remove alias uniqueness constraints - change (mediawiki...Wikibase)

2015-07-01 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Remove alias uniqueness constraints
..


Remove alias uniqueness constraints

This should be reverted when T104393 is fixed.

Bug: T104393
Change-Id: I8f4d30194e3a49bed3985b3596ccbf7f577d44ee
(cherry picked from commit 70837b11cb35d072d769cc53ca32c23d872cfc26)
---
M repo/includes/Validators/LabelUniquenessValidator.php
M repo/tests/phpunit/includes/ChangeOp/ChangeOpTestMockProvider.php
M repo/tests/phpunit/includes/Validators/LabelUniquenessValidatorTest.php
3 files changed, 10 insertions(+), 3 deletions(-)

Approvals:
  Hoo man: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/repo/includes/Validators/LabelUniquenessValidator.php 
b/repo/includes/Validators/LabelUniquenessValidator.php
index d7edfc2..6f3644c 100644
--- a/repo/includes/Validators/LabelUniquenessValidator.php
+++ b/repo/includes/Validators/LabelUniquenessValidator.php
@@ -44,7 +44,8 @@
return $this->duplicateDetector->detectLabelConflicts(
$entity->getType(),

$entity->getFingerprint()->getLabels()->toTextArray(),
-   
$entity->getFingerprint()->getAliasGroups()->toTextArray(),
+   // insert again when T104393 is resolved
+   null, 
//$entity->getFingerprint()->getAliasGroups()->toTextArray(),
$entity->getId()
);
}
@@ -83,7 +84,8 @@
return $this->duplicateDetector->detectLabelConflicts(
$entityId->getEntityType(),
$labels,
-   $aliases,
+   // insert again when T104393 is resolved
+   null, //$aliases,
$entityId
);
}
diff --git a/repo/tests/phpunit/includes/ChangeOp/ChangeOpTestMockProvider.php 
b/repo/tests/phpunit/includes/ChangeOp/ChangeOpTestMockProvider.php
index 789629e..4d8e436 100644
--- a/repo/tests/phpunit/includes/ChangeOp/ChangeOpTestMockProvider.php
+++ b/repo/tests/phpunit/includes/ChangeOp/ChangeOpTestMockProvider.php
@@ -351,6 +351,10 @@
}
}
 
+   if ( $aliases === null ) {
+   return Result::newSuccess();
+   }
+
foreach ( $aliases as $lang => $texts ) {
if ( in_array( 'DUPE', $texts ) ) {
return Result::newError( array(
diff --git 
a/repo/tests/phpunit/includes/Validators/LabelUniquenessValidatorTest.php 
b/repo/tests/phpunit/includes/Validators/LabelUniquenessValidatorTest.php
index 66aeb3f..9b9cd92 100644
--- a/repo/tests/phpunit/includes/Validators/LabelUniquenessValidatorTest.php
+++ b/repo/tests/phpunit/includes/Validators/LabelUniquenessValidatorTest.php
@@ -119,7 +119,8 @@
 
return array(
'conflicting label' => array( $dupeLabelFingerprint, 
'label-conflict' ),
-   'conflicting alias' => array( $dupeAliasFingerprint, 
'label-conflict' ),
+   // insert again when T104393 is resolved
+   // 'conflicting alias' => array( $dupeAliasFingerprint, 
'label-conflict' ),
);
}
 

-- 
To view, visit https://gerrit.wikimedia.org/r/222121
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I8f4d30194e3a49bed3985b3596ccbf7f577d44ee
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: wmf/1.26wmf12
Gerrit-Owner: JanZerebecki 
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: Bene 
Gerrit-Reviewer: Hoo man 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Remove alias uniqueness constraints - change (mediawiki...Wikibase)

2015-07-01 Thread JanZerebecki (Code Review) 
JanZerebecki has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/222121

Change subject: Remove alias uniqueness constraints
..

Remove alias uniqueness constraints

This should be reverted when T104393 is fixed.

Bug: T104393
Change-Id: I8f4d30194e3a49bed3985b3596ccbf7f577d44ee
(cherry picked from commit 70837b11cb35d072d769cc53ca32c23d872cfc26)
---
M repo/includes/Validators/LabelUniquenessValidator.php
M repo/tests/phpunit/includes/ChangeOp/ChangeOpTestMockProvider.php
M repo/tests/phpunit/includes/Validators/LabelUniquenessValidatorTest.php
3 files changed, 10 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase 
refs/changes/21/222121/1

diff --git a/repo/includes/Validators/LabelUniquenessValidator.php 
b/repo/includes/Validators/LabelUniquenessValidator.php
index d7edfc2..6f3644c 100644
--- a/repo/includes/Validators/LabelUniquenessValidator.php
+++ b/repo/includes/Validators/LabelUniquenessValidator.php
@@ -44,7 +44,8 @@
return $this->duplicateDetector->detectLabelConflicts(
$entity->getType(),

$entity->getFingerprint()->getLabels()->toTextArray(),
-   
$entity->getFingerprint()->getAliasGroups()->toTextArray(),
+   // insert again when T104393 is resolved
+   null, 
//$entity->getFingerprint()->getAliasGroups()->toTextArray(),
$entity->getId()
);
}
@@ -83,7 +84,8 @@
return $this->duplicateDetector->detectLabelConflicts(
$entityId->getEntityType(),
$labels,
-   $aliases,
+   // insert again when T104393 is resolved
+   null, //$aliases,
$entityId
);
}
diff --git a/repo/tests/phpunit/includes/ChangeOp/ChangeOpTestMockProvider.php 
b/repo/tests/phpunit/includes/ChangeOp/ChangeOpTestMockProvider.php
index 789629e..4d8e436 100644
--- a/repo/tests/phpunit/includes/ChangeOp/ChangeOpTestMockProvider.php
+++ b/repo/tests/phpunit/includes/ChangeOp/ChangeOpTestMockProvider.php
@@ -351,6 +351,10 @@
}
}
 
+   if ( $aliases === null ) {
+   return Result::newSuccess();
+   }
+
foreach ( $aliases as $lang => $texts ) {
if ( in_array( 'DUPE', $texts ) ) {
return Result::newError( array(
diff --git 
a/repo/tests/phpunit/includes/Validators/LabelUniquenessValidatorTest.php 
b/repo/tests/phpunit/includes/Validators/LabelUniquenessValidatorTest.php
index 66aeb3f..9b9cd92 100644
--- a/repo/tests/phpunit/includes/Validators/LabelUniquenessValidatorTest.php
+++ b/repo/tests/phpunit/includes/Validators/LabelUniquenessValidatorTest.php
@@ -119,7 +119,8 @@
 
return array(
'conflicting label' => array( $dupeLabelFingerprint, 
'label-conflict' ),
-   'conflicting alias' => array( $dupeAliasFingerprint, 
'label-conflict' ),
+   // insert again when T104393 is resolved
+   // 'conflicting alias' => array( $dupeAliasFingerprint, 
'label-conflict' ),
);
}
 

-- 
To view, visit https://gerrit.wikimedia.org/r/222121
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8f4d30194e3a49bed3985b3596ccbf7f577d44ee
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: wmf/1.26wmf12
Gerrit-Owner: JanZerebecki 
Gerrit-Reviewer: Bene 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Remove alias uniqueness constraints - change (mediawiki...Wikibase)

2015-07-01 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Remove alias uniqueness constraints
..


Remove alias uniqueness constraints

This should be reverted when T104393 is fixed.

Bug: T104393
Change-Id: I8f4d30194e3a49bed3985b3596ccbf7f577d44ee
---
M repo/includes/Validators/LabelUniquenessValidator.php
M repo/tests/phpunit/includes/ChangeOp/ChangeOpTestMockProvider.php
M repo/tests/phpunit/includes/Validators/LabelUniquenessValidatorTest.php
3 files changed, 10 insertions(+), 3 deletions(-)

Approvals:
  JanZerebecki: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/repo/includes/Validators/LabelUniquenessValidator.php 
b/repo/includes/Validators/LabelUniquenessValidator.php
index d7edfc2..6f3644c 100644
--- a/repo/includes/Validators/LabelUniquenessValidator.php
+++ b/repo/includes/Validators/LabelUniquenessValidator.php
@@ -44,7 +44,8 @@
return $this->duplicateDetector->detectLabelConflicts(
$entity->getType(),

$entity->getFingerprint()->getLabels()->toTextArray(),
-   
$entity->getFingerprint()->getAliasGroups()->toTextArray(),
+   // insert again when T104393 is resolved
+   null, 
//$entity->getFingerprint()->getAliasGroups()->toTextArray(),
$entity->getId()
);
}
@@ -83,7 +84,8 @@
return $this->duplicateDetector->detectLabelConflicts(
$entityId->getEntityType(),
$labels,
-   $aliases,
+   // insert again when T104393 is resolved
+   null, //$aliases,
$entityId
);
}
diff --git a/repo/tests/phpunit/includes/ChangeOp/ChangeOpTestMockProvider.php 
b/repo/tests/phpunit/includes/ChangeOp/ChangeOpTestMockProvider.php
index 789629e..4d8e436 100644
--- a/repo/tests/phpunit/includes/ChangeOp/ChangeOpTestMockProvider.php
+++ b/repo/tests/phpunit/includes/ChangeOp/ChangeOpTestMockProvider.php
@@ -351,6 +351,10 @@
}
}
 
+   if ( $aliases === null ) {
+   return Result::newSuccess();
+   }
+
foreach ( $aliases as $lang => $texts ) {
if ( in_array( 'DUPE', $texts ) ) {
return Result::newError( array(
diff --git 
a/repo/tests/phpunit/includes/Validators/LabelUniquenessValidatorTest.php 
b/repo/tests/phpunit/includes/Validators/LabelUniquenessValidatorTest.php
index 66aeb3f..9b9cd92 100644
--- a/repo/tests/phpunit/includes/Validators/LabelUniquenessValidatorTest.php
+++ b/repo/tests/phpunit/includes/Validators/LabelUniquenessValidatorTest.php
@@ -119,7 +119,8 @@
 
return array(
'conflicting label' => array( $dupeLabelFingerprint, 
'label-conflict' ),
-   'conflicting alias' => array( $dupeAliasFingerprint, 
'label-conflict' ),
+   // insert again when T104393 is resolved
+   // 'conflicting alias' => array( $dupeAliasFingerprint, 
'label-conflict' ),
);
}
 

-- 
To view, visit https://gerrit.wikimedia.org/r/222113
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I8f4d30194e3a49bed3985b3596ccbf7f577d44ee
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Bene 
Gerrit-Reviewer: JanZerebecki 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Remove alias uniqueness constraints - change (mediawiki...Wikibase)

2015-07-01 Thread Bene (Code Review) 
Bene has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/222113

Change subject: Remove alias uniqueness constraints
..

Remove alias uniqueness constraints

This should be reverted when T104393 is fixed.

Bug: T104393
Change-Id: I8f4d30194e3a49bed3985b3596ccbf7f577d44ee
---
M repo/includes/Validators/LabelUniquenessValidator.php
1 file changed, 4 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase 
refs/changes/13/222113/1

diff --git a/repo/includes/Validators/LabelUniquenessValidator.php 
b/repo/includes/Validators/LabelUniquenessValidator.php
index d7edfc2..6f3644c 100644
--- a/repo/includes/Validators/LabelUniquenessValidator.php
+++ b/repo/includes/Validators/LabelUniquenessValidator.php
@@ -44,7 +44,8 @@
return $this->duplicateDetector->detectLabelConflicts(
$entity->getType(),

$entity->getFingerprint()->getLabels()->toTextArray(),
-   
$entity->getFingerprint()->getAliasGroups()->toTextArray(),
+   // insert again when T104393 is resolved
+   null, 
//$entity->getFingerprint()->getAliasGroups()->toTextArray(),
$entity->getId()
);
}
@@ -83,7 +84,8 @@
return $this->duplicateDetector->detectLabelConflicts(
$entityId->getEntityType(),
$labels,
-   $aliases,
+   // insert again when T104393 is resolved
+   null, //$aliases,
$entityId
);
}

-- 
To view, visit https://gerrit.wikimedia.org/r/222113
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8f4d30194e3a49bed3985b3596ccbf7f577d44ee
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Bene 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits