WikidataBuilder has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/331961 )
Change subject: New Wikidata Build - 2017-01-13T10:00:01+0000
......................................................................
New Wikidata Build - 2017-01-13T10:00:01+0000
Change-Id: I96b20efb9651c393b3ee3406e8913f29fac39846
---
M composer.lock
M extensions/Wikibase/repo/Wikibase.php
M extensions/Wikibase/repo/includes/Specials/SpecialItemDisambiguation.php
M vendor/composer/installed.json
4 files changed, 21 insertions(+), 24 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikidata
refs/changes/61/331961/1
diff --git a/composer.lock b/composer.lock
index a525a08..cb78ea3 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1606,12 +1606,12 @@
"source": {
"type": "git",
"url":
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";,
- "reference": "471e01075914fc54998b668e7c3f366a3a46771f"
+ "reference": "1b3dcf8d1315722793a0354e00e636dcad2b6a4c"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/471e01075914fc54998b668e7c3f366a3a46771f";,
- "reference": "471e01075914fc54998b668e7c3f366a3a46771f",
+ "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/1b3dcf8d1315722793a0354e00e636dcad2b6a4c";,
+ "reference": "1b3dcf8d1315722793a0354e00e636dcad2b6a4c",
"shasum": ""
},
"require": {
@@ -1686,7 +1686,7 @@
"wikibaserepo",
"wikidata"
],
- "time": "2017-01-11 22:21:35"
+ "time": "2017-01-12 14:42:28"
},
{
"name": "wikibase/wikimedia-badges",
diff --git a/extensions/Wikibase/repo/Wikibase.php
b/extensions/Wikibase/repo/Wikibase.php
index 32183c7..47039a3 100644
--- a/extensions/Wikibase/repo/Wikibase.php
+++ b/extensions/Wikibase/repo/Wikibase.php
@@ -252,22 +252,19 @@
};
$wgSpecialPages['ItemDisambiguation'] = function() {
global $wgLang;
- $langCode = $wgLang->getCode();
- $wikibaseRepo =
\Wikibase\Repo\WikibaseRepo::getDefaultInstance();
- $languageNameLookup = new \Wikibase\Lib\LanguageNameLookup(
$langCode );
- $itemDisambiguation = new \Wikibase\ItemDisambiguation(
+ $languageCode = $wgLang->getCode();
+ $wikibaseRepo =
Wikibase\Repo\WikibaseRepo::getDefaultInstance();
+ $languageNameLookup = new Wikibase\Lib\LanguageNameLookup(
$languageCode );
+ $itemDisambiguation = new Wikibase\ItemDisambiguation(
$wikibaseRepo->getEntityTitleLookup(),
$languageNameLookup,
- $langCode
- );
- $searchInteractor = $wikibaseRepo->newTermSearchInteractor(
- $langCode
+ $languageCode
);
return new Wikibase\Repo\Specials\SpecialItemDisambiguation(
- new \Wikibase\Lib\MediaWikiContentLanguages(),
+ new Wikibase\Lib\MediaWikiContentLanguages(),
$languageNameLookup,
$itemDisambiguation,
- $searchInteractor
+ $wikibaseRepo->newTermSearchInteractor( $languageCode )
);
};
$wgSpecialPages['ItemsWithoutSitelinks']
diff --git
a/extensions/Wikibase/repo/includes/Specials/SpecialItemDisambiguation.php
b/extensions/Wikibase/repo/includes/Specials/SpecialItemDisambiguation.php
index 9dfbe87..d790ca2 100644
--- a/extensions/Wikibase/repo/includes/Specials/SpecialItemDisambiguation.php
+++ b/extensions/Wikibase/repo/includes/Specials/SpecialItemDisambiguation.php
@@ -53,10 +53,10 @@
private $limit;
/**
- * @param ItemDisambiguation $itemDisambiguation
- * @param TermIndexSearchInteractor $searchInteractor
* @param ContentLanguages $contentLanguages
* @param LanguageNameLookup $languageNameLookup
+ * @param ItemDisambiguation $itemDisambiguation
+ * @param TermIndexSearchInteractor $searchInteractor
* @param int $limit
*/
public function __construct(
@@ -86,7 +86,7 @@
parent::execute( $subPage );
$request = $this->getRequest();
- $subPageParts = $subPage === '' ? array() : explode( '/',
$subPage, 2 );
+ $subPageParts = $subPage === '' ? [] : explode( '/', $subPage,
2 );
$languageCode = $this->extractLanguageCode( $request,
$subPageParts );
$label = $this->extractLabel( $request, $subPageParts );
@@ -175,7 +175,7 @@
$label,
$languageCode,
'item',
- array( TermIndexEntry::TYPE_LABEL,
TermIndexEntry::TYPE_ALIAS )
+ [ TermIndexEntry::TYPE_LABEL,
TermIndexEntry::TYPE_ALIAS ]
);
}
@@ -192,12 +192,12 @@
$searchLink = $this->getTitleFor( 'Search' );
$this->getOutput()->addWikiMsg(
'wikibase-itemdisambiguation-search',
- $searchLink->getFullURL( array( 'search' =>
$label ) )
+ $searchLink->getFullURL( [ 'search' => $label ]
)
);
$createLink = $this->getTitleFor( 'NewItem' );
$this->getOutput()->addWikiMsg(
'wikibase-itemdisambiguation-create',
- $createLink->getFullURL( array( 'label' =>
$label ) )
+ $createLink->getFullURL( [ 'label' => $label ] )
);
}
}
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index 988eba8..e04d415 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -1409,12 +1409,12 @@
"source": {
"type": "git",
"url":
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";,
- "reference": "471e01075914fc54998b668e7c3f366a3a46771f"
+ "reference": "1b3dcf8d1315722793a0354e00e636dcad2b6a4c"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/471e01075914fc54998b668e7c3f366a3a46771f";,
- "reference": "471e01075914fc54998b668e7c3f366a3a46771f",
+ "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/1b3dcf8d1315722793a0354e00e636dcad2b6a4c";,
+ "reference": "1b3dcf8d1315722793a0354e00e636dcad2b6a4c",
"shasum": ""
},
"require": {
@@ -1447,7 +1447,7 @@
"jakub-onderka/php-parallel-lint": "0.9.2",
"mediawiki/mediawiki-codesniffer": "0.4.0|0.5.0"
},
- "time": "2017-01-11 22:21:35",
+ "time": "2017-01-12 14:42:28",
"type": "mediawiki-extension",
"installation-source": "dist",
"autoload": {
--
To view, visit https://gerrit.wikimedia.org/r/331961
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I96b20efb9651c393b3ee3406e8913f29fac39846
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikidata
Gerrit-Branch: master
Gerrit-Owner: WikidataBuilder <wikidata-servi...@wikimedia.de>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
