jenkins-bot has submitted this change and it was merged.
Change subject: Update Wikidata, fix noexternallanglinks
......................................................................
Update Wikidata, fix noexternallanglinks
Change-Id: I798e3b4c83630156226c96e725ff89689d0d66c0
---
M composer.lock
M extensions/Wikibase/client/includes/parserhooks/NoLangLinkHandler.php
D
extensions/Wikibase/client/tests/phpunit/includes/hooks/NoLangLinkHandlerTest.php
M vendor/composer/autoload_classmap.php
M vendor/composer/installed.json
5 files changed, 19 insertions(+), 95 deletions(-)
Approvals:
Aude: Looks good to me, approved
jenkins-bot: Verified
diff --git a/composer.lock b/composer.lock
index e4f02f0..13f98f2 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1230,12 +1230,12 @@
"source": {
"type": "git",
"url":
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";,
- "reference": "5f7bb00d24bbdc8980b36985bed443ed5f1e8188"
+ "reference": "9979bb324a882c64b6b00cea638ed94271ca9ece"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/5f7bb00d24bbdc8980b36985bed443ed5f1e8188";,
- "reference": "5f7bb00d24bbdc8980b36985bed443ed5f1e8188",
+ "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/9979bb324a882c64b6b00cea638ed94271ca9ece";,
+ "reference": "9979bb324a882c64b6b00cea638ed94271ca9ece",
"shasum": ""
},
"require": {
@@ -1302,7 +1302,7 @@
"wikibaserepo",
"wikidata"
],
- "time": "2015-01-14 18:11:06"
+ "time": "2015-01-15 09:32:07"
},
{
"name": "wikibase/wikimedia-badges",
diff --git
a/extensions/Wikibase/client/includes/parserhooks/NoLangLinkHandler.php
b/extensions/Wikibase/client/includes/parserhooks/NoLangLinkHandler.php
index ef5e1bc..71619dd 100644
--- a/extensions/Wikibase/client/includes/parserhooks/NoLangLinkHandler.php
+++ b/extensions/Wikibase/client/includes/parserhooks/NoLangLinkHandler.php
@@ -19,41 +19,6 @@
class NoLangLinkHandler {
/**
- * @var NamespaceChecker
- */
- private $namespaceChecker;
-
- /**
- * Parser function
- *
- * @since 0.4
- *
- * @param \Parser &$parser
- *
- * @return string
- */
- public static function handle( &$parser ) {
- $handler = self::newFromGlobalState();
- $handler->doHandle( $parser );
- }
-
- private static function newFromGlobalState() {
- $wikibaseClient = WikibaseClient::getDefaultInstance();
- $settings = $wikibaseClient->getSettings();
-
- $namespaceChecker = new NamespaceChecker(
- $settings->getSetting( 'excludeNamespaces' ),
- $settings->getSetting( 'namespaces' )
- );
-
- return new NoLangLinkHandler( $namespaceChecker );
- }
-
- public function __construct( NamespaceChecker $namespaceChecker ) {
- $this->namespaceChecker = $namespaceChecker;
- }
-
- /**
* Get the noexternallanglinks page property from the ParserOutput,
* which is set by the {{#noexternallanglinks}} parser function.
*
@@ -84,15 +49,22 @@
/**
* Parser function
*
- * @since 0.5
+ * @since 0.4
*
* @param \Parser &$parser
*
* @return string
*/
- public function doHandle( &$parser ) {
+ public static function handle( &$parser ) {
+ $wikibaseClient = WikibaseClient::getDefaultInstance();
+ $settings = $wikibaseClient->getSettings();
- if ( !$this->namespaceChecker->isWikibaseEnabled(
$parser->getTitle()->getNamespace() ) ) {
+ $namespaceChecker = new NamespaceChecker(
+ $settings->getSetting( 'excludeNamespaces' ),
+ $settings->getSetting( 'namespaces' )
+ );
+
+ if ( !$namespaceChecker->isWikibaseEnabled(
$parser->getTitle()->getNamespace() ) ) {
// shorten out
return '';
}
@@ -104,7 +76,7 @@
$output = $parser->getOutput();
$nel = array_merge( self::getNoExternalLangLinks( $output ),
$langs );
- $this->setNoExternalLangLinks( $output, $nel );
+ self::setNoExternalLangLinks( $output, $nel );
return '';
}
diff --git
a/extensions/Wikibase/client/tests/phpunit/includes/hooks/NoLangLinkHandlerTest.php
b/extensions/Wikibase/client/tests/phpunit/includes/hooks/NoLangLinkHandlerTest.php
deleted file mode 100644
index 973fa94..0000000
---
a/extensions/Wikibase/client/tests/phpunit/includes/hooks/NoLangLinkHandlerTest.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-
-namespace Wikibase\Client\Tests\Hooks;
-
-use Parser;
-use ParserOptions;
-use ParserOutput;
-use Wikibase\NamespaceChecker;
-use Wikibase\NoLangLinkHandler;
-
-/**
- * @covers Wikibase\NoLangLinkHandler
- *
- * @group WikibaseClient
- * @group HookHandler
- * @group Wikibase
- *
- * @licence GNU GPL v2+
- * @author Daniel Kinzler
- */
-class NoLangLinkHandlerTest extends \PHPUnit_Framework_TestCase {
-
- public function testGetSetNoExternalLangLinks() {
- $pout = new ParserOutput();
- $list = array( 'xy', 'abc' );
-
- NoLangLinkHandler::setNoExternalLangLinks( $pout, $list );
- $actual = NoLangLinkHandler::getNoExternalLangLinks( $pout );
-
- $this->assertEquals( $list, $actual );
- }
-
- public function testDoHandle() {
- $handler = new NoLangLinkHandler( new NamespaceChecker(
array(), array() ) );
- $parser = new Parser();
- $parser->startExternalParse( null, new ParserOptions(),
Parser::OT_HTML );
-
- $handler->doHandle( $parser, 'en', 'fr' );
- $actual = NoLangLinkHandler::getNoExternalLangLinks(
$parser->getOutput() );
- $this->assertEquals( array( 'en', 'fr' ), $actual );
-
- $handler->doHandle( $parser, '*', 'zh' );
- $actual = NoLangLinkHandler::getNoExternalLangLinks(
$parser->getOutput() );
- $this->assertEquals( array( 'en', 'fr', '*', 'zh' ), $actual );
- }
-
-}
diff --git a/vendor/composer/autoload_classmap.php
b/vendor/composer/autoload_classmap.php
index 61a2a08..e738f3f 100644
--- a/vendor/composer/autoload_classmap.php
+++ b/vendor/composer/autoload_classmap.php
@@ -365,7 +365,6 @@
'Wikibase\\Client\\Tests\\Hooks\\InfoActionHookHandlerTest' => $baseDir .
'/extensions/Wikibase/client/tests/phpunit/includes/hooks/InfoActionHookHandlerTest.php',
'Wikibase\\Client\\Tests\\Hooks\\LanguageLinkBadgeDisplayTest' => $baseDir
.
'/extensions/Wikibase/client/tests/phpunit/includes/hooks/LanguageLinkBadgeDisplayTest.php',
'Wikibase\\Client\\Tests\\Hooks\\MovePageNoticeCreatorTest' => $baseDir .
'/extensions/Wikibase/client/tests/phpunit/includes/hooks/MovePageNoticeCreatorTest.php',
- 'Wikibase\\Client\\Tests\\Hooks\\NoLangLinkHandlerTest' => $baseDir .
'/extensions/Wikibase/client/tests/phpunit/includes/hooks/NoLangLinkHandlerTest.php',
'Wikibase\\Client\\Tests\\Hooks\\ParserFunctionRegistrantTest' => $baseDir
.
'/extensions/Wikibase/client/tests/phpunit/includes/hooks/ParserFunctionRegistrantTest.php',
'Wikibase\\Client\\Tests\\Hooks\\SpecialWatchlistQueryHandlerTest' =>
$baseDir .
'/extensions/Wikibase/client/tests/phpunit/includes/hooks/SpecialWatchlistQueryHandlerTest.php',
'Wikibase\\Client\\Tests\\InterwikiSorterTest' => $baseDir .
'/extensions/Wikibase/client/tests/phpunit/includes/InterwikiSorterTest.php',
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index 5950760..6d5a010 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -1322,12 +1322,12 @@
"source": {
"type": "git",
"url":
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";,
- "reference": "5f7bb00d24bbdc8980b36985bed443ed5f1e8188"
+ "reference": "9979bb324a882c64b6b00cea638ed94271ca9ece"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/5f7bb00d24bbdc8980b36985bed443ed5f1e8188";,
- "reference": "5f7bb00d24bbdc8980b36985bed443ed5f1e8188",
+ "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/9979bb324a882c64b6b00cea638ed94271ca9ece";,
+ "reference": "9979bb324a882c64b6b00cea638ed94271ca9ece",
"shasum": ""
},
"require": {
@@ -1355,7 +1355,7 @@
"conflict": {
"mediawiki/mediawiki": "<1.23"
},
- "time": "2015-01-14 18:11:06",
+ "time": "2015-01-15 09:32:07",
"type": "mediawiki-extension",
"installation-source": "dist",
"autoload": {
--
To view, visit https://gerrit.wikimedia.org/r/185141
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I798e3b4c83630156226c96e725ff89689d0d66c0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikidata
Gerrit-Branch: wmf/1.25wmf14
Gerrit-Owner: Aude <[email protected]>
Gerrit-Reviewer: Addshore <[email protected]>
Gerrit-Reviewer: Aude <[email protected]>
Gerrit-Reviewer: Tobias Gritschacher <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
