jenkins-bot has submitted this change and it was merged.
Change subject: Update Wikidata - avoid use of LBFactory::singleton
......................................................................
Update Wikidata - avoid use of LBFactory::singleton
This helps ensure compatibility with newer versions of
MediaWiki that may get deployed with this version of Wikibase.
Change-Id: I160f3f5f48df60b817bde2e8ea2cbff262af393b
---
M composer.lock
M
extensions/Wikibase/client/includes/Hooks/ChangesListSpecialPageHookHandlers.php
M extensions/Wikibase/client/includes/RecentChanges/RecentChangeFactory.php
M
extensions/Wikibase/client/tests/phpunit/includes/RecentChanges/RecentChangeFactoryTest.php
M vendor/composer/installed.json
5 files changed, 12 insertions(+), 10 deletions(-)
Approvals:
Hashar: Looks good to me, approved
Addshore: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/composer.lock b/composer.lock
index 1975024..e126e70 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1460,12 +1460,12 @@
"source": {
"type": "git",
"url":
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";,
- "reference": "32d61eaad2d7a84dd3c6a004e1144e59bb613c85"
+ "reference": "6fca0471cdefe651d97f11ce773c53d8751a5662"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/32d61eaad2d7a84dd3c6a004e1144e59bb613c85";,
- "reference": "32d61eaad2d7a84dd3c6a004e1144e59bb613c85",
+ "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/6fca0471cdefe651d97f11ce773c53d8751a5662";,
+ "reference": "6fca0471cdefe651d97f11ce773c53d8751a5662",
"shasum": ""
},
"require": {
@@ -1539,7 +1539,7 @@
"wikibaserepo",
"wikidata"
],
- "time": "2016-09-08 22:57:05"
+ "time": "2016-09-19 16:26:46"
},
{
"name": "wikibase/wikimedia-badges",
diff --git
a/extensions/Wikibase/client/includes/Hooks/ChangesListSpecialPageHookHandlers.php
b/extensions/Wikibase/client/includes/Hooks/ChangesListSpecialPageHookHandlers.php
index ab0a78d..776b1fc 100644
---
a/extensions/Wikibase/client/includes/Hooks/ChangesListSpecialPageHookHandlers.php
+++
b/extensions/Wikibase/client/includes/Hooks/ChangesListSpecialPageHookHandlers.php
@@ -6,7 +6,7 @@
use FormOptions;
use IContextSource;
use LoadBalancer;
-use LBFactory;
+use MediaWiki\MediaWikiServices;
use RequestContext;
use User;
use WebRequest;
@@ -90,7 +90,7 @@
return new self(
$context->getRequest(),
$context->getUser(),
- LBFactory::singleton()->getMainLB(),
+ MediaWikiServices::getInstance()->getDBLoadBalancer(),
$specialPageName,
$settings->getSetting( 'showExternalRecentChanges' )
);
diff --git
a/extensions/Wikibase/client/includes/RecentChanges/RecentChangeFactory.php
b/extensions/Wikibase/client/includes/RecentChanges/RecentChangeFactory.php
index 2cbd164..316c645 100644
--- a/extensions/Wikibase/client/includes/RecentChanges/RecentChangeFactory.php
+++ b/extensions/Wikibase/client/includes/RecentChanges/RecentChangeFactory.php
@@ -133,6 +133,7 @@
'rc_log_action' => '',
'rc_source' => self::SRC_WIKIBASE,
'rc_deleted' => false,
+ 'rc_new' => false,
);
}
diff --git
a/extensions/Wikibase/client/tests/phpunit/includes/RecentChanges/RecentChangeFactoryTest.php
b/extensions/Wikibase/client/tests/phpunit/includes/RecentChanges/RecentChangeFactoryTest.php
index a3d3ca4..affc9f9 100644
---
a/extensions/Wikibase/client/tests/phpunit/includes/RecentChanges/RecentChangeFactoryTest.php
+++
b/extensions/Wikibase/client/tests/phpunit/includes/RecentChanges/RecentChangeFactoryTest.php
@@ -165,6 +165,7 @@
'rc_log_type' => null,
'rc_source' => RecentChangeFactory::SRC_WIKIBASE,
'rc_deleted' => false,
+ 'rc_new' => false,
);
$preparedAttr = array(
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index 6748705..733e9fb 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -1613,12 +1613,12 @@
"source": {
"type": "git",
"url":
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";,
- "reference": "32d61eaad2d7a84dd3c6a004e1144e59bb613c85"
+ "reference": "6fca0471cdefe651d97f11ce773c53d8751a5662"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/32d61eaad2d7a84dd3c6a004e1144e59bb613c85";,
- "reference": "32d61eaad2d7a84dd3c6a004e1144e59bb613c85",
+ "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/6fca0471cdefe651d97f11ce773c53d8751a5662";,
+ "reference": "6fca0471cdefe651d97f11ce773c53d8751a5662",
"shasum": ""
},
"require": {
@@ -1651,7 +1651,7 @@
"jakub-onderka/php-parallel-lint": "0.9.2",
"mediawiki/mediawiki-codesniffer": "0.4.0|0.5.0"
},
- "time": "2016-09-08 22:57:05",
+ "time": "2016-09-19 16:26:46",
"type": "mediawiki-extension",
"installation-source": "dist",
"autoload": {
--
To view, visit https://gerrit.wikimedia.org/r/311453
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I160f3f5f48df60b817bde2e8ea2cbff262af393b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikidata
Gerrit-Branch: wmf/1.28.0-wmf.18
Gerrit-Owner: Aude <aude.w...@gmail.com>
Gerrit-Reviewer: Addshore <addshorew...@gmail.com>
Gerrit-Reviewer: Hashar <has...@free.fr>
Gerrit-Reviewer: Tobias Gritschacher <tobias.gritschac...@wikimedia.de>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
