Aude has uploaded a new change for review.
https://gerrit.wikimedia.org/r/165786
Change subject: Update Wikidata, fix for dumpJson and ParserAfterParse handler
......................................................................
Update Wikidata, fix for dumpJson and ParserAfterParse handler
Change-Id: I494036c2b262797c550f9f306ea900c01fedfde7
---
M WikibaseClient.settings.php
M WikibaseRepo.settings.php
M composer.lock
M extensions/Wikibase/client/includes/hooks/SidebarHookHandlers.php
M
extensions/Wikibase/client/tests/phpunit/includes/hooks/SidebarHookHandlersTest.php
M extensions/Wikibase/repo/maintenance/dumpJson.php
M vendor/composer/installed.json
7 files changed, 27 insertions(+), 14 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikidata
refs/changes/86/165786/1
diff --git a/WikibaseClient.settings.php b/WikibaseClient.settings.php
index bd19710..4ef960e 100644
--- a/WikibaseClient.settings.php
+++ b/WikibaseClient.settings.php
@@ -1,2 +1,2 @@
<?php
-$wgWBClientSettings["sharedCacheKeyPrefix"] = "wikibase:WBL/1412727056";
\ No newline at end of file
+$wgWBClientSettings["sharedCacheKeyPrefix"] = "wikibase:WBL/1412881061";
\ No newline at end of file
diff --git a/WikibaseRepo.settings.php b/WikibaseRepo.settings.php
index 4e8e94c..bb05f0f 100644
--- a/WikibaseRepo.settings.php
+++ b/WikibaseRepo.settings.php
@@ -1,2 +1,2 @@
<?php
-$wgWBRepoSettings["sharedCacheKeyPrefix"] = "wikibase:WBL/1412727056";
\ No newline at end of file
+$wgWBRepoSettings["sharedCacheKeyPrefix"] = "wikibase:WBL/1412881061";
\ No newline at end of file
diff --git a/composer.lock b/composer.lock
index a5b6b2d..33a4f57 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1191,7 +1191,7 @@
"source": {
"type": "git",
"url":
"https://git.wikimedia.org/git/mediawiki/extensions/Wikibase.git";,
- "reference": "0735940a9476513e2332247555952eae663b1561"
+ "reference": "a427cbc56ca7c06e36900297f6393f76d6f00374"
},
"require": {
"data-values/common": "~0.2.0",
@@ -1262,7 +1262,7 @@
"issues": "https://bugzilla.wikimedia.org/";,
"irc": "irc://irc.freenode.net/wikidata"
},
- "time": "2014-10-07 23:46:14"
+ "time": "2014-10-09 18:34:12"
},
{
"name": "wikibase/wikimedia-badges",
diff --git a/extensions/Wikibase/client/includes/hooks/SidebarHookHandlers.php
b/extensions/Wikibase/client/includes/hooks/SidebarHookHandlers.php
index 95e2b74..94127d0 100644
--- a/extensions/Wikibase/client/includes/hooks/SidebarHookHandlers.php
+++ b/extensions/Wikibase/client/includes/hooks/SidebarHookHandlers.php
@@ -114,13 +114,13 @@
/**
* Static handler for the ParserAfterParse hook.
*
- * @param Parser &$parser
- * @param string &$text
- * @param StripState $stripState
+ * @param Parser|null &$parser
+ * @param string|null &$text Unused.
+ * @param StripState|null $stripState Unused.
*
* @return bool
*/
- public static function onParserAfterParse( Parser &$parser, &$text,
StripState $stripState ) {
+ public static function onParserAfterParse( Parser &$parser = null,
&$text = null, StripState $stripState = null ) {
// this hook tries to access repo SiteLinkTable
// it interferes with any test that parses something, like a
page or a message
if ( defined( 'MW_PHPUNIT_TEST' ) ) {
@@ -197,13 +197,17 @@
* Hook runs after internal parsing
* @see https://www.mediawiki.org/wiki/Manual:Hooks/ParserAfterParse
*
- * @param Parser &$parser
- * @param string &$text
- * @param StripState $stripState
+ * @param Parser|null &$parser
+ * @param string|null &$text Unused.
+ * @param StripState|null $stripState Unused.
*
* @return bool
*/
- public function doParserAfterParse( Parser &$parser, &$text, StripState
$stripState ) {
+ public function doParserAfterParse( Parser &$parser = null, &$text =
null, StripState $stripState = null ) {
+ if ( $parser === null ) {
+ return true;
+ }
+
$title = $parser->getTitle();
if ( !$this->namespaceChecker->isWikibaseEnabled(
$title->getNamespace() ) ) {
diff --git
a/extensions/Wikibase/client/tests/phpunit/includes/hooks/SidebarHookHandlersTest.php
b/extensions/Wikibase/client/tests/phpunit/includes/hooks/SidebarHookHandlersTest.php
index 4a7df35..5ae65d6 100644
---
a/extensions/Wikibase/client/tests/phpunit/includes/hooks/SidebarHookHandlersTest.php
+++
b/extensions/Wikibase/client/tests/phpunit/includes/hooks/SidebarHookHandlersTest.php
@@ -18,6 +18,7 @@
use Wikibase\Client\Hooks\LanguageLinkBadgeDisplay;
use Wikibase\Client\Hooks\OtherProjectsSidebarGenerator;
use Wikibase\Client\Hooks\SidebarHookHandlers;
+use Wikibase\Client\WikibaseClient;
use Wikibase\DataModel\Entity\Item;
use Wikibase\DataModel\Entity\ItemId;
use Wikibase\DataModel\SiteLink;
@@ -354,6 +355,13 @@
}
}
+ /**
+ * @see https://bugzilla.wikimedia.org/show_bug.cgi?id=71772
+ */
+ public function testOnParserAfterParse_withoutParameters() {
+ $this->assertTrue( SidebarHookHandlers::onParserAfterParse() );
+ }
+
public function testDoOutputPageParserOutput() {
$title = Title::makeTitle( NS_MAIN, 'Oxygen' );
diff --git a/extensions/Wikibase/repo/maintenance/dumpJson.php
b/extensions/Wikibase/repo/maintenance/dumpJson.php
index 3ef1ff9..3e00b25 100644
--- a/extensions/Wikibase/repo/maintenance/dumpJson.php
+++ b/extensions/Wikibase/repo/maintenance/dumpJson.php
@@ -15,6 +15,7 @@
use Wikibase\Lib\Serializers\Serializer;
use Wikibase\Lib\Serializers\SerializerFactory;
use Wikibase\Lib\Store\EntityLookup;
+use Wikibase\Repo\Store\SQL\EntityPerPageIdPager;
use Wikibase\Repo\IO\EntityIdReader;
use Wikibase\Repo\IO\LineReader;
use Wikibase\Repo\Store\EntityIdPager;
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index 566a0d7..b1d494d 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -1281,7 +1281,7 @@
"source": {
"type": "git",
"url":
"https://git.wikimedia.org/git/mediawiki/extensions/Wikibase.git";,
- "reference": "0735940a9476513e2332247555952eae663b1561"
+ "reference": "a427cbc56ca7c06e36900297f6393f76d6f00374"
},
"require": {
"data-values/common": "~0.2.0",
@@ -1307,7 +1307,7 @@
"conflict": {
"mediawiki/mediawiki": "<1.23"
},
- "time": "2014-10-07 14:32:41",
+ "time": "2014-10-09 18:24:20",
"type": "mediawiki-extension",
"installation-source": "source",
"autoload": {
--
To view, visit https://gerrit.wikimedia.org/r/165786
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I494036c2b262797c550f9f306ea900c01fedfde7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikidata
Gerrit-Branch: wmf/1.25wmf1
Gerrit-Owner: Aude <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
