WikidataBuilder has uploaded a new change for review.
https://gerrit.wikimedia.org/r/263165
Change subject: New Wikidata Build - 2016-01-09T10:00:01+0000
......................................................................
New Wikidata Build - 2016-01-09T10:00:01+0000
Change-Id: Ia2f335d5e7a49e6d29bd83ee67ce4135a2128570
---
M composer.lock
M extensions/Constraints/specials/SpecialConstraintReport.php
M extensions/Quality/Gruntfile.js
M extensions/Quality/package.json
M extensions/Wikibase/client/i18n/lki.json
A extensions/Wikibase/client/i18n/my.json
M
extensions/Wikibase/client/tests/phpunit/includes/Hooks/OtherProjectsSidebarGeneratorFactoryTest.php
M
extensions/Wikibase/client/tests/phpunit/includes/Hooks/OtherProjectsSidebarGeneratorTest.php
M
extensions/Wikibase/client/tests/phpunit/includes/Hooks/ParserOutputUpdateHookHandlersTest.php
M extensions/Wikibase/client/tests/phpunit/includes/LangLinkHandlerTest.php
M
extensions/Wikibase/client/tests/phpunit/includes/OtherProjectsSitesGeneratorTest.php
M
extensions/Wikibase/client/tests/phpunit/includes/SiteLinkCommentCreatorTest.php
M extensions/Wikibase/client/tests/phpunit/includes/WikibaseClientTest.php
M extensions/Wikibase/lib/i18n/bg.json
A extensions/Wikibase/lib/i18n/my.json
D extensions/Wikibase/lib/tests/phpunit/MockSiteStore.php
M extensions/Wikibase/lib/tests/phpunit/sites/SitesBuilderTest.php
M extensions/Wikibase/repo/i18n/bg.json
M extensions/Wikibase/repo/i18n/is.json
A extensions/Wikibase/repo/i18n/my.json
M extensions/Wikibase/repo/includes/specials/SpecialListProperties.php
M extensions/Wikibase/repo/includes/specials/SpecialWikibaseQueryPage.php
M
extensions/Wikibase/repo/tests/phpunit/includes/ChangeOp/ChangeOpFactoryProviderTest.php
M
extensions/Wikibase/repo/tests/phpunit/includes/ChangeOp/ChangeOpsMergeTest.php
M
extensions/Wikibase/repo/tests/phpunit/includes/ChangeOp/MergeChangeOpsFactoryTest.php
M extensions/Wikibase/repo/tests/phpunit/includes/Diff/DiffViewTest.php
M
extensions/Wikibase/repo/tests/phpunit/includes/Diff/EntityDiffVisualizerTest.php
M
extensions/Wikibase/repo/tests/phpunit/includes/Interactors/ItemMergeInteractorTest.php
M
extensions/Wikibase/repo/tests/phpunit/includes/LinkedData/EntityDataRequestHandlerTest.php
M
extensions/Wikibase/repo/tests/phpunit/includes/LinkedData/EntityDataSerializationServiceTest.php
M extensions/Wikibase/repo/tests/phpunit/includes/api/ApiHelperFactoryTest.php
M extensions/Wikibase/repo/tests/phpunit/includes/api/ApiXmlFormatTest.php
M extensions/Wikibase/repo/tests/phpunit/includes/api/MergeItemsTest.php
M extensions/Wikibase/repo/tests/phpunit/includes/api/ResultBuilderTest.php
M
extensions/Wikibase/repo/tests/phpunit/includes/specials/SpecialEntityDataTest.php
M
extensions/Wikibase/repo/tests/phpunit/includes/specials/SpecialMergeItemsTest.php
M
extensions/Wikibase/repo/tests/phpunit/includes/specials/SpecialWikibaseRepoPageTestBase.php
M extensions/Wikibase/repo/tests/phpunit/maintenance/dumpRdfTest.php
M
extensions/Wikibase/view/resources/jquery/wikibase/jquery.wikibase.statementview.js
M vendor/composer/autoload_classmap.php
M vendor/composer/installed.json
41 files changed, 170 insertions(+), 218 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikidata
refs/changes/65/263165/1
diff --git a/composer.lock b/composer.lock
index c503ca3..7f7f267 100644
--- a/composer.lock
+++ b/composer.lock
@@ -919,7 +919,7 @@
"source": {
"type": "git",
"url":
"https://gerrit.wikimedia.org/r/mediawiki/extensions/WikibaseQualityConstraints";,
- "reference": "e98aa427ba1669243da460d8c0ddcae0cd75d617"
+ "reference": "77334ca29da34a6022c233376ae575a3b552fc15"
},
"require": {
"php": ">=5.3.0",
@@ -965,7 +965,7 @@
"support": {
"issues":
"https://phabricator.wikimedia.org/project/profile/1202/";
},
- "time": "2015-12-18 22:39:37"
+ "time": "2016-01-08 01:36:43"
},
{
"name": "wikibase/data-model",
@@ -1355,7 +1355,7 @@
"source": {
"type": "git",
"url":
"https://gerrit.wikimedia.org/r/mediawiki/extensions/WikibaseQuality";,
- "reference": "7738ef8d9b07d7bab7a84de571e98b75f6b7479d"
+ "reference": "d26ec9d03eef9e7b882ab7e22e0b0e373204d02c"
},
"require": {
"php": ">=5.3.0",
@@ -1399,7 +1399,7 @@
"support": {
"issues":
"https://phabricator.wikimedia.org/project/profile/989/";
},
- "time": "2016-01-07 19:19:06"
+ "time": "2016-01-09 07:24:54"
},
{
"name": "wikibase/serialization-javascript",
@@ -1448,12 +1448,12 @@
"source": {
"type": "git",
"url":
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";,
- "reference": "8f2e3dd6ef6e548c237d8c50297859887934ccf1"
+ "reference": "07918335361491b65ecccfcb7eaccb94da54f10e"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/8f2e3dd6ef6e548c237d8c50297859887934ccf1";,
- "reference": "8f2e3dd6ef6e548c237d8c50297859887934ccf1",
+ "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/07918335361491b65ecccfcb7eaccb94da54f10e";,
+ "reference": "07918335361491b65ecccfcb7eaccb94da54f10e",
"shasum": ""
},
"require": {
@@ -1524,7 +1524,7 @@
"wikibaserepo",
"wikidata"
],
- "time": "2016-01-07 22:39:29"
+ "time": "2016-01-08 22:08:46"
},
{
"name": "wikibase/wikimedia-badges",
diff --git a/extensions/Constraints/specials/SpecialConstraintReport.php
b/extensions/Constraints/specials/SpecialConstraintReport.php
index 6495c54..64cbd0c 100644
--- a/extensions/Constraints/specials/SpecialConstraintReport.php
+++ b/extensions/Constraints/specials/SpecialConstraintReport.php
@@ -2,37 +2,36 @@
namespace WikibaseQuality\ConstraintReport\Specials;
-use UnexpectedValueException;
-use InvalidArgumentException;
-use SpecialPage;
-use ValueFormatters\FormatterOptions;
-use ValueFormatters\ValueFormatter;
-use Wikibase\DataModel\Services\EntityId\EntityIdFormatter;
-use HTMLForm;
-use Wikibase\DataModel\Services\Lookup\EntityLookup;
-use Wikibase\Lib\OutputFormatValueFormatterFactory;
-use Wikibase\Lib\SnakFormatter;
use DataValues;
use DataValues\DataValue;
+use HTMLForm;
use Html;
-use Wikibase\DataModel\Entity\Entity;
-use Wikibase\DataModel\Entity\EntityId;
-use Wikibase\DataModel\Entity\EntityIdParser;
-use Wikibase\DataModel\Entity\EntityIdParsingException;
-use Wikibase\DataModel\Entity\EntityIdValue;
-use Wikibase\DataModel;
-use Wikibase\DataModel\Entity\ItemId;
-use Wikibase\DataModel\Entity\PropertyId;
-use Wikibase\Lib\Store\EntityTitleLookup;
-use Wikibase\Lib\Store\LanguageFallbackLabelDescriptionLookupFactory;
-use Wikibase\Repo\EntityIdHtmlLinkFormatterFactory;
-use Wikibase\Repo\EntityIdLabelFormatterFactory;
-use Wikibase\Repo\WikibaseRepo;
+use InvalidArgumentException;
+use SpecialPage;
+use UnexpectedValueException;
+use ValueFormatters\FormatterOptions;
+use ValueFormatters\ValueFormatter;
use
WikibaseQuality\ConstraintReport\ConstraintCheck\DelegatingConstraintChecker;
use WikibaseQuality\ConstraintReport\ConstraintReportFactory;
use WikibaseQuality\Html\HtmlTableBuilder;
use WikibaseQuality\Html\HtmlTableCellBuilder;
use WikibaseQuality\Html\HtmlTableHeaderBuilder;
+use Wikibase\DataModel\Entity\Entity;
+use Wikibase\DataModel\Entity\EntityId;
+use Wikibase\DataModel\Entity\EntityIdParser;
+use Wikibase\DataModel\Entity\EntityIdParsingException;
+use Wikibase\DataModel\Entity\EntityIdValue;
+use Wikibase\DataModel\Entity\ItemId;
+use Wikibase\DataModel\Entity\PropertyId;
+use Wikibase\DataModel\Services\EntityId\EntityIdFormatter;
+use Wikibase\DataModel\Services\Lookup\EntityLookup;
+use Wikibase\Lib\OutputFormatValueFormatterFactory;
+use Wikibase\Lib\SnakFormatter;
+use Wikibase\Lib\Store\EntityTitleLookup;
+use Wikibase\Lib\Store\LanguageFallbackLabelDescriptionLookupFactory;
+use Wikibase\Repo\EntityIdHtmlLinkFormatterFactory;
+use Wikibase\Repo\EntityIdLabelFormatterFactory;
+use Wikibase\Repo\WikibaseRepo;
/**
* Class SpecialConstraintReport
@@ -319,8 +318,6 @@
}
/**
- * @see SpecialCheckResultPage::executeCheck
- *
* @param Entity $entity
*
* @return CheckResult[]
@@ -330,8 +327,6 @@
}
/**
- * @see SpecialCheckResultPage::buildResultTable
- *
* @param EntityId $entityId
* @param array $results
*
@@ -716,8 +711,6 @@
}
/**
- * @see SpecialCheckResultPage::getStatusMapping
- *
* @return array
*/
private function getStatusMapping() {
diff --git a/extensions/Quality/Gruntfile.js b/extensions/Quality/Gruntfile.js
index 398551c..cf1d515 100644
--- a/extensions/Quality/Gruntfile.js
+++ b/extensions/Quality/Gruntfile.js
@@ -1,6 +1,7 @@
/* jshint node: true, strict: false */
module.exports = function ( grunt ) {
grunt.loadNpmTasks( 'grunt-contrib-jshint' );
+ grunt.loadNpmTasks( 'grunt-jsonlint' );
grunt.loadNpmTasks( 'grunt-jscs' );
grunt.loadNpmTasks( 'grunt-banana-checker' );
@@ -19,9 +20,15 @@
requireCompleteMessageDocumentation: false
},
all: 'i18n/'
+ },
+ jsonlint: {
+ all: [
+ '**/*.json',
+ '!node_modules/**'
+ ]
}
} );
- grunt.registerTask( 'test', [ 'jshint', 'jscs', 'banana' ] );
+ grunt.registerTask( 'test', [ 'jshint', 'jscs', 'jsonlint', 'banana' ]
);
grunt.registerTask( 'default', 'test' );
};
diff --git a/extensions/Quality/package.json b/extensions/Quality/package.json
index 25a2cb9..94b48bc 100644
--- a/extensions/Quality/package.json
+++ b/extensions/Quality/package.json
@@ -15,6 +15,7 @@
"grunt-banana-checker": "0.4.0",
"grunt-cli": "0.1.13",
"grunt-contrib-jshint": "0.11.3",
- "grunt-jscs": "2.1.0"
+ "grunt-jscs": "2.6.0",
+ "grunt-jsonlint": "1.0.7"
}
}
diff --git a/extensions/Wikibase/client/i18n/lki.json
b/extensions/Wikibase/client/i18n/lki.json
index d6e858e..2f0d707 100644
--- a/extensions/Wikibase/client/i18n/lki.json
+++ b/extensions/Wikibase/client/i18n/lki.json
@@ -35,7 +35,7 @@
"wikibase-linkitem-alreadylinked": "صفحهای که شما به آن پیوند میدهید،
از قبل به یک [$1 آیتم] در مخزن مرکزی داده که به $2 در این سایت مریوط میشود،
متصل است. آیتمها میتوانند فقط به یک صفحه از وبگاه ارتباط داشتهباشند. لطفاً
از یک صفحه برای پیوند استفاده کنید.",
"wikibase-linkitem-close": "پنجره را ببند و صفحه را دوباره باز کن",
"wikibase-linkitem-failure": "یک خطای ناشناخته در هنگام بارگذاری صفحهٔ
پیوند دادهشده رخ داد.",
- "wikibase-linkitem-title": "پیوند ؤة ئئ وةڵگة",
+ "wikibase-linkitem-title": "پیوند ؤة ئێ وەڵگە",
"wikibase-linkitem-linkpage": "پیوند ئة وةڵگة",
"wikibase-linkitem-selectlink": "لطفاً وبگاه و صفحهای که میخواهید به
این صفحه پیوند دهید را انتخاب کنید.",
"wikibase-linkitem-input-site": ":زوون",
diff --git a/extensions/Wikibase/client/i18n/my.json
b/extensions/Wikibase/client/i18n/my.json
new file mode 100644
index 0000000..9ff1cc9
--- /dev/null
+++ b/extensions/Wikibase/client/i18n/my.json
@@ -0,0 +1,12 @@
+{
+ "@metadata": {
+ "authors": [
+ "Ninjastrikers"
+ ]
+ },
+ "wikibase-editlinks": "လင့်ခ်များကို တည်းဖြတ်ရန်",
+ "wikibase-rc-hide-wikidata": "$1 {{WBREPONAME}}",
+ "wikibase-rc-hide-wikidata-hide": "ဝှက်",
+ "wikibase-rc-hide-wikidata-show": "ပြ",
+ "wikibase-otherprojects": "အခြား ပရောဂျက်များ"
+}
diff --git
a/extensions/Wikibase/client/tests/phpunit/includes/Hooks/OtherProjectsSidebarGeneratorFactoryTest.php
b/extensions/Wikibase/client/tests/phpunit/includes/Hooks/OtherProjectsSidebarGeneratorFactoryTest.php
index 69e102f..668417c 100644
---
a/extensions/Wikibase/client/tests/phpunit/includes/Hooks/OtherProjectsSidebarGeneratorFactoryTest.php
+++
b/extensions/Wikibase/client/tests/phpunit/includes/Hooks/OtherProjectsSidebarGeneratorFactoryTest.php
@@ -2,10 +2,11 @@
namespace Wikibase\Client\Tests\Hooks;
+use HashSiteStore;
+use TestSites;
use Wikibase\Client\Hooks\OtherProjectsSidebarGeneratorFactory;
use Wikibase\SettingsArray;
use Wikibase\Test\MockRepository;
-use Wikibase\Test\MockSiteStore;
/**
* @covers Wikibase\Client\Hooks\OtherProjectsSidebarGeneratorFactory
@@ -27,7 +28,7 @@
) );
$siteLinkLookup = new MockRepository();
- $siteStore = MockSiteStore::newFromTestSites();
+ $siteStore = new HashSiteStore( TestSites::getSites() );
$factory = new OtherProjectsSidebarGeneratorFactory(
$settings,
diff --git
a/extensions/Wikibase/client/tests/phpunit/includes/Hooks/OtherProjectsSidebarGeneratorTest.php
b/extensions/Wikibase/client/tests/phpunit/includes/Hooks/OtherProjectsSidebarGeneratorTest.php
index 0f94e46..b121789 100644
---
a/extensions/Wikibase/client/tests/phpunit/includes/Hooks/OtherProjectsSidebarGeneratorTest.php
+++
b/extensions/Wikibase/client/tests/phpunit/includes/Hooks/OtherProjectsSidebarGeneratorTest.php
@@ -2,14 +2,15 @@
namespace Wikibase\Client\Tests\Hooks;
+use HashSiteStore;
use MediaWikiSite;
use SiteStore;
use Title;
+use TestSites;
use Wikibase\Client\Hooks\OtherProjectsSidebarGenerator;
use Wikibase\DataModel\Entity\ItemId;
use Wikibase\DataModel\SiteLink;
use Wikibase\Lib\Store\SiteLinkLookup;
-use Wikibase\Test\MockSiteStore;
/**
* @covers Wikibase\Client\Hooks\OtherProjectsSidebarGenerator
@@ -87,7 +88,7 @@
* @return SiteStore
*/
private function getSiteStore() {
- $siteStore = MockSiteStore::newFromTestSites();
+ $siteStore = new HashSiteStore( TestSites::getSites() );
$site = new MediaWikiSite();
$site->setGlobalId( 'enwikiquote' );
diff --git
a/extensions/Wikibase/client/tests/phpunit/includes/Hooks/ParserOutputUpdateHookHandlersTest.php
b/extensions/Wikibase/client/tests/phpunit/includes/Hooks/ParserOutputUpdateHookHandlersTest.php
index 4c7374f..b042b0c 100644
---
a/extensions/Wikibase/client/tests/phpunit/includes/Hooks/ParserOutputUpdateHookHandlersTest.php
+++
b/extensions/Wikibase/client/tests/phpunit/includes/Hooks/ParserOutputUpdateHookHandlersTest.php
@@ -2,6 +2,7 @@
namespace Wikibase\Client\Tests\Hooks;
+use HashSiteStore;
use Language;
use MediaWikiSite;
use MediaWikiTestCase;
@@ -27,7 +28,6 @@
use Wikibase\Settings;
use Wikibase\SettingsArray;
use Wikibase\Test\MockRepository;
-use Wikibase\Test\MockSiteStore;
/**
* @covers Wikibase\Client\Hooks\ParserOutputUpdateHookHandlers
@@ -65,7 +65,7 @@
* @return SiteStore
*/
private function getSiteStore() {
- $siteStore = new MockSiteStore( array(
+ $siteStore = new HashSiteStore( array(
$this->newSite( 'wikidatawiki', 'wikidata', 'en' ),
$this->newSite( 'commonswiki', 'commons', 'en' ),
$this->newSite( 'enwiki', 'wikipedia', 'en' ),
diff --git
a/extensions/Wikibase/client/tests/phpunit/includes/LangLinkHandlerTest.php
b/extensions/Wikibase/client/tests/phpunit/includes/LangLinkHandlerTest.php
index 909e5ff..4fa922f 100644
--- a/extensions/Wikibase/client/tests/phpunit/includes/LangLinkHandlerTest.php
+++ b/extensions/Wikibase/client/tests/phpunit/includes/LangLinkHandlerTest.php
@@ -2,8 +2,10 @@
namespace Wikibase\Client\Tests;
+use HashSiteStore;
use ParserOutput;
use Site;
+use TestSites;
use Title;
use Wikibase\Client\Hooks\LanguageLinkBadgeDisplay;
use Wikibase\DataModel\Entity\Item;
@@ -13,7 +15,6 @@
use Wikibase\NamespaceChecker;
use Wikibase\NoLangLinkHandler;
use Wikibase\Test\MockRepository;
-use Wikibase\Test\MockSiteStore;
/**
* @covers Wikibase\LangLinkHandler
@@ -77,7 +78,7 @@
$this->mockRepo->putEntity( $item );
}
- $siteStore = MockSiteStore::newFromTestSites();
+ $siteStore = new HashSiteStore( TestSites::getSites() );
return new LangLinkHandler(
$this->getLanguageLinkBadgeDisplay(),
diff --git
a/extensions/Wikibase/client/tests/phpunit/includes/OtherProjectsSitesGeneratorTest.php
b/extensions/Wikibase/client/tests/phpunit/includes/OtherProjectsSitesGeneratorTest.php
index e042552..5cd5029 100644
---
a/extensions/Wikibase/client/tests/phpunit/includes/OtherProjectsSitesGeneratorTest.php
+++
b/extensions/Wikibase/client/tests/phpunit/includes/OtherProjectsSitesGeneratorTest.php
@@ -2,9 +2,9 @@
namespace Wikibase\Client\Tests;
+use HashSiteStore;
use Site;
use Wikibase\Client\OtherProjectsSitesGenerator;
-use Wikibase\Test\MockSiteStore;
/**
* @covers Wikibase\Client\OtherProjectsSitesGenerator
@@ -91,7 +91,7 @@
}
/**
- * @return MockSiteStore
+ * @return HashSiteStore
*/
private function getSiteStoreMock() {
$sites = array();
@@ -148,7 +148,7 @@
$site->setLanguageCode( 'en' );
$sites[] = $site;
- return new MockSiteStore( $sites );
+ return new HashSiteStore( $sites );
}
}
diff --git
a/extensions/Wikibase/client/tests/phpunit/includes/SiteLinkCommentCreatorTest.php
b/extensions/Wikibase/client/tests/phpunit/includes/SiteLinkCommentCreatorTest.php
index 33f3503..ef49f1f 100644
---
a/extensions/Wikibase/client/tests/phpunit/includes/SiteLinkCommentCreatorTest.php
+++
b/extensions/Wikibase/client/tests/phpunit/includes/SiteLinkCommentCreatorTest.php
@@ -4,13 +4,14 @@
use Diff\DiffOp\Diff\Diff;
use Diff\DiffOp\DiffOpChange;
+use HashSiteStore;
use Language;
+use TestSites;
use Title;
use Wikibase\DataModel\Entity\Item;
use Wikibase\DataModel\Entity\ItemId;
use Wikibase\ItemChange;
use Wikibase\SiteLinkCommentCreator;
-use Wikibase\Test\MockSiteStore;
use Wikibase\Test\TestChanges;
/**
@@ -29,7 +30,8 @@
* @dataProvider getEditCommentProvider
*/
public function testGetEditComment( Diff $siteLinkDiff, $action,
$expected ) {
- $commentCreator = new SiteLinkCommentCreator(
Language::factory( 'qqx' ), MockSiteStore::newFromTestSites(), 'enwiki' );
+ $siteStore = new HashSiteStore( TestSites::getSites() );
+ $commentCreator = new SiteLinkCommentCreator(
Language::factory( 'qqx' ), $siteStore, 'enwiki' );
$comment = $commentCreator->getEditComment( $siteLinkDiff,
$action, $this->getTitle( 'A fancy page' ) );
$this->assertEquals( $expected, $comment );
@@ -67,7 +69,8 @@
* @dataProvider needsTargetSpecificSummaryProvider
*/
public function testNeedsTargetSpecificSummary( $expected, Diff
$siteLinkDiff, Title $title ) {
- $commentCreator = new SiteLinkCommentCreator(
Language::factory( 'qqx' ), MockSiteStore::newFromTestSites(), 'enwiki' );
+ $siteStore = new HashSiteStore( TestSites::getSites() );
+ $commentCreator = new SiteLinkCommentCreator(
Language::factory( 'qqx' ), $siteStore, 'enwiki' );
$res = $commentCreator->needsTargetSpecificSummary(
$siteLinkDiff, $title );
$this->assertSame( $expected, $res );
diff --git
a/extensions/Wikibase/client/tests/phpunit/includes/WikibaseClientTest.php
b/extensions/Wikibase/client/tests/phpunit/includes/WikibaseClientTest.php
index 5084269..5b0bf01 100644
--- a/extensions/Wikibase/client/tests/phpunit/includes/WikibaseClientTest.php
+++ b/extensions/Wikibase/client/tests/phpunit/includes/WikibaseClientTest.php
@@ -2,6 +2,7 @@
namespace Wikibase\Client\Tests;
+use HashSiteStore;
use Language;
use Site;
use SiteStore;
@@ -9,7 +10,6 @@
use Wikibase\DataModel\Entity\Item;
use Wikibase\Lib\DataTypeDefinitions;
use Wikibase\SettingsArray;
-use Wikibase\Test\MockSiteStore;
/**
* @covers Wikibase\Client\WikibaseClient
@@ -166,7 +166,7 @@
* @return SiteStore
*/
private function getSiteStore() {
- $siteStore = new MockSiteStore();
+ $siteStore = new HashSiteStore();
$site = new Site();
$site->setGlobalId( 'enwiki' );
@@ -299,7 +299,7 @@
*/
private function getWikibaseClient() {
$settings = new SettingsArray(
WikibaseClient::getDefaultInstance()->getSettings()->getArrayCopy() );
- $sites = new MockSiteStore( array() );
+ $sites = new HashSiteStore( array() );
$dataTypeDefinitions = new DataTypeDefinitions();
return new WikibaseClient( $settings, Language::factory( 'en'
), $dataTypeDefinitions, $sites );
}
diff --git a/extensions/Wikibase/lib/i18n/bg.json
b/extensions/Wikibase/lib/i18n/bg.json
index afdd9ef..5ea236c 100644
--- a/extensions/Wikibase/lib/i18n/bg.json
+++ b/extensions/Wikibase/lib/i18n/bg.json
@@ -3,10 +3,11 @@
"authors": [
"Spiritia",
"DCLXVI",
- "Termininja"
+ "Termininja",
+ "Vodnokon4e"
]
},
- "wikibase-error-unexpected": "Възникна неочаквана грешка.",
+ "wikibase-error-unexpected": "Грешка: $1.",
"wikibase-error-save-generic": "Промените не могат да бъдат завършени,
поради възникнала грешка при опита за съхраняване.",
"wikibase-error-remove-generic": "Промените не могат да бъдат
завършени, поради възникнала грешка при опита за изтриване.",
"wikibase-error-save-connection": "Промените не могат да бъдат
завършени, поради възникнал проблем с интернет връзката при опита за
съхраняване. Проверете интернет връзката си.",
diff --git a/extensions/Wikibase/lib/i18n/my.json
b/extensions/Wikibase/lib/i18n/my.json
new file mode 100644
index 0000000..cc45ace
--- /dev/null
+++ b/extensions/Wikibase/lib/i18n/my.json
@@ -0,0 +1,8 @@
+{
+ "@metadata": {
+ "authors": [
+ "Ninjastrikers"
+ ]
+ },
+ "wikibase-sitelinks-wikipedia": "ဝီကီပီးဒီးယား"
+}
diff --git a/extensions/Wikibase/lib/tests/phpunit/MockSiteStore.php
b/extensions/Wikibase/lib/tests/phpunit/MockSiteStore.php
deleted file mode 100644
index 83a1fe5..0000000
--- a/extensions/Wikibase/lib/tests/phpunit/MockSiteStore.php
+++ /dev/null
@@ -1,113 +0,0 @@
-<?php
-
-namespace Wikibase\Test;
-
-use Site;
-use SiteList;
-use SiteStore;
-
-/**
- * @license GPL 2+
- * @author Daniel Kinzler
- */
-class MockSiteStore implements SiteStore {
-
- /**
- * @var Site[]
- */
- private $sites = array();
-
- /**
- * Returns a SiteStore object that contains TestSites::getSites().
- * The SiteStore is not not be backed by an actual database.
- *
- * @return SiteStore
- */
- public static function newFromTestSites() {
- $store = new MockSiteStore( \TestSites::getSites() );
- return $store;
- }
-
- /**
- * @param Site[] $sites
- */
- public function __construct( array $sites = array() ) {
- $this->saveSites( $sites );
- }
-
- /**
- * Saves the provided site.
- *
- * @since 1.21
- *
- * @param Site $site
- *
- * @return boolean Success indicator
- */
- public function saveSite( Site $site ) {
- $this->sites[$site->getGlobalId()] = $site;
-
- return true;
- }
-
- /**
- * Saves the provided sites.
- *
- * @since 1.21
- *
- * @param Site[] $sites
- *
- * @return boolean Success indicator
- */
- public function saveSites( array $sites ) {
- foreach ( $sites as $site ) {
- $this->saveSite( $site );
- }
-
- return true;
- }
-
- /**
- * Returns the site with provided global id, or null if there is no
such site.
- *
- * @since 1.21
- *
- * @param string $globalId
- * @param string $source either 'cache' or 'recache'.
- * If 'cache', the values are allowed (but not
obliged) to come from a cache.
- *
- * @return Site|null
- */
- public function getSite( $globalId, $source = 'cache' ) {
- if ( isset( $this->sites[$globalId] ) ) {
- return $this->sites[$globalId];
- } else {
- return null;
- }
- }
-
- /**
- * Returns a list of all sites. By default this site is
- * fetched from the cache, which can be changed to loading
- * the list from the database using the $useCache parameter.
- *
- * @since 1.21
- *
- * @param string $source either 'cache' or 'recache'.
- * If 'cache', the values are allowed (but not
obliged) to come from a cache.
- *
- * @return SiteList
- */
- public function getSites( $source = 'cache' ) {
- return new SiteList( $this->sites );
- }
-
- /**
- * Deletes all sites from the database. After calling clear(),
getSites() will return an empty
- * list and getSite() will return null until saveSite() or saveSites()
is called.
- */
- public function clear() {
- $this->sites = array();
- }
-
-}
diff --git a/extensions/Wikibase/lib/tests/phpunit/sites/SitesBuilderTest.php
b/extensions/Wikibase/lib/tests/phpunit/sites/SitesBuilderTest.php
index ebd7a82..e2c362a 100644
--- a/extensions/Wikibase/lib/tests/phpunit/sites/SitesBuilderTest.php
+++ b/extensions/Wikibase/lib/tests/phpunit/sites/SitesBuilderTest.php
@@ -2,6 +2,7 @@
namespace Wikibase\Test;
+use HashSiteStore;
use MediaWikiSite;
use PHPUnit_Framework_TestCase;
use SiteList;
@@ -21,7 +22,7 @@
* @dataProvider buildSitesProvider
*/
public function testBuildSites( array $sites, $group, $wikiId, array
$expected ) {
- $store = new MockSiteStore();
+ $store = new HashSiteStore();
$validGroups = array( 'wikipedia', 'wikivoyage', 'wikiquote',
'wiktionary',
'wikibooks', 'wikisource', 'wikiversity', 'wikinews' );
diff --git a/extensions/Wikibase/repo/i18n/bg.json
b/extensions/Wikibase/repo/i18n/bg.json
index e10e87e..912a9be 100644
--- a/extensions/Wikibase/repo/i18n/bg.json
+++ b/extensions/Wikibase/repo/i18n/bg.json
@@ -7,7 +7,8 @@
"DCLXVI",
"StanProg",
"Macofe",
- "Termininja"
+ "Termininja",
+ "Vodnokon4e"
]
},
"wikibase-desc": "Хранилище на структурирани данни",
@@ -34,7 +35,7 @@
"wikibase-diffview-rank-normal": "Нормален ранг",
"wikibase-diffview-rank-deprecated": "Непрепоръчителен ранг",
"wikibase-sitelink-site-edit-placeholder": "сайт",
- "wikibase-sitelink-page-edit-placeholder": "статия",
+ "wikibase-sitelink-page-edit-placeholder": "страница",
"wikibase-description-input-help-message": "Въведете кратко описание на
$1.",
"wikibase-entitytermsview-input-help-message": "Въведете етикет на
обекта, кратко описание и псевдоними за съответния език.",
"wikibase-statementsection-statements": "Изявления",
diff --git a/extensions/Wikibase/repo/i18n/is.json
b/extensions/Wikibase/repo/i18n/is.json
index d47477e..854a4db 100644
--- a/extensions/Wikibase/repo/i18n/is.json
+++ b/extensions/Wikibase/repo/i18n/is.json
@@ -6,6 +6,7 @@
]
},
"wikibase-desc": "Skipulagður gagnaþjónn",
+ "wikibase-entity": "eining",
"wikibase-entity-item": "hlut",
"wikibase-entity-property": "eiginleika",
"wikibase-entity-query": "fyrirspurn",
@@ -19,6 +20,8 @@
"wikibase-remove-inprogress": "Fjarlægi...",
"wikibase-entitytermsview-entitytermsforlanguagelistview-toggler": "Á
fleiri tungumálum",
"wikibase-entitytermsview-entitytermsforlanguagelistview-configure-link-label":
"Stilla",
+ "wikibase-setting-entitytermsview-showEntitytermslistview": "Sýna
merkimiða, samnefni og lýsingar á öllum tungumálunum mínum við hlöðun síðunnar",
+ "wikibase-setting-entitytermsview-showEntitytermslistview-help":
"Persónuleg tungumál til viðbótar við tungumál viðmótsins er hægt að bæta við
með [[mw:Extension:Babel|Babel viðbótar]] kóða á notendasíðu.",
"wikibase-entitytermsforlanguagelistview-aliases": "Einnig þekkt sem",
"wikibase-entitytermsforlanguagelistview-description": "Lýsing",
"wikibase-entitytermsforlanguagelistview-label": "Merkimiði",
@@ -45,7 +48,7 @@
"wikibase-label-input-help-message": "Sláðu inn merkimiða fyrir þessa
einingu á $1.",
"wikibase-description-input-help-message": "Sláðu inn stutta $1 lýsingu
fyrir þessa einingu.",
"wikibase-entitytermsview-input-help-message": "Sláðu inn merkimiða
fyrir þessa einingu, stutta lýsingu og samnefni fyrir hvert tungumál.",
- "wikibase-statements": "Staðhæfingar",
+ "wikibase-statementsection-statements": "Staðhæfingar",
"wikibase-sitelinks": "Vefsíðutenglar",
"wikibase-sitelinks-empty": "Engin síða tengist þessum hlut.",
"wikibase-sitelinks-input-help-message": "Settu tengil á síðu sem
tengist þessum hlut.",
@@ -97,6 +100,7 @@
"wikibase-validator-label-conflict": "Eiginleikinn $3 hefur þegar
merkimiðann „$1” tengdan við tungumálakóðann $2.",
"wikibase-validator-label-with-description-conflict": "Hlutur $3 hefur
þegar merkimiðann „$1” tengda við tungumálakóðann $2, með sömu lýsinguna.",
"wikibase-validator-label-no-entityid": "Merkimiðinn má ekki vera gilt
auðkenni einkennis.",
+ "wikibase-validator-no-such-media": "Skráin \"$1\" er ekki til á
[https://commons.wikimedia.org/ Wikimedia Commons].",
"wikibase-wikibaserepopage-not-itemid": "„$1” er ekki gilt auðkenni
hlutar.",
"wikibase-wikibaserepopage-invalid-langcode": "Tungumálakóðinn \"$1\"
þekkist ekki. Vinsamlegast notaðu þekktan tungumálakóða, eins og \"is\".",
"wikibase-wikibaserepopage-invalid-id": "Auðkennið \"$1\" þekkist ekki.
Vinsamlegast notaðu gilt auðkenni.",
@@ -110,16 +114,19 @@
"wikibase-itembytitle-error-site": "Vinsamlegast notaðu auðkenni sem er
til fyrir, t.d. \"iswiki\" fyrir íslensku wikipediu.",
"wikibase-itembytitle-error-item": "Hlutur sem tengir á uppgefna síðu
fannst ekki.",
"wikibase-itembytitle-create": "Þú getur einnig [$1 búið til hlut].",
+ "wikibase-itembytitle-summary": "Special:ItemByTitle er notuð til að
finna sambærilegan hlut fyrir ákveðna síðu á tengdri vefsíðu.<br />Í fyrsta
reitinn \"{{int:wikibase-itembytitle-lookup-site}}\" fer tungumálið og kóði
síðunnar.<br />Í síðari reitnum, \"{{int:wikibase-itembytitle-lookup-page}}\",
verður að vera nákvæmur titill síðunnar eins og hann birtist á tengdu síðunni.",
"special-itemdisambiguation": "Aðgreining hlutar",
"wikibase-itemdisambiguation-lookup-fieldset": "Leita eftir hlutum
eftir merkimiða og tungumáli",
"wikibase-itemdisambiguation-lookup-language": "Tungumálakóði:",
"wikibase-itemdisambiguation-lookup-label": "Merkimiði:",
"wikibase-itemdisambiguation-submit": "Leita",
+ "wikibase-itemdisambiguation-form-hints": "Athugaðu að eingöngu $1
{{PLURAL:$1|niðurstaða|niðurstöður}} verða sýndar.",
"wikibase-itemdisambiguation-nothing-found": "Því miður fannst enginn
hlutur með þessum merkimiða.",
"wikibase-itemdisambiguation-search": "Þú getur [$1 leitað eftir
hlutnum].",
"wikibase-itemdisambiguation-create": "Þú getur [$1 búið til hlut].",
"wikibase-itemdisambiguation-invalid-langcode": "Því miður þekkti
kerfið ekki tugumálakóðann. Vinsamlegast notaðu gildan tungumálakóða, eins og
„is\".",
"wikibase-itemdisambiguation-description": "Þau gildi sem eru notuð við
leit þurfa að vera tæmandi texta færsla. Tungumál er kennimerki, eins og
„en\".",
+ "wikibase-itemdisambiguation-summary": "Leita eftir hlutum með
nákvæmlega sama merkimiðann.",
"special-newproperty": "Búa til nýjan eiginleika",
"wikibase-newproperty-summary": "Sjáðu til þess að þú
[[Special:PropertyDisambiguation|athugir hvort eiginleikinn sé þegar til
staðar]]!<br />Þú ættir að búa til [[Help:Label/is|merkimiða]] og
[[Help:Description/is|lýsingu]] fyrir\nalla eiginleika og þar að auki gilda
gagnagerð.",
"wikibase-newproperty-fieldset": "Búa til nýjan eiginleika",
@@ -132,6 +139,7 @@
"wikibase-newitem-page": "Nafn fyrsta vefsvæðistengilsins",
"wikibase-newitem-no-external-page": "Síðan sem tilgreind var fannst
ekki á vefsíðunni.",
"wikibase-newitem-not-recognized-siteid": "Tilgreint kennimerki
tengilsins þekktist ekki.",
+ "wikibase-newentity-language": "Tungumál:",
"wikibase-newentity-label": "Merkimiði:",
"wikibase-newentity-description": "Lýsing:",
"wikibase-newentity-aliases": "Safnefni, aðgreind með pípumerki:",
diff --git a/extensions/Wikibase/repo/i18n/my.json
b/extensions/Wikibase/repo/i18n/my.json
new file mode 100644
index 0000000..3d690b0
--- /dev/null
+++ b/extensions/Wikibase/repo/i18n/my.json
@@ -0,0 +1,13 @@
+{
+ "@metadata": {
+ "authors": [
+ "Ninjastrikers"
+ ]
+ },
+ "wikibase-edit": "တည်းဖြတ်",
+ "wikibase-add": "ပေါင်းထည့်",
+ "wikibase-sitelinks-special": "အခြား ဆိုဒ်များ",
+ "wikibase-statementview-rank-normal": "သာမန် အဆင့်",
+ "wikibase-statementview-referencesheading-pendingcountersubject":
"{{PLURAL:$1|ရည်ညွှန်းချက်|ရည်ညွှန်းချက်များ}}",
+ "wikibase-restore-summary": "[[Special:Contributions/$2|$2]] ၏
ဆောင်ရွက်ချက် $1 အား ပြန်လည်ရယူလိုက်သည်"
+}
diff --git
a/extensions/Wikibase/repo/includes/specials/SpecialListProperties.php
b/extensions/Wikibase/repo/includes/specials/SpecialListProperties.php
index cd77797..5773c86 100644
--- a/extensions/Wikibase/repo/includes/specials/SpecialListProperties.php
+++ b/extensions/Wikibase/repo/includes/specials/SpecialListProperties.php
@@ -121,7 +121,7 @@
parent::execute( $subPage );
$output = $this->getOutput();
- $output->setSquidMaxage( static::CACHE_TTL_IN_SECONDS );
+ $output->setCdnMaxage( static::CACHE_TTL_IN_SECONDS );
$this->prepareArguments( $subPage );
$this->showForm();
diff --git
a/extensions/Wikibase/repo/includes/specials/SpecialWikibaseQueryPage.php
b/extensions/Wikibase/repo/includes/specials/SpecialWikibaseQueryPage.php
index b8c19c4..333129a 100644
--- a/extensions/Wikibase/repo/includes/specials/SpecialWikibaseQueryPage.php
+++ b/extensions/Wikibase/repo/includes/specials/SpecialWikibaseQueryPage.php
@@ -84,7 +84,7 @@
parent::execute( $subPage );
$output = $this->getOutput();
- $output->setSquidMaxage( static::CACHE_TTL_IN_SECONDS );
+ $output->setCdnMaxage( static::CACHE_TTL_IN_SECONDS );
}
/**
diff --git
a/extensions/Wikibase/repo/tests/phpunit/includes/ChangeOp/ChangeOpFactoryProviderTest.php
b/extensions/Wikibase/repo/tests/phpunit/includes/ChangeOp/ChangeOpFactoryProviderTest.php
index 264f4ec..682827b 100644
---
a/extensions/Wikibase/repo/tests/phpunit/includes/ChangeOp/ChangeOpFactoryProviderTest.php
+++
b/extensions/Wikibase/repo/tests/phpunit/includes/ChangeOp/ChangeOpFactoryProviderTest.php
@@ -2,6 +2,8 @@
namespace Wikibase\Test;
+use HashSiteStore;
+use TestSites;
use Wikibase\ChangeOp\ChangeOpFactoryProvider;
use Wikibase\DataModel\Entity\ItemId;
use Wikibase\Repo\Validators\EntityConstraintProvider;
@@ -52,7 +54,7 @@
$this->mockProvider->getMockGuidParser( $entityId ),
$this->mockProvider->getMockSnakValidator(),
$this->mockProvider->getMockTermValidatorFactory(),
- MockSiteStore::newFromTestSites()
+ new HashSiteStore( TestSites::getSites() )
);
}
diff --git
a/extensions/Wikibase/repo/tests/phpunit/includes/ChangeOp/ChangeOpsMergeTest.php
b/extensions/Wikibase/repo/tests/phpunit/includes/ChangeOp/ChangeOpsMergeTest.php
index 77ff54c..2658e94 100644
---
a/extensions/Wikibase/repo/tests/phpunit/includes/ChangeOp/ChangeOpsMergeTest.php
+++
b/extensions/Wikibase/repo/tests/phpunit/includes/ChangeOp/ChangeOpsMergeTest.php
@@ -2,7 +2,9 @@
namespace Wikibase\Test;
+use HashSiteStore;
use MediaWikiTestCase;
+use TestSites;
use ValueValidators\Error;
use ValueValidators\Result;
use Wikibase\ChangeOp\ChangeOpFactoryProvider;
@@ -53,7 +55,7 @@
$siteLookup = null
) {
if ( $siteLookup === null ) {
- $siteLookup = MockSiteStore::newFromTestSites();
+ $siteLookup = new HashSiteStore( TestSites::getSites()
);
}
// A validator which makes sure that no site link is for page
'DUPE'
$siteLinkUniquenessValidator = $this->getMock(
'Wikibase\Repo\Validators\EntityValidator' );
@@ -412,7 +414,7 @@
$enwiki->expects( $this->exactly( 2 ) )
->method( 'normalizePageName' )
->will( $this->returnValue( 'Foo' ) );
- $mockSiteStore = MockSiteStore::newFromTestSites();
+ $mockSiteStore = new HashSiteStore( TestSites::getSites() );
$mockSiteStore->saveSite( $enwiki );
$changeOps = $this->makeChangeOpsMerge(
@@ -440,7 +442,7 @@
$from,
$to,
array(),
- new MockSiteStore()
+ new HashSiteStore()
);
$this->setExpectedException(
diff --git
a/extensions/Wikibase/repo/tests/phpunit/includes/ChangeOp/MergeChangeOpsFactoryTest.php
b/extensions/Wikibase/repo/tests/phpunit/includes/ChangeOp/MergeChangeOpsFactoryTest.php
index 6d68911..a85be5a 100644
---
a/extensions/Wikibase/repo/tests/phpunit/includes/ChangeOp/MergeChangeOpsFactoryTest.php
+++
b/extensions/Wikibase/repo/tests/phpunit/includes/ChangeOp/MergeChangeOpsFactoryTest.php
@@ -2,7 +2,9 @@
namespace Wikibase\Test;
+use HashSiteStore;
use PHPUnit_Framework_TestCase;
+use TestSites;
use Wikibase\ChangeOp\ChangeOpFactoryProvider;
use Wikibase\ChangeOp\MergeChangeOpsFactory;
use Wikibase\DataModel\Entity\Item;
@@ -32,6 +34,8 @@
->disableOriginalConstructor()
->getMock();
+ $siteStore = new HashSiteStore( TestSites::getSites() );
+
$changeOpFactoryProvider = new ChangeOpFactoryProvider(
$constraintProvider,
$mockProvider->getMockGuidGenerator(),
@@ -39,13 +43,13 @@
$mockProvider->getMockGuidParser( $toItemId ),
$mockProvider->getMockSnakValidator(),
$mockProvider->getMockTermValidatorFactory(),
- MockSiteStore::newFromTestSites()
+ $siteStore
);
return new MergeChangeOpsFactory(
$constraintProvider,
$changeOpFactoryProvider,
- MockSiteStore::newFromTestSites()
+ $siteStore
);
}
diff --git
a/extensions/Wikibase/repo/tests/phpunit/includes/Diff/DiffViewTest.php
b/extensions/Wikibase/repo/tests/phpunit/includes/Diff/DiffViewTest.php
index 0ae29ed..6edd108 100644
--- a/extensions/Wikibase/repo/tests/phpunit/includes/Diff/DiffViewTest.php
+++ b/extensions/Wikibase/repo/tests/phpunit/includes/Diff/DiffViewTest.php
@@ -6,7 +6,9 @@
use Diff\DiffOp\DiffOpAdd;
use Diff\DiffOp\DiffOpChange;
use Diff\DiffOp\DiffOpRemove;
+use HashSiteStore;
use PHPUnit_Framework_TestCase;
+use TestSites;
use Wikibase\Repo\Diff\DiffView;
/**
@@ -88,7 +90,7 @@
* @return DiffView
*/
private function getDiffView( array $path, Diff $diff ) {
- $siteStore = MockSiteStore::newFromTestSites();
+ $siteStore = new HashSiteStore( TestSites::getSites() );
$entityIdFormatter = $this->getMock(
'Wikibase\DataModel\Services\EntityId\EntityIdFormatter' );
$entityIdFormatter->expects( $this->any() )
diff --git
a/extensions/Wikibase/repo/tests/phpunit/includes/Diff/EntityDiffVisualizerTest.php
b/extensions/Wikibase/repo/tests/phpunit/includes/Diff/EntityDiffVisualizerTest.php
index 90839b0..84d08b7 100644
---
a/extensions/Wikibase/repo/tests/phpunit/includes/Diff/EntityDiffVisualizerTest.php
+++
b/extensions/Wikibase/repo/tests/phpunit/includes/Diff/EntityDiffVisualizerTest.php
@@ -5,6 +5,7 @@
use Diff\DiffOp\Diff\Diff;
use Diff\DiffOp\DiffOpAdd;
use Diff\DiffOp\DiffOpRemove;
+use HashSiteStore;
use IContextSource;
use Language;
use MediaWikiTestCase;
@@ -124,7 +125,7 @@
$this->getMockContext(),
$this->getMockClaimDiffer(),
$this->getMockClaimDiffVisualizer(),
- new MockSiteStore( array( $enwiki ) ),
+ new HashSiteStore( array( $enwiki ) ),
$this->getMock(
'Wikibase\DataModel\Services\EntityId\EntityIdFormatter' )
);
}
diff --git
a/extensions/Wikibase/repo/tests/phpunit/includes/Interactors/ItemMergeInteractorTest.php
b/extensions/Wikibase/repo/tests/phpunit/includes/Interactors/ItemMergeInteractorTest.php
index 7100365..6cb08c4 100644
---
a/extensions/Wikibase/repo/tests/phpunit/includes/Interactors/ItemMergeInteractorTest.php
+++
b/extensions/Wikibase/repo/tests/phpunit/includes/Interactors/ItemMergeInteractorTest.php
@@ -2,7 +2,9 @@
namespace Wikibase\Test\Interactors;
+use HashSiteStore;
use Status;
+use TestSites;
use User;
use Wikibase\ChangeOp\MergeChangeOpsFactory;
use Wikibase\DataModel\Entity\EntityId;
@@ -15,7 +17,6 @@
use Wikibase\Repo\WikibaseRepo;
use Wikibase\Test\EntityModificationTestHelper;
use Wikibase\Test\MockRepository;
-use Wikibase\Test\MockSiteStore;
/**
* @covers Wikibase\Repo\Interactors\ItemMergeInteractor
@@ -113,7 +114,7 @@
$changeOpsFactory = new MergeChangeOpsFactory(
$wikibaseRepo->getEntityConstraintProvider(),
$wikibaseRepo->getChangeOpFactoryProvider(),
- MockSiteStore::newFromTestSites()
+ new HashSiteStore( TestSites::getSites() )
);
$interactor = new ItemMergeInteractor(
diff --git
a/extensions/Wikibase/repo/tests/phpunit/includes/LinkedData/EntityDataRequestHandlerTest.php
b/extensions/Wikibase/repo/tests/phpunit/includes/LinkedData/EntityDataRequestHandlerTest.php
index 90ccac3..e670702 100644
---
a/extensions/Wikibase/repo/tests/phpunit/includes/LinkedData/EntityDataRequestHandlerTest.php
+++
b/extensions/Wikibase/repo/tests/phpunit/includes/LinkedData/EntityDataRequestHandlerTest.php
@@ -6,6 +6,7 @@
use DerivativeContext;
use FauxRequest;
use FauxResponse;
+use HashSiteStore;
use HttpError;
use OutputPage;
use RequestContext;
@@ -108,7 +109,7 @@
new SiteList(),
$entityDataFormatProvider,
$serializerFactory,
- new MockSiteStore()
+ new HashSiteStore()
);
$entityDataFormatProvider->setFormatWhiteList(
diff --git
a/extensions/Wikibase/repo/tests/phpunit/includes/LinkedData/EntityDataSerializationServiceTest.php
b/extensions/Wikibase/repo/tests/phpunit/includes/LinkedData/EntityDataSerializationServiceTest.php
index 503522f..ba7485e 100644
---
a/extensions/Wikibase/repo/tests/phpunit/includes/LinkedData/EntityDataSerializationServiceTest.php
+++
b/extensions/Wikibase/repo/tests/phpunit/includes/LinkedData/EntityDataSerializationServiceTest.php
@@ -3,6 +3,7 @@
namespace Wikibase\Test;
use DataValues\Serializers\DataValueSerializer;
+use HashSiteStore;
use SiteList;
use Title;
use Wikibase\DataModel\Entity\EntityId;
@@ -113,7 +114,7 @@
new SiteList(),
new EntityDataFormatProvider(),
$serializerFactory,
- new MockSiteStore()
+ new HashSiteStore()
);
return $service;
diff --git
a/extensions/Wikibase/repo/tests/phpunit/includes/api/ApiHelperFactoryTest.php
b/extensions/Wikibase/repo/tests/phpunit/includes/api/ApiHelperFactoryTest.php
index 2e09090..f76bf45 100644
---
a/extensions/Wikibase/repo/tests/phpunit/includes/api/ApiHelperFactoryTest.php
+++
b/extensions/Wikibase/repo/tests/phpunit/includes/api/ApiHelperFactoryTest.php
@@ -2,10 +2,10 @@
namespace Wikibase\Test\Repo\Api;
+use HashSiteStore;
use Language;
use Wikibase\Repo\Api\ApiHelperFactory;
use Wikibase\Repo\WikibaseRepo;
-use Wikibase\Test\MockSiteStore;
/**
* @covers Wikibase\Repo\Api\ApiHelperFactory
@@ -35,7 +35,7 @@
$exceptionLocalizer,
$dataTypeLookup,
$entityFactory,
- new MockSiteStore(),
+ new HashSiteStore(),
$summaryFormatter,
$entityRevisionLookup,
$editEntityFactory
diff --git
a/extensions/Wikibase/repo/tests/phpunit/includes/api/ApiXmlFormatTest.php
b/extensions/Wikibase/repo/tests/phpunit/includes/api/ApiXmlFormatTest.php
index 35f40ab..7a2761a 100644
--- a/extensions/Wikibase/repo/tests/phpunit/includes/api/ApiXmlFormatTest.php
+++ b/extensions/Wikibase/repo/tests/phpunit/includes/api/ApiXmlFormatTest.php
@@ -5,9 +5,10 @@
use ApiBase;
use DOMDocument;
use DOMXPath;
+use HashSiteStore;
+use TestSites;
use Wikibase\Repo\Api\SetSiteLink;
use Wikibase\Repo\SiteLinkTargetProvider;
-use Wikibase\Test\MockSiteStore;
/**
* @group API
@@ -161,7 +162,7 @@
/** @var SetSiteLink $module */
$module = $this->getApiModule(
'\Wikibase\Repo\Api\SetSiteLink', 'wbsetsitelink', $params, true );
- $siteTargetProvider = new SiteLinkTargetProvider(
MockSiteStore::newFromTestSites(), array() );
+ $siteTargetProvider = new SiteLinkTargetProvider( new
HashSiteStore( TestSites::getSites() ), array() );
$module->setServices( $siteTargetProvider );
$result = $this->executeApiModule( $module );
$actual = $this->removePageInfoAttributes( $result, $entityId );
diff --git
a/extensions/Wikibase/repo/tests/phpunit/includes/api/MergeItemsTest.php
b/extensions/Wikibase/repo/tests/phpunit/includes/api/MergeItemsTest.php
index 9f09848..f98113b 100644
--- a/extensions/Wikibase/repo/tests/phpunit/includes/api/MergeItemsTest.php
+++ b/extensions/Wikibase/repo/tests/phpunit/includes/api/MergeItemsTest.php
@@ -2,6 +2,7 @@
namespace Wikibase\Test\Repo\Api;
+use HashSiteStore;
use Language;
use RequestContext;
use Status;
@@ -24,7 +25,6 @@
use Wikibase\Repo\WikibaseRepo;
use Wikibase\Test\EntityModificationTestHelper;
use Wikibase\Test\MockRepository;
-use Wikibase\Test\MockSiteStore;
/**
* @covers Wikibase\Repo\Api\MergeItems
@@ -147,7 +147,7 @@
$wikibaseRepo->getStatementGuidParser(),
$this->getSnakValidator(),
$this->getTermValidatorFactory(),
- new MockSiteStore( TestSites::getSites() )
+ new HashSiteStore( TestSites::getSites() )
);
$module->setServices(
diff --git
a/extensions/Wikibase/repo/tests/phpunit/includes/api/ResultBuilderTest.php
b/extensions/Wikibase/repo/tests/phpunit/includes/api/ResultBuilderTest.php
index 6e60a59..c694ebb 100644
--- a/extensions/Wikibase/repo/tests/phpunit/includes/api/ResultBuilderTest.php
+++ b/extensions/Wikibase/repo/tests/phpunit/includes/api/ResultBuilderTest.php
@@ -5,6 +5,7 @@
use ApiResult;
use DataValues\Serializers\DataValueSerializer;
use DataValues\StringValue;
+use HashSiteStore;
use Wikibase\DataModel\Entity\Item;
use Wikibase\DataModel\Entity\ItemId;
use Wikibase\DataModel\Entity\PropertyId;
@@ -24,7 +25,6 @@
use Wikibase\EntityRevision;
use Wikibase\LanguageFallbackChainFactory;
use Wikibase\Repo\Api\ResultBuilder;
-use Wikibase\Test\MockSiteStore;
/**
* @covers Wikibase\Repo\Api\ResultBuilder
@@ -80,7 +80,7 @@
$result,
$mockEntityTitleLookup,
$serializerFactory,
- new MockSiteStore(),
+ new HashSiteStore(),
$mockPropertyDataTypeLookup,
$addMetaData
);
diff --git
a/extensions/Wikibase/repo/tests/phpunit/includes/specials/SpecialEntityDataTest.php
b/extensions/Wikibase/repo/tests/phpunit/includes/specials/SpecialEntityDataTest.php
index 2800ac7..3174cff 100644
---
a/extensions/Wikibase/repo/tests/phpunit/includes/specials/SpecialEntityDataTest.php
+++
b/extensions/Wikibase/repo/tests/phpunit/includes/specials/SpecialEntityDataTest.php
@@ -5,6 +5,7 @@
use DataValues\Serializers\DataValueSerializer;
use FauxRequest;
use FauxResponse;
+use HashSiteStore;
use HttpError;
use OutputPage;
use SiteList;
@@ -88,7 +89,7 @@
new SiteList(),
$entityDataFormatProvider,
$serializerFactory,
- new MockSiteStore()
+ new HashSiteStore()
);
$formats = array( 'json', 'rdfxml', 'ntriples' );
diff --git
a/extensions/Wikibase/repo/tests/phpunit/includes/specials/SpecialMergeItemsTest.php
b/extensions/Wikibase/repo/tests/phpunit/includes/specials/SpecialMergeItemsTest.php
index bdc601c..f15e5c6 100644
---
a/extensions/Wikibase/repo/tests/phpunit/includes/specials/SpecialMergeItemsTest.php
+++
b/extensions/Wikibase/repo/tests/phpunit/includes/specials/SpecialMergeItemsTest.php
@@ -3,10 +3,12 @@
namespace Wikibase\Test;
use Exception;
+use HashSiteStore;
use PHPUnit_Framework_Error;
use RawMessage;
use SpecialPageTestBase;
use Status;
+use TestSites;
use User;
use Wikibase\ChangeOp\MergeChangeOpsFactory;
use Wikibase\DataModel\Entity\EntityId;
@@ -106,7 +108,7 @@
$changeOpsFactory = new MergeChangeOpsFactory(
$wikibaseRepo->getEntityConstraintProvider(),
$wikibaseRepo->getChangeOpFactoryProvider(),
- MockSiteStore::newFromTestSites()
+ new HashSiteStore( TestSites::getSites() )
);
$exceptionLocalizer = $this->getMock(
'Wikibase\Repo\Localizer\ExceptionLocalizer' );
diff --git
a/extensions/Wikibase/repo/tests/phpunit/includes/specials/SpecialWikibaseRepoPageTestBase.php
b/extensions/Wikibase/repo/tests/phpunit/includes/specials/SpecialWikibaseRepoPageTestBase.php
index af806b4..9defefc 100644
---
a/extensions/Wikibase/repo/tests/phpunit/includes/specials/SpecialWikibaseRepoPageTestBase.php
+++
b/extensions/Wikibase/repo/tests/phpunit/includes/specials/SpecialWikibaseRepoPageTestBase.php
@@ -3,6 +3,7 @@
namespace Wikibase\Test;
use DataValues\DataValue;
+use HashSiteStore;
use Language;
use SiteStore;
use SpecialPageTestBase;
@@ -109,7 +110,7 @@
* @return SiteStore
*/
protected function getSiteStore() {
- return new MockSiteStore( TestSites::getSites() );
+ return new HashSiteStore( TestSites::getSites() );
}
/**
diff --git a/extensions/Wikibase/repo/tests/phpunit/maintenance/dumpRdfTest.php
b/extensions/Wikibase/repo/tests/phpunit/maintenance/dumpRdfTest.php
index cd4a943..2e8b79a 100644
--- a/extensions/Wikibase/repo/tests/phpunit/maintenance/dumpRdfTest.php
+++ b/extensions/Wikibase/repo/tests/phpunit/maintenance/dumpRdfTest.php
@@ -3,7 +3,9 @@
namespace Wikibase\Test;
use DataValues\StringValue;
+use HashSiteStore;
use MediaWikiLangTestCase;
+use TestSites;
use Wikibase\DataModel\Entity\Entity;
use Wikibase\DataModel\Entity\Item;
use Wikibase\DataModel\Entity\ItemId;
@@ -131,7 +133,7 @@
$dumpScript->setServices(
$mockEntityPerPage,
new NullEntityPrefetcher(),
- MockSiteStore::newFromTestSites(),
+ new HashSiteStore( TestSites::getSites() ),
$this->getMockPropertyDataTypeLookup(),
$rdfBuilder,
$mockRepo,
diff --git
a/extensions/Wikibase/view/resources/jquery/wikibase/jquery.wikibase.statementview.js
b/extensions/Wikibase/view/resources/jquery/wikibase/jquery.wikibase.statementview.js
index b555063..1136f87 100644
---
a/extensions/Wikibase/view/resources/jquery/wikibase/jquery.wikibase.statementview.js
+++
b/extensions/Wikibase/view/resources/jquery/wikibase/jquery.wikibase.statementview.js
@@ -236,13 +236,7 @@
// Group qualifiers by property id:
if ( qualifiers && qualifiers.length ) {
- var propertyIds = qualifiers.getPropertyOrder();
-
- groupedQualifierSnaks = [];
-
- for ( var i = 0; i < propertyIds.length; i++ ) {
- groupedQualifierSnaks.push(
qualifiers.getFilteredSnakList( propertyIds[i] ) );
- }
+ groupedQualifierSnaks =
qualifiers.getGroupedSnakLists();
}
// Using the property id, qualifier snaks are split into groups
of snaklistviews. These
diff --git a/vendor/composer/autoload_classmap.php
b/vendor/composer/autoload_classmap.php
index b0a77ef..64b0e01 100644
--- a/vendor/composer/autoload_classmap.php
+++ b/vendor/composer/autoload_classmap.php
@@ -1289,7 +1289,6 @@
'Wikibase\\Test\\MockPropertyLabelResolver' => $baseDir .
'/extensions/Wikibase/lib/tests/phpunit/MockPropertyLabelResolver.php',
'Wikibase\\Test\\MockRepository' => $baseDir .
'/extensions/Wikibase/lib/tests/phpunit/MockRepository.php',
'Wikibase\\Test\\MockRepositoryTest' => $baseDir .
'/extensions/Wikibase/lib/tests/phpunit/MockRepositoryTest.php',
- 'Wikibase\\Test\\MockSiteStore' => $baseDir .
'/extensions/Wikibase/lib/tests/phpunit/MockSiteStore.php',
'Wikibase\\Test\\MockTermIndex' => $baseDir .
'/extensions/Wikibase/lib/tests/phpunit/store/MockTermIndex.php',
'Wikibase\\Test\\ObservableMessageReporterTest' => $baseDir .
'/extensions/Wikibase/lib/tests/phpunit/Reporting/ObservableMessageReporterTest.php',
'Wikibase\\Test\\OutputPageJsConfigBuilderTest' => $baseDir .
'/extensions/Wikibase/repo/tests/phpunit/includes/OutputPageJsConfigBuilderTest.php',
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index a4cbf20..2186feb 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -1236,12 +1236,12 @@
"source": {
"type": "git",
"url":
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";,
- "reference": "8f2e3dd6ef6e548c237d8c50297859887934ccf1"
+ "reference": "07918335361491b65ecccfcb7eaccb94da54f10e"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/8f2e3dd6ef6e548c237d8c50297859887934ccf1";,
- "reference": "8f2e3dd6ef6e548c237d8c50297859887934ccf1",
+ "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/07918335361491b65ecccfcb7eaccb94da54f10e";,
+ "reference": "07918335361491b65ecccfcb7eaccb94da54f10e",
"shasum": ""
},
"require": {
@@ -1273,7 +1273,7 @@
"jakub-onderka/php-parallel-lint": "0.9.2",
"mediawiki/mediawiki-codesniffer": "0.4.0|0.5.0"
},
- "time": "2016-01-07 22:39:29",
+ "time": "2016-01-08 22:08:46",
"type": "mediawiki-extension",
"installation-source": "dist",
"autoload": {
@@ -1514,7 +1514,7 @@
"source": {
"type": "git",
"url":
"https://gerrit.wikimedia.org/r/mediawiki/extensions/WikibaseQuality";,
- "reference": "7738ef8d9b07d7bab7a84de571e98b75f6b7479d"
+ "reference": "d26ec9d03eef9e7b882ab7e22e0b0e373204d02c"
},
"require": {
"php": ">=5.3.0",
@@ -1526,7 +1526,7 @@
"phpunit/phpunit": "^3.7.37|~4.5",
"satooshi/php-coveralls": "master-dev"
},
- "time": "2016-01-07 19:19:06",
+ "time": "2016-01-09 07:24:54",
"type": "mediawiki-extension",
"installation-source": "source",
"autoload": {
@@ -1568,7 +1568,7 @@
"source": {
"type": "git",
"url":
"https://gerrit.wikimedia.org/r/mediawiki/extensions/WikibaseQualityConstraints";,
- "reference": "e98aa427ba1669243da460d8c0ddcae0cd75d617"
+ "reference": "77334ca29da34a6022c233376ae575a3b552fc15"
},
"require": {
"php": ">=5.3.0",
@@ -1580,7 +1580,7 @@
"phpunit/phpunit": "^3.7.37|~4.5",
"satooshi/php-coveralls": "master-dev"
},
- "time": "2015-12-18 22:39:37",
+ "time": "2016-01-08 01:35:02",
"type": "mediawiki-extension",
"installation-source": "source",
"autoload": {
--
To view, visit https://gerrit.wikimedia.org/r/263165
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia2f335d5e7a49e6d29bd83ee67ce4135a2128570
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikidata
Gerrit-Branch: master
Gerrit-Owner: WikidataBuilder <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
