Jeroen De Dauw has submitted this change and it was merged.
Change subject: Entity removeAliases now resets array keys
......................................................................
Entity removeAliases now resets array keys
Bug: 51192
Change-Id: Iabbc7123378de1c1408ba95e262db947eef64239
---
M DataModel/Entity/Entity.php
M tests/phpunit/Entity/EntityTest.php
2 files changed, 7 insertions(+), 5 deletions(-)
Approvals:
Jeroen De Dauw: Looks good to me, approved
jenkins-bot: Verified
diff --git a/DataModel/Entity/Entity.php b/DataModel/Entity/Entity.php
index c9e02af..d3cfc5f 100644
--- a/DataModel/Entity/Entity.php
+++ b/DataModel/Entity/Entity.php
@@ -347,7 +347,7 @@
* @param array $aliases
*/
public function setAliases( $languageCode, array $aliases ) {
- $aliases = array_unique( $aliases );
+ $aliases = array_values( array_unique( $aliases ) );
if( count( $aliases ) > 0 ) {
$this->data['aliases'][$languageCode] = $aliases;
} else {
@@ -524,7 +524,9 @@
* @param array[] $aliasLists
*/
public function setAllAliases( array $aliasLists ) {
- $this->data['aliases'] = $aliasLists;
+ foreach( $aliasLists as $languageCode => $aliasList ){
+ $this->setAliases($languageCode, $aliasList);
+ }
}
/**
diff --git a/tests/phpunit/Entity/EntityTest.php
b/tests/phpunit/Entity/EntityTest.php
index 929bc13..458bb69 100644
--- a/tests/phpunit/Entity/EntityTest.php
+++ b/tests/phpunit/Entity/EntityTest.php
@@ -227,7 +227,7 @@
}
foreach ( $aliasesLists as $langCode => $aliasesList ) {
- $expected = array_unique( call_user_func_array(
'array_merge', $aliasesList ) );
+ $expected = array_values( array_unique(
call_user_func_array( 'array_merge', $aliasesList ) ) );
asort( $expected );
$actual = $entity->getAliases( $langCode );
@@ -250,7 +250,7 @@
}
foreach ( $aliasesLists as $langCode => $aliasesList ) {
- $expected = array_unique( array_pop( $aliasesList ) );
+ $expected = array_values( array_unique( array_pop(
$aliasesList ) ) );
asort( $aliasesList );
$actual = $entity->getAliases( $langCode );
@@ -313,7 +313,7 @@
$entity->setAliases( $langCode, $aliases );
$entity->removeAliases( $langCode, $removedAliases );
- $expected = array_diff( $aliases, $removedAliases );
+ $expected = array_values( array_diff( $aliases,
$removedAliases ) );
$actual = $entity->getAliases( $langCode );
asort( $expected );
--
To view, visit https://gerrit.wikimedia.org/r/73316
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iabbc7123378de1c1408ba95e262db947eef64239
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/WikibaseDataModel
Gerrit-Branch: master
Gerrit-Owner: Addshore <[email protected]>
Gerrit-Reviewer: Addshore <[email protected]>
Gerrit-Reviewer: Aude <[email protected]>
Gerrit-Reviewer: Daniel Kinzler <[email protected]>
Gerrit-Reviewer: Jeroen De Dauw <[email protected]>
Gerrit-Reviewer: Michał Łazowik <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
