Aude has uploaded a new change for review.
https://gerrit.wikimedia.org/r/192602
Change subject: Update Wikidata, enable running populateSitesTable for wikibooks
......................................................................
Update Wikidata, enable running populateSitesTable for wikibooks
Change-Id: I39d214884b1261f910a29122d923097b4b1f1329
---
M composer.lock
M
extensions/Wikibase/client/tests/phpunit/includes/scribunto/Scribunto_LuaWikibaseLibraryTestCase.php
M extensions/Wikibase/lib/maintenance/populateSitesTable.php
M vendor/composer/installed.json
4 files changed, 17 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikidata
refs/changes/02/192602/1
diff --git a/composer.lock b/composer.lock
index b9db37b..0948348 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1234,12 +1234,12 @@
"source": {
"type": "git",
"url":
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";,
- "reference": "c2b41e462a7e05c1b1a99b4273ecfb89b020cbb8"
+ "reference": "5f55db36ee49ad60a830c60f22c1402d3b6da0ab"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/c2b41e462a7e05c1b1a99b4273ecfb89b020cbb8";,
- "reference": "c2b41e462a7e05c1b1a99b4273ecfb89b020cbb8",
+ "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/5f55db36ee49ad60a830c60f22c1402d3b6da0ab";,
+ "reference": "5f55db36ee49ad60a830c60f22c1402d3b6da0ab",
"shasum": ""
},
"require": {
@@ -1306,7 +1306,7 @@
"wikibaserepo",
"wikidata"
],
- "time": "2015-02-19 21:07:13"
+ "time": "2015-02-24 19:08:39"
},
{
"name": "wikibase/wikimedia-badges",
diff --git
a/extensions/Wikibase/client/tests/phpunit/includes/scribunto/Scribunto_LuaWikibaseLibraryTestCase.php
b/extensions/Wikibase/client/tests/phpunit/includes/scribunto/Scribunto_LuaWikibaseLibraryTestCase.php
index 392f426..a516d0a 100644
---
a/extensions/Wikibase/client/tests/phpunit/includes/scribunto/Scribunto_LuaWikibaseLibraryTestCase.php
+++
b/extensions/Wikibase/client/tests/phpunit/includes/scribunto/Scribunto_LuaWikibaseLibraryTestCase.php
@@ -86,6 +86,7 @@
}
protected function setUp() {
+ parent::setUp();
self::doMock();
$wikibaseClient = WikibaseClient::getDefaultInstance();
@@ -97,7 +98,6 @@
);
$this->setMwGlobals( 'wgContLang', Language::factory( 'de' ) );
- parent::setUp();
}
protected function tearDown() {
diff --git a/extensions/Wikibase/lib/maintenance/populateSitesTable.php
b/extensions/Wikibase/lib/maintenance/populateSitesTable.php
index da3cb59..75ea094 100644
--- a/extensions/Wikibase/lib/maintenance/populateSitesTable.php
+++ b/extensions/Wikibase/lib/maintenance/populateSitesTable.php
@@ -3,6 +3,14 @@
$basePath = getenv( 'MW_INSTALL_PATH' ) !== false ? getenv( 'MW_INSTALL_PATH'
) : __DIR__ . '/../../../..';
require_once $basePath . '/maintenance/Maintenance.php';
+if ( !class_exists( 'SitesBuilder' ) ) {
+ require_once __DIR__ . '/../includes/sites/SitesBuilder.php';
+}
+
+if ( !class_exists( 'SiteMatrixParser' ) ) {
+ require_once __DIR__ . '/../includes/sites/SiteMatrixParser.php';
+}
+
/**
* Maintenance script for populating the Sites table from another wiki that
runs the
* SiteMatrix extension.
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index 6a5df9b..888b96b 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -1326,12 +1326,12 @@
"source": {
"type": "git",
"url":
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";,
- "reference": "c2b41e462a7e05c1b1a99b4273ecfb89b020cbb8"
+ "reference": "5f55db36ee49ad60a830c60f22c1402d3b6da0ab"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/c2b41e462a7e05c1b1a99b4273ecfb89b020cbb8";,
- "reference": "c2b41e462a7e05c1b1a99b4273ecfb89b020cbb8",
+ "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/5f55db36ee49ad60a830c60f22c1402d3b6da0ab";,
+ "reference": "5f55db36ee49ad60a830c60f22c1402d3b6da0ab",
"shasum": ""
},
"require": {
@@ -1359,7 +1359,7 @@
"conflict": {
"mediawiki/mediawiki": "<1.23"
},
- "time": "2015-02-19 21:07:13",
+ "time": "2015-02-24 19:08:39",
"type": "mediawiki-extension",
"installation-source": "dist",
"autoload": {
--
To view, visit https://gerrit.wikimedia.org/r/192602
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I39d214884b1261f910a29122d923097b4b1f1329
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikidata
Gerrit-Branch: wmf/1.25wmf16
Gerrit-Owner: Aude <aude.w...@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
