Bene has uploaded a new change for review.
https://gerrit.wikimedia.org/r/110888
Change subject: Removed deprecated use of class Settings
......................................................................
Removed deprecated use of class Settings
Replaced uses by WikibaseRepo::getDefaultInstance()->getSettings()
Change-Id: I31fa2df1855ddba36df328d8e0bbca73bbc8348e
---
M repo/includes/ChangeOp/ChangeOpSiteLink.php
M repo/tests/phpunit/includes/ChangeOp/ChangeOpSiteLinkTest.php
M repo/tests/phpunit/includes/api/EditEntityTest.php
M repo/tests/phpunit/includes/api/SetSiteLinkTest.php
4 files changed, 9 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/88/110888/1
diff --git a/repo/includes/ChangeOp/ChangeOpSiteLink.php
b/repo/includes/ChangeOp/ChangeOpSiteLink.php
index d90c4a9..68aaa4e 100644
--- a/repo/includes/ChangeOp/ChangeOpSiteLink.php
+++ b/repo/includes/ChangeOp/ChangeOpSiteLink.php
@@ -3,12 +3,12 @@
namespace Wikibase\ChangeOp;
use InvalidArgumentException;
+use Wikibase\Repo\WikibaseRepo;
use Wikibase\DataModel\Entity\Entity;
use Wikibase\DataModel\Entity\Item;
use Wikibase\DataModel\Entity\ItemId;
use Wikibase\DataModel\SiteLink;
use Wikibase\Summary;
-use Wikibase\Settings;
/**
* Class for sitelink change operation
@@ -69,7 +69,7 @@
if ( !( $badge instanceof ItemId ) ) {
throw new InvalidArgumentException(
'$badges need to be an array of ItemIds or null' );
}
- if ( !in_array( $badge->getPrefixedId(),
array_keys( Settings::get( 'badgeItems' ) ) ) ) {
+ if ( !array_key_exists(
$badge->getPrefixedId(),
WikibaseRepo::getDefaultInstance()->getSettings()->get( 'badgeItems' ) ) ) {
throw new InvalidArgumentException(
'Only items specified in the config can be badges' );
}
}
diff --git a/repo/tests/phpunit/includes/ChangeOp/ChangeOpSiteLinkTest.php
b/repo/tests/phpunit/includes/ChangeOp/ChangeOpSiteLinkTest.php
index 9f72b09..9f7adc2 100644
--- a/repo/tests/phpunit/includes/ChangeOp/ChangeOpSiteLinkTest.php
+++ b/repo/tests/phpunit/includes/ChangeOp/ChangeOpSiteLinkTest.php
@@ -6,9 +6,9 @@
use Wikibase\DataModel\Entity\Item;
use Wikibase\DataModel\Entity\ItemId;
use Wikibase\DataModel\Entity\PropertyId;
-use InvalidArgumentException;
use Wikibase\DataModel\SiteLink;
-use Wikibase\Settings;
+use Wikibase\Repo\WikibaseRepo;
+use InvalidArgumentException;
/**
* @covers Wikibase\ChangeOp\ChangeOpSiteLink
@@ -26,7 +26,7 @@
private function applySettings() {
// Allow some badges for testing
- Settings::singleton()->setSetting( 'badgeItems', array(
+ WikibaseRepo::getDefaultInstance()->getSettings()->setSetting(
'badgeItems', array(
'Q42' => '',
'Q149' => '',
) );
diff --git a/repo/tests/phpunit/includes/api/EditEntityTest.php
b/repo/tests/phpunit/includes/api/EditEntityTest.php
index 18bf8fa..2820b24 100644
--- a/repo/tests/phpunit/includes/api/EditEntityTest.php
+++ b/repo/tests/phpunit/includes/api/EditEntityTest.php
@@ -4,7 +4,7 @@
use Wikibase\ItemContent;
use Wikibase\PropertyContent;
-use Wikibase\Settings;
+use Wikibase\Repo\WikibaseRepo;
/**
* @covers Wikibase\Api\EditEntity
@@ -56,7 +56,7 @@
$this->assertTrue( $badge->save( 'EditEntityTestQ32',
null, EDIT_NEW )->isOK() );
self::$idMap['%Q32%'] =
$badge->getEntity()->getId()->getSerialization();
- Settings::singleton()->setSetting( 'badgeItems', array(
+
WikibaseRepo::getDefaultInstance()->getSettings()->setSetting( 'badgeItems',
array(
self::$idMap['%Q42%'] => '',
self::$idMap['%Q149%'] => '',
'Q99999' => '', // Just in case we have a wrong
config
diff --git a/repo/tests/phpunit/includes/api/SetSiteLinkTest.php
b/repo/tests/phpunit/includes/api/SetSiteLinkTest.php
index e33dd4c..6890207 100644
--- a/repo/tests/phpunit/includes/api/SetSiteLinkTest.php
+++ b/repo/tests/phpunit/includes/api/SetSiteLinkTest.php
@@ -4,7 +4,7 @@
use Wikibase\DataModel\Entity\ItemId;
use Wikibase\ItemContent;
-use Wikibase\Settings;
+use Wikibase\Repo\WikibaseRepo;
/**
* @covers Wikibase\Api\SetSiteLink
@@ -150,7 +150,7 @@
$this->assertTrue( $status->isOK() );
self::$otherItemId = $badge->getEntity()->getId();
- Settings::singleton()->setSetting( 'badgeItems', array(
+
WikibaseRepo::getDefaultInstance()->getSettings()->setSetting( 'badgeItems',
array(
self::$gaItemId->getPrefixedId() => '',
self::$faItemId->getPrefixedId() => '',
'Q99999' => '', // Just in case we have a wrong
config
--
To view, visit https://gerrit.wikimedia.org/r/110888
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I31fa2df1855ddba36df328d8e0bbca73bbc8348e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Bene <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
