jenkins-bot has submitted this change and it was merged.
Change subject: New Wikidata Build - 2016-02-06T10:00:01+0000
......................................................................
New Wikidata Build - 2016-02-06T10:00:01+0000
Change-Id: I87921fb6cefc0ed822a5a93d2887491f74d4e7ef
---
M composer.lock
M extensions/ArticlePlaceholder/Specials/SpecialAboutTopic.php
M extensions/ArticlePlaceholder/i18n/en.json
M extensions/Wikibase/client/i18n/jam.json
M extensions/Wikibase/client/i18n/ka.json
M extensions/Wikibase/client/i18n/ps.json
M
extensions/Wikibase/client/includes/DataAccess/PropertyParserFunction/Runner.php
M extensions/Wikibase/client/includes/Hooks/DeletePageNoticeCreator.php
M extensions/Wikibase/client/includes/Hooks/InfoActionHookHandler.php
M extensions/Wikibase/client/includes/Hooks/MovePageNotice.php
M extensions/Wikibase/client/includes/Hooks/OtherProjectsSidebarGenerator.php
M extensions/Wikibase/client/includes/LangLinkHandler.php
M
extensions/Wikibase/client/includes/ParserOutput/ClientParserOutputDataUpdater.php
M extensions/Wikibase/client/includes/SiteLinkCommentCreator.php
M extensions/Wikibase/client/includes/UpdateRepo/UpdateRepo.php
M extensions/Wikibase/client/includes/specials/SpecialPagesWithBadges.php
M extensions/Wikibase/client/includes/specials/SpecialUnconnectedPages.php
M extensions/Wikibase/client/includes/store/AddUsagesForPageJob.php
M
extensions/Wikibase/client/tests/phpunit/includes/Changes/ChangeHandlerTest.php
M
extensions/Wikibase/client/tests/phpunit/includes/Hooks/InfoActionHookHandlerTest.php
M
extensions/Wikibase/client/tests/phpunit/includes/SiteLinkCommentCreatorTest.php
M
extensions/Wikibase/client/tests/phpunit/includes/Usage/UsageTrackingIntegrationTest.php
M
extensions/Wikibase/client/tests/phpunit/includes/recentchanges/RecentChangeFactoryTest.php
M extensions/Wikibase/docs/ontology.owl
M extensions/Wikibase/lib/i18n/hu.json
M extensions/Wikibase/lib/i18n/ps.json
M extensions/Wikibase/lib/includes/MediaWikiContentLanguages.php
M extensions/Wikibase/lib/includes/StaticContentLanguages.php
M extensions/Wikibase/lib/includes/UnionContentLanguages.php
M extensions/Wikibase/phpcs.xml
M extensions/Wikibase/repo/i18n/cs.json
M extensions/Wikibase/repo/i18n/de.json
M extensions/Wikibase/repo/i18n/gl.json
M extensions/Wikibase/repo/i18n/hu.json
M extensions/Wikibase/repo/i18n/ja.json
M extensions/Wikibase/repo/i18n/ka.json
M extensions/Wikibase/repo/i18n/ps.json
M extensions/Wikibase/repo/includes/api/EditEntity.php
M extensions/Wikibase/repo/includes/api/GetClaims.php
M extensions/Wikibase/repo/includes/api/ResultBuilder.php
M extensions/Wikibase/repo/tests/phpunit/includes/api/ResultBuilderTest.php
M extensions/Wikibase/repo/tests/phpunit/includes/api/SetClaimValueTest.php
M extensions/Wikibase/view/resources.php
M extensions/Wikibase/view/resources.test.php
M extensions/Wikibase/view/resources/jquery/wikibase/snakview/snakview.js
M extensions/Wikibase/view/resources/resources.php
M extensions/Wikibase/view/resources/wikibase/entityChangers/resources.php
M extensions/Wikibase/view/resources/wikibase/entityIdFormatter/resources.php
M extensions/Wikibase/view/resources/wikibase/view/resources.php
M extensions/Wikibase/view/src/EmptyEditSectionGenerator.php
M extensions/Wikibase/view/src/EntityIdFormatterFactory.php
M extensions/Wikibase/view/src/HtmlSnakFormatterFactory.php
M extensions/Wikibase/view/src/SpecialPageLinker.php
M extensions/Wikibase/view/src/Template/TemplateFactory.php
M extensions/Wikibase/view/tests/qunit/jquery/resources.php
M extensions/Wikibase/view/tests/qunit/resources.php
M extensions/Wikibase/view/tests/qunit/wikibase/entityChangers/resources.php
M extensions/Wikibase/view/tests/qunit/wikibase/entityIdFormatter/resources.php
M extensions/Wikibase/view/tests/qunit/wikibase/utilities/resources.php
M extensions/Wikibase/view/tests/qunit/wikibase/view/resources.php
M vendor/composer/installed.json
61 files changed, 190 insertions(+), 107 deletions(-)
Approvals:
JanZerebecki: Looks good to me, approved
jenkins-bot: Verified
diff --git a/composer.lock b/composer.lock
index e9687ca..20ef94b 100644
--- a/composer.lock
+++ b/composer.lock
@@ -777,12 +777,12 @@
"source": {
"type": "git",
"url":
"https://github.com/wikimedia/mediawiki-extensions-ArticlePlaceholder.git";,
- "reference": "a704bce577caff9b6a62a20f8ae2be0ea6b48b8e"
+ "reference": "922c260fd2fb74bbfedbcef2001b0745cb32859f"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-ArticlePlaceholder/zipball/a704bce577caff9b6a62a20f8ae2be0ea6b48b8e";,
- "reference": "a704bce577caff9b6a62a20f8ae2be0ea6b48b8e",
+ "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-ArticlePlaceholder/zipball/922c260fd2fb74bbfedbcef2001b0745cb32859f";,
+ "reference": "922c260fd2fb74bbfedbcef2001b0745cb32859f",
"shasum": ""
},
"require-dev": {
@@ -801,7 +801,7 @@
],
"description": "Provides a special page with Wikibase information
about a certain topic, with invitation to create an article for the topic",
"homepage":
"https://www.mediawiki.org/wiki/Extension:ArticlePlaceholder";,
- "time": "2016-01-28 20:06:55"
+ "time": "2016-02-05 11:13:55"
},
{
"name": "propertysuggester/property-suggester",
@@ -1481,12 +1481,12 @@
"source": {
"type": "git",
"url":
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";,
- "reference": "47be3f6446d4dcb1d4304b99569c1c42e2a79347"
+ "reference": "4072055fbaab63af0ea10306821b4782af5994bd"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/47be3f6446d4dcb1d4304b99569c1c42e2a79347";,
- "reference": "47be3f6446d4dcb1d4304b99569c1c42e2a79347",
+ "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/4072055fbaab63af0ea10306821b4782af5994bd";,
+ "reference": "4072055fbaab63af0ea10306821b4782af5994bd",
"shasum": ""
},
"require": {
@@ -1558,7 +1558,7 @@
"wikibaserepo",
"wikidata"
],
- "time": "2016-02-05 09:31:01"
+ "time": "2016-02-05 20:55:08"
},
{
"name": "wikibase/wikimedia-badges",
diff --git a/extensions/ArticlePlaceholder/Specials/SpecialAboutTopic.php
b/extensions/ArticlePlaceholder/Specials/SpecialAboutTopic.php
index 4503fc3..cc93f3e 100644
--- a/extensions/ArticlePlaceholder/Specials/SpecialAboutTopic.php
+++ b/extensions/ArticlePlaceholder/Specials/SpecialAboutTopic.php
@@ -97,15 +97,15 @@
}
/**
- * @param string $sub
+ * @param string|null $sub
*/
public function execute( $sub ) {
- $this->getOutput()->setPageTitle( $this->msg(
'articleplaceholder-abouttopic' )->escaped() );
+ $this->setHeaders();
$this->showContent( $sub );
}
/**
- * @param string $entityIdString
+ * @param string|null $entityIdString
*/
private function showContent( $entityIdString ) {
$entityId = $this->getItemIdParam( 'entityid', $entityIdString
);
@@ -130,6 +130,15 @@
}
}
+ /**
+ * @see SpecialPage::getDescription
+ *
+ * @return string
+ */
+ public function getDescription() {
+ return $this->msg( 'articleplaceholder-abouttopic' )->text();
+ }
+
protected function getGroupName() {
return 'other';
}
diff --git a/extensions/ArticlePlaceholder/i18n/en.json
b/extensions/ArticlePlaceholder/i18n/en.json
index ff5251a..c612e53 100644
--- a/extensions/ArticlePlaceholder/i18n/en.json
+++ b/extensions/ArticlePlaceholder/i18n/en.json
@@ -5,7 +5,7 @@
]
},
"articleplaceholder-desc": "Provides a special page with {{WBREPONAME}}
information about a certain topic, with invitation to create an article for the
topic",
- "articleplaceholder-abouttopic": "About Topic",
+ "articleplaceholder-abouttopic": "About topic",
"articleplaceholder-abouttopic-intro": "This special page generates a
content page about a certain topic with {{WBREPONAME}} information",
"articleplaceholder-abouttopic-entityid": "Enter an entity id to get an
auto-generated article placeholder.",
"articleplaceholder-abouttopic-submit": "craft",
diff --git a/extensions/Wikibase/client/i18n/jam.json
b/extensions/Wikibase/client/i18n/jam.json
index 7992aaa..b6e45db 100644
--- a/extensions/Wikibase/client/i18n/jam.json
+++ b/extensions/Wikibase/client/i18n/jam.json
@@ -9,6 +9,9 @@
"wikibase-dataitem": "{{WBREPONAME}} aitem",
"wikibase-editlinks": "Edit lingk",
"wikibase-editlinkstitle": "Edit intalanguij lingk",
+ "wikibase-rc-hide-wikidata": "$1 {{WBREPONAME}}",
+ "wikibase-rc-hide-wikidata-show": "Shuo",
"wikibase-rc-wikibase-edit-letter": "D",
- "wikibase-rc-wikibase-edit-title": "{{WBREPONAME}} edit"
+ "wikibase-rc-wikibase-edit-title": "{{WBREPONAME}} edit",
+ "wikibase-otherprojects": "Adaels prajek"
}
diff --git a/extensions/Wikibase/client/i18n/ka.json
b/extensions/Wikibase/client/i18n/ka.json
index 919a41a..98b979a 100644
--- a/extensions/Wikibase/client/i18n/ka.json
+++ b/extensions/Wikibase/client/i18n/ka.json
@@ -50,7 +50,7 @@
"wikibase-error-invalid-entity-id": "მითითებული ID სისტემისთვის
უცნობია. გთხოვთ, გამოიყენოთ მოქმედი ID.",
"unconnectedpages": "ელემენტებთან დაუკავშირებელი გვერდები",
"wikibase-unconnectedpages-format-row": "($1 {{PLURAL:$1|interlanguage
link|ენათშორისი ბმული}} გვერდზე)",
- "wikibase-unconnectedpages-submit": "მიდი",
+ "wikibase-unconnectedpages-submit": "გვერდების ჩვენება",
"wikibase-pageinfo-entity-id": "{{grammar:genitive|{{WBREPONAME}}}}
ელემენტის ID",
"wikibase-pageinfo-entity-id-none": "არაფერი",
"wikibase-otherprojects": "სხვა პროექტები",
diff --git a/extensions/Wikibase/client/i18n/ps.json
b/extensions/Wikibase/client/i18n/ps.json
index cb638a1..a89accb 100644
--- a/extensions/Wikibase/client/i18n/ps.json
+++ b/extensions/Wikibase/client/i18n/ps.json
@@ -22,7 +22,7 @@
"wikibase-linkitem-input-site": "ژبه:",
"wikibase-linkitem-input-page": "مخ:",
"wikibase-linkitem-confirmitem-button": "تاييدول",
- "wikibase-rc-hide-wikidata": "$1 {{WBREPONAME}}",
+ "wikibase-rc-hide-wikidata": "{{WBREPONAME}} $1",
"wikibase-rc-hide-wikidata-hide": "پټول",
"wikibase-rc-hide-wikidata-show": "ښکاره کول",
"wikibase-rc-show-wikidata-pref": "په وروستي بدلونونو کې د
{{WBREPONAME}} سمونونه ښکاره کول",
diff --git
a/extensions/Wikibase/client/includes/DataAccess/PropertyParserFunction/Runner.php
b/extensions/Wikibase/client/includes/DataAccess/PropertyParserFunction/Runner.php
index c3ab086..d11b624 100644
---
a/extensions/Wikibase/client/includes/DataAccess/PropertyParserFunction/Runner.php
+++
b/extensions/Wikibase/client/includes/DataAccess/PropertyParserFunction/Runner.php
@@ -124,7 +124,7 @@
$entityId = $this->getEntityIdFromString( $parser,
$from );
} else {
$title = $parser->getTitle();
- $siteLink = new SiteLink( $this->siteId,
$title->getFullText() );
+ $siteLink = new SiteLink( $this->siteId,
$title->getPrefixedText() );
$entityId =
$this->siteLinkLookup->getItemIdForSiteLink( $siteLink );
}
diff --git
a/extensions/Wikibase/client/includes/Hooks/DeletePageNoticeCreator.php
b/extensions/Wikibase/client/includes/Hooks/DeletePageNoticeCreator.php
index 9f7452d..275b335 100644
--- a/extensions/Wikibase/client/includes/Hooks/DeletePageNoticeCreator.php
+++ b/extensions/Wikibase/client/includes/Hooks/DeletePageNoticeCreator.php
@@ -57,7 +57,7 @@
$entityId = $this->siteLinkLookup->getItemIdForSiteLink(
new SiteLink(
$this->siteId,
- $title->getFullText()
+ $title->getPrefixedText()
)
);
diff --git
a/extensions/Wikibase/client/includes/Hooks/InfoActionHookHandler.php
b/extensions/Wikibase/client/includes/Hooks/InfoActionHookHandler.php
index 74296f8..71a7d9c 100644
--- a/extensions/Wikibase/client/includes/Hooks/InfoActionHookHandler.php
+++ b/extensions/Wikibase/client/includes/Hooks/InfoActionHookHandler.php
@@ -71,7 +71,7 @@
*/
private function getPageInfoRow( IContextSource $context, Title $title
) {
$entityId = $this->siteLinkLookup->getItemIdForSiteLink(
- new SiteLink( $this->siteId, $title->getFullText() )
+ new SiteLink( $this->siteId, $title->getPrefixedText() )
);
$row = $entityId ? $this->getItemPageInfo( $context, $entityId )
diff --git a/extensions/Wikibase/client/includes/Hooks/MovePageNotice.php
b/extensions/Wikibase/client/includes/Hooks/MovePageNotice.php
index c5abd36..1155179 100644
--- a/extensions/Wikibase/client/includes/Hooks/MovePageNotice.php
+++ b/extensions/Wikibase/client/includes/Hooks/MovePageNotice.php
@@ -114,7 +114,7 @@
$entityId = $this->siteLinkLookup->getItemIdForSiteLink(
new SiteLink(
$this->siteId,
- $title->getFullText()
+ $title->getPrefixedText()
)
);
diff --git
a/extensions/Wikibase/client/includes/Hooks/OtherProjectsSidebarGenerator.php
b/extensions/Wikibase/client/includes/Hooks/OtherProjectsSidebarGenerator.php
index 285bbb5..d3d221e 100644
---
a/extensions/Wikibase/client/includes/Hooks/OtherProjectsSidebarGenerator.php
+++
b/extensions/Wikibase/client/includes/Hooks/OtherProjectsSidebarGenerator.php
@@ -191,7 +191,7 @@
* @return Item|null
*/
private function getItemId( Title $title ) {
- $siteLink = new SiteLink( $this->localSiteId,
$title->getFullText() );
+ $siteLink = new SiteLink( $this->localSiteId,
$title->getPrefixedText() );
return $this->siteLinkLookup->getItemIdForSiteLink( $siteLink );
}
diff --git a/extensions/Wikibase/client/includes/LangLinkHandler.php
b/extensions/Wikibase/client/includes/LangLinkHandler.php
index 335b0f1..917f241 100644
--- a/extensions/Wikibase/client/includes/LangLinkHandler.php
+++ b/extensions/Wikibase/client/includes/LangLinkHandler.php
@@ -101,7 +101,7 @@
$itemId = $this->siteLinkLookup->getItemIdForLink(
$this->siteId,
- $title->getFullText()
+ $title->getPrefixedText()
);
if ( $itemId !== null ) {
@@ -116,7 +116,7 @@
$links = $this->indexLinksBySiteId( $links );
} else {
wfLogWarning( __METHOD__ . ": Could not load
item " . $itemId->getSerialization()
- . " for " . $title->getFullText() );
+ . " for " . $title->getPrefixedText() );
}
}
diff --git
a/extensions/Wikibase/client/includes/ParserOutput/ClientParserOutputDataUpdater.php
b/extensions/Wikibase/client/includes/ParserOutput/ClientParserOutputDataUpdater.php
index e9fb5e2..9fc8e81 100644
---
a/extensions/Wikibase/client/includes/ParserOutput/ClientParserOutputDataUpdater.php
+++
b/extensions/Wikibase/client/includes/ParserOutput/ClientParserOutputDataUpdater.php
@@ -153,7 +153,7 @@
private function getItemIdForTitle( Title $title ) {
return $this->siteLinkLookup->getItemIdForLink(
$this->siteId,
- $title->getFullText()
+ $title->getPrefixedText()
);
}
diff --git a/extensions/Wikibase/client/includes/SiteLinkCommentCreator.php
b/extensions/Wikibase/client/includes/SiteLinkCommentCreator.php
index 31c4448..75e2c44 100644
--- a/extensions/Wikibase/client/includes/SiteLinkCommentCreator.php
+++ b/extensions/Wikibase/client/includes/SiteLinkCommentCreator.php
@@ -116,8 +116,8 @@
return false;
}
- return $title->getFullText() === $diffOp->getOldValue() ||
- $title->getFullText() === $diffOp->getNewValue();
+ return $title->getPrefixedText() === $diffOp->getOldValue() ||
+ $title->getPrefixedText() === $diffOp->getNewValue();
}
/**
@@ -267,9 +267,9 @@
} elseif ( $diffOp instanceof DiffOpRemove ) {
$params['message'] = 'wikibase-comment-unlink';
} elseif ( $diffOp instanceof DiffOpChange ) {
- if ( $title && $title->getFullText() ===
$diffOp->getOldValue() ) {
+ if ( $title && $title->getPrefixedText() ===
$diffOp->getOldValue() ) {
$params['message'] = 'wikibase-comment-unlink';
- } elseif ( $title && $title->getFullText() ===
$diffOp->getNewValue() ) {
+ } elseif ( $title && $title->getPrefixedText() ===
$diffOp->getNewValue() ) {
$params['message'] = 'wikibase-comment-linked';
} else {
$params['message'] =
'wikibase-comment-sitelink-change';
diff --git a/extensions/Wikibase/client/includes/UpdateRepo/UpdateRepo.php
b/extensions/Wikibase/client/includes/UpdateRepo/UpdateRepo.php
index 0ec1ce6..90e3faf 100644
--- a/extensions/Wikibase/client/includes/UpdateRepo/UpdateRepo.php
+++ b/extensions/Wikibase/client/includes/UpdateRepo/UpdateRepo.php
@@ -88,14 +88,14 @@
$this->entityId =
$this->siteLinkLookup->getItemIdForSiteLink(
new SiteLink(
$this->siteId,
- $this->title->getFullText()
+ $this->title->getPrefixedText()
)
);
if ( $this->entityId === null ) {
wfDebugLog(
'UpdateRepo',
- "Couldn't find an item for
{$this->title->getFullText()}"
+ "Couldn't find an item for
{$this->title->getPrefixedText()}"
);
}
}
diff --git
a/extensions/Wikibase/client/includes/specials/SpecialPagesWithBadges.php
b/extensions/Wikibase/client/includes/specials/SpecialPagesWithBadges.php
index 94838fd..d537aa3 100644
--- a/extensions/Wikibase/client/includes/specials/SpecialPagesWithBadges.php
+++ b/extensions/Wikibase/client/includes/specials/SpecialPagesWithBadges.php
@@ -212,6 +212,7 @@
* @return string
*/
public function formatResult( $skin, $result ) {
+ // FIXME: This should use a TitleFactory.
$title = Title::newFromID( $result->value );
$out = Linker::linkKnown( $title );
diff --git
a/extensions/Wikibase/client/includes/specials/SpecialUnconnectedPages.php
b/extensions/Wikibase/client/includes/specials/SpecialUnconnectedPages.php
index b5ff969..efc0079 100644
--- a/extensions/Wikibase/client/includes/specials/SpecialUnconnectedPages.php
+++ b/extensions/Wikibase/client/includes/specials/SpecialUnconnectedPages.php
@@ -49,7 +49,7 @@
*
* @return bool Always false because we do not want to build RSS/Atom
feeds for this page.
*/
- function isSyndicated() {
+ public function isSyndicated() {
return false;
}
@@ -126,7 +126,7 @@
*
* @return array[]
*/
- function getQueryInfo() {
+ public function getQueryInfo() {
$dbr = wfGetDB( DB_SLAVE );
$conds = $this->buildConditionals( $dbr );
@@ -167,7 +167,7 @@
*
* @return ResultWrapper
*/
- function reallyDoQuery( $limit, $offset = false ) {
+ public function reallyDoQuery( $limit, $offset = false ) {
if ( is_int( $offset ) && $offset > self::MAX_OFFSET ) {
return new FakeResultWrapper( array() );
}
@@ -183,7 +183,8 @@
*
* @return string
*/
- function formatResult( $skin, $result ) {
+ public function formatResult( $skin, $result ) {
+ // FIXME: This should use a TitleFactory.
$title = Title::newFromID( $result->value );
$out = Linker::linkKnown( $title );
diff --git a/extensions/Wikibase/client/includes/store/AddUsagesForPageJob.php
b/extensions/Wikibase/client/includes/store/AddUsagesForPageJob.php
index d52c294..14bc1f0 100644
--- a/extensions/Wikibase/client/includes/store/AddUsagesForPageJob.php
+++ b/extensions/Wikibase/client/includes/store/AddUsagesForPageJob.php
@@ -39,7 +39,7 @@
private $usageUpdater;
/**
- * @var EntityIdParser $idParser
+ * @var EntityIdParser
*/
private $idParser;
diff --git
a/extensions/Wikibase/client/tests/phpunit/includes/Changes/ChangeHandlerTest.php
b/extensions/Wikibase/client/tests/phpunit/includes/Changes/ChangeHandlerTest.php
index 0de6c6e..6eddc94 100644
---
a/extensions/Wikibase/client/tests/phpunit/includes/Changes/ChangeHandlerTest.php
+++
b/extensions/Wikibase/client/tests/phpunit/includes/Changes/ChangeHandlerTest.php
@@ -382,7 +382,7 @@
public function provideHandleChange() {
$changes = TestChanges::getChanges();
- $userEmmy2 = Title::newFromText( 'User:Emmy2' )->getFullText();
+ $userEmmy2 = Title::newFromText( 'User:Emmy2'
)->getPrefixedText();
$empty = array(
'purgeParserCache' => array(),
diff --git
a/extensions/Wikibase/client/tests/phpunit/includes/Hooks/InfoActionHookHandlerTest.php
b/extensions/Wikibase/client/tests/phpunit/includes/Hooks/InfoActionHookHandlerTest.php
index f31a089..b10c8c4 100644
---
a/extensions/Wikibase/client/tests/phpunit/includes/Hooks/InfoActionHookHandlerTest.php
+++
b/extensions/Wikibase/client/tests/phpunit/includes/Hooks/InfoActionHookHandlerTest.php
@@ -130,7 +130,7 @@
->will( $this->returnValue( NS_MAIN ) );
$title->expects( $this->any() )
- ->method( 'getFullText' )
+ ->method( 'getPrefixedText' )
->will( $this->returnValue( 'Cat' ) );
$context = new RequestContext();
diff --git
a/extensions/Wikibase/client/tests/phpunit/includes/SiteLinkCommentCreatorTest.php
b/extensions/Wikibase/client/tests/phpunit/includes/SiteLinkCommentCreatorTest.php
index ef49f1f..10f039b 100644
---
a/extensions/Wikibase/client/tests/phpunit/includes/SiteLinkCommentCreatorTest.php
+++
b/extensions/Wikibase/client/tests/phpunit/includes/SiteLinkCommentCreatorTest.php
@@ -116,7 +116,7 @@
->getMock();
$title->expects( $this->any() )
- ->method( 'getFullText' )
+ ->method( 'getPrefixedText' )
->will( $this->returnValue( $fullText ) );
return $title;
diff --git
a/extensions/Wikibase/client/tests/phpunit/includes/Usage/UsageTrackingIntegrationTest.php
b/extensions/Wikibase/client/tests/phpunit/includes/Usage/UsageTrackingIntegrationTest.php
index c3ee1b8..7f43c7d 100644
---
a/extensions/Wikibase/client/tests/phpunit/includes/Usage/UsageTrackingIntegrationTest.php
+++
b/extensions/Wikibase/client/tests/phpunit/includes/Usage/UsageTrackingIntegrationTest.php
@@ -131,7 +131,7 @@
// Assume the state created by testUpdateUsageOnCreation().
// Change page content to use the template instead of
{{#property}} directly.
$text = "Just some text\n";
- $text .= "using a template: {{" .
$this->templateTitle->getFullText() . "}}\n";
+ $text .= "using a template: {{" .
$this->templateTitle->getPrefixedText() . "}}\n";
$this->updatePage( $this->articleTitle, $text );
// Check that Q22, used via the template, is now tracked.
diff --git
a/extensions/Wikibase/client/tests/phpunit/includes/recentchanges/RecentChangeFactoryTest.php
b/extensions/Wikibase/client/tests/phpunit/includes/recentchanges/RecentChangeFactoryTest.php
index 0796d27..12900e5 100644
---
a/extensions/Wikibase/client/tests/phpunit/includes/recentchanges/RecentChangeFactoryTest.php
+++
b/extensions/Wikibase/client/tests/phpunit/includes/recentchanges/RecentChangeFactoryTest.php
@@ -90,7 +90,7 @@
// XXX: This assumes NS_MAIN. Getting namespace names right
nicely is hard, they depend on the lang.
$title->expects( $this->any() )
- ->method( 'getFullText' )
+ ->method( 'getPrefixedText' )
->will( $this->returnValue( $text ) );
$title->expects( $this->any() )
diff --git a/extensions/Wikibase/docs/ontology.owl
b/extensions/Wikibase/docs/ontology.owl
index 283fd42..184076d 100644
--- a/extensions/Wikibase/docs/ontology.owl
+++ b/extensions/Wikibase/docs/ontology.owl
@@ -177,6 +177,13 @@
<rdf:type rdf:resource="&wikibase;PropertyType"/>
</owl:NamedIndividual>
+ <owl:NamedIndividual rdf:about="&wikibase;ExternalId">
+ <rdfs:label>WikibaseExternalId</rdfs:label>
+ <rdfs:comment>Type for referring to ID defined by external
authority.</rdfs:comment>
+ <rdf:type rdf:resource="&wikibase;PropertyType"/>
+ </owl:NamedIndividual>
+
+
<!--
///////////////////////////////////////////////////////////////////////////////////////
//
diff --git a/extensions/Wikibase/lib/i18n/hu.json
b/extensions/Wikibase/lib/i18n/hu.json
index 0c6e070..d406391 100644
--- a/extensions/Wikibase/lib/i18n/hu.json
+++ b/extensions/Wikibase/lib/i18n/hu.json
@@ -5,7 +5,8 @@
"JulesWinnfield-hu",
"Tacsipacsi",
"Grin",
- "Dj"
+ "Dj",
+ "Máté"
]
},
"wikibase-lib-desc": "A Wikibase és a Wikibase kliens kiterjesztések
közös funkcióit tartalmazza",
@@ -45,8 +46,9 @@
"wikibase-tooltip-error-details": "Részletek",
"wikibase-undeserializable-value": "Az érték érvénytelen és nem
jeleníthető meg.",
"wikibase-validator-invalid": "Érvénytelen érték",
- "datatypes-type-wikibase-item": "Tétel",
- "datatypes-type-commonsMedia": "Commons médiafájl",
+ "datatypes-type-wikibase-item": "Elem",
+ "datatypes-type-wikibase-property": "Tulajdonság",
+ "datatypes-type-commonsMedia": "Commons-médiafájl",
"wikibase-entity-summary-wbsetitem": "Fogalom létrehozása",
"wikibase-entity-summary-wbcreateredirect": "Átirányítás ide: $4",
"wikibase-entity-summary-wbsetreference": "Forráshivatkozás hozzáadása",
diff --git a/extensions/Wikibase/lib/i18n/ps.json
b/extensions/Wikibase/lib/i18n/ps.json
index 3d0b14a..e26b44f 100644
--- a/extensions/Wikibase/lib/i18n/ps.json
+++ b/extensions/Wikibase/lib/i18n/ps.json
@@ -23,7 +23,8 @@
"wikibase-validator-no-such-entity": "$1 و نه موندل شو",
"datatypes-type-wikibase-item": "توکی",
"datatypes-type-wikibase-property": "ځانتيا",
- "wikibase-time-precision-annum": "$1 عيسوي کالونه",
+ "wikibase-time-precision-annum": "{{PLURAL:$1|$1 کال|$1 کالونه}} عيسوي
وخت",
"wikibase-time-precision-millennium": "$1. زرۍ",
- "wikibase-time-precision-century": "$1. پېړۍ"
+ "wikibase-time-precision-century": "$1. پېړۍ",
+ "wikibase-time-precision-BCE-annum": "{{PLURAL:$1|$1 کال|$1 کالونه}}
عيسوي وخت دمخه"
}
diff --git a/extensions/Wikibase/lib/includes/MediaWikiContentLanguages.php
b/extensions/Wikibase/lib/includes/MediaWikiContentLanguages.php
index e4093c2..4eaaf3a 100644
--- a/extensions/Wikibase/lib/includes/MediaWikiContentLanguages.php
+++ b/extensions/Wikibase/lib/includes/MediaWikiContentLanguages.php
@@ -7,6 +7,9 @@
/**
* Provide languages supported as content languages based on MediaWiki's
Language class.
*
+ * @since 0.5
+ *
+ * @licence GNU GPL v2+
* @author Adrian Heine < adrian.he...@wikimedia.de >
* @author Marius Hoch < h...@online.de >
*/
diff --git a/extensions/Wikibase/lib/includes/StaticContentLanguages.php
b/extensions/Wikibase/lib/includes/StaticContentLanguages.php
index 5701833..a7bcf76 100644
--- a/extensions/Wikibase/lib/includes/StaticContentLanguages.php
+++ b/extensions/Wikibase/lib/includes/StaticContentLanguages.php
@@ -5,6 +5,9 @@
/**
* Provide languages supported as content languages based on a list
*
+ * @since 0.5
+ *
+ * @licence GNU GPL v2+
* @author Adrian Heine < adrian.he...@wikimedia.de >
*/
class StaticContentLanguages implements ContentLanguages {
diff --git a/extensions/Wikibase/lib/includes/UnionContentLanguages.php
b/extensions/Wikibase/lib/includes/UnionContentLanguages.php
index 0bcf361..715e089 100644
--- a/extensions/Wikibase/lib/includes/UnionContentLanguages.php
+++ b/extensions/Wikibase/lib/includes/UnionContentLanguages.php
@@ -5,17 +5,20 @@
/**
* Provide languages supported as content languages based on two
ContentLanguages
*
+ * @since 0.5
+ *
+ * @licence GNU GPL v2+
* @author Adrian Heine < adrian.he...@wikimedia.de >
*/
class UnionContentLanguages implements ContentLanguages {
/**
- * @var ContentLanguages $a
+ * @var ContentLanguages
*/
private $a;
/**
- * @var ContentLanguages $b
+ * @var ContentLanguages
*/
private $b;
diff --git a/extensions/Wikibase/phpcs.xml b/extensions/Wikibase/phpcs.xml
index 00325f0..5ff1efb 100644
--- a/extensions/Wikibase/phpcs.xml
+++ b/extensions/Wikibase/phpcs.xml
@@ -63,10 +63,6 @@
<rule ref="Squiz.Functions.FunctionDuplicateArgument" />
<rule ref="Squiz.Functions.GlobalFunction" />
<rule ref="Squiz.Scope" />
- <rule ref="Squiz.Scope.MethodScope">
- <!-- FIXME: This indicates an error in the QueryPage base class
that should be fixed. -->
- <exclude-pattern>SpecialUnconnectedPages\.php</exclude-pattern>
- </rule>
<rule ref="Squiz.WhiteSpace.CastSpacing" />
<rule ref="Squiz.WhiteSpace.FunctionSpacing">
<properties>
diff --git a/extensions/Wikibase/repo/i18n/cs.json
b/extensions/Wikibase/repo/i18n/cs.json
index f35f3bd..5a1ae53 100644
--- a/extensions/Wikibase/repo/i18n/cs.json
+++ b/extensions/Wikibase/repo/i18n/cs.json
@@ -319,7 +319,7 @@
"wikibase-listdatatypes-url-head": "URL",
"wikibase-listdatatypes-external-id-head": "Externí identifikátor",
"wikibase-add-badges": "Přidat odznaky",
- "wikibase-pageimage-helptext": "Tento obrázek je získán z tvrzení o
této položce. Změnou daného tvrzení ho můžete změnit.",
+ "wikibase-pageimage-helptext": "Tento obrázek se bere z tvrzení o této
položce. Změnou daného tvrzení ho můžete změnit.",
"datatypes-type-url": "URL",
"content-model-wikibase-item": "Položka Wikibase",
"content-model-wikibase-property": "Vlastnost Wikibase",
diff --git a/extensions/Wikibase/repo/i18n/de.json
b/extensions/Wikibase/repo/i18n/de.json
index 7f80082..b67ae7b 100644
--- a/extensions/Wikibase/repo/i18n/de.json
+++ b/extensions/Wikibase/repo/i18n/de.json
@@ -427,6 +427,7 @@
"apihelp-wbparsevalue-param-values": "Die zu parsenden Werte",
"apihelp-wbparsevalue-example-1": "Parst eine reine Zeichenfolge in ein
StringValue-Objekt.",
"apihelp-wbremoveclaims-description": "Entfernt Wikibase-Behauptungen.",
+ "apihelp-wbremoveclaims-param-bot": "Markiert diese Bearbeitung als
Bot. Diese URL-Markierung wird nur akzeptiert, falls der Benutzer der Gruppe
„Bot“ angehört.",
"apihelp-wbremovequalifiers-description": "Entfernt einen Qualifikator
von einer Behauptung.",
"apihelp-wbremovequalifiers-param-bot": "Markiert diese Bearbeitung als
Bot. Diese URL-Markierung wird nur akzeptiert, falls der Benutzer der Gruppe
„Bot“ angehört.",
"apihelp-wbremovereferences-description": "Entfernt eine oder mehrere
Referenzen der gleichen Aussage.",
diff --git a/extensions/Wikibase/repo/i18n/gl.json
b/extensions/Wikibase/repo/i18n/gl.json
index 79ef3d2..1c326b8 100644
--- a/extensions/Wikibase/repo/i18n/gl.json
+++ b/extensions/Wikibase/repo/i18n/gl.json
@@ -318,6 +318,7 @@
"wikibase-concept-uri": "URI do concepto",
"wikibase-concept-uri-tooltip": "URI que identifica o concepto descrito
por este artigo",
"wikibase-add-badges": "Engadir distintivos",
+ "wikibase-pageimage-helptext": "A imaxe xerouse coas declaracións deste
elemento. Pode axustar a imaxe cambiando a declaración.",
"datatypes-type-url": "URL",
"content-model-wikibase-item": "Elemento de Wikibase",
"content-model-wikibase-property": "Propiedade de Wikibase",
diff --git a/extensions/Wikibase/repo/i18n/hu.json
b/extensions/Wikibase/repo/i18n/hu.json
index 3835136..c0dfcc1 100644
--- a/extensions/Wikibase/repo/i18n/hu.json
+++ b/extensions/Wikibase/repo/i18n/hu.json
@@ -11,11 +11,12 @@
"Einstein2",
"Csega",
"Dj",
- "Macofe"
+ "Macofe",
+ "Máté"
]
},
"wikibase-desc": "Strukturált adattár",
- "wikibase-entity-item": "tétel",
+ "wikibase-entity-item": "elem",
"wikibase-entity-property": "tulajdonság",
"wikibase-entity-query": "lekérdezés",
"wikibase-edit": "szerkesztés",
diff --git a/extensions/Wikibase/repo/i18n/ja.json
b/extensions/Wikibase/repo/i18n/ja.json
index 7535c1a..962718e 100644
--- a/extensions/Wikibase/repo/i18n/ja.json
+++ b/extensions/Wikibase/repo/i18n/ja.json
@@ -37,11 +37,12 @@
"wikibase-entitytermsforlanguagelistview-more": "その他の言語",
"wikibase-label-empty": "ラベルは設定されていません",
"wikibase-label-edit-placeholder": "ラベルを入力",
- "wikibase-label-edit-placeholder-language-aware": "ラベルを $1 で入力",
+ "wikibase-label-edit-placeholder-language-aware":
"$1版ウィキでのラベル名を入力してください",
"wikibase-description-empty": "説明は設定されていません",
"wikibase-description-edit-placeholder": "説明を入力",
- "wikibase-description-edit-placeholder-language-aware": "説明を $1 で入力",
+ "wikibase-description-edit-placeholder-language-aware":
"説明を$1で入力してください",
"wikibase-aliases-edit-placeholder": "いくつかの別名を入力",
+ "wikibase-aliases-edit-placeholder-language-aware":
"別名をいくつか$1で入力してください",
"wikibase-diffview-reference": "情報源",
"wikibase-diffview-rank": "ランク",
"wikibase-diffview-qualifier": "修飾子",
@@ -149,6 +150,7 @@
"wikibase-newentity-language": "言語:",
"wikibase-newentity-label": "ラベル:",
"wikibase-newentity-description": "説明:",
+ "wikibase-newentity-aliases": "別名, pipe-separated:",
"wikibase-newentity-submit": "作成",
"special-setlabel": "ラベルの設定",
"wikibase-setlabel-introfull": "[[$1]] に対する$2のラベルを設定しています。",
@@ -263,7 +265,7 @@
"wikibase-mylanguagefallbackchain-verbatim-item": "$1 - $2",
"wikibase-mylanguagefallbackchain-converted-item": "$1 - $2、変換元 $3 -
$4",
"wikibase-api-no-such-sitelink":
"バッジを編集しようとしましたが「$1」へのサイトリンクを見つけられませんでした",
- "wikibase-api-target-not-empty": "リダイレクトは空の実体の上にしか作ることができません。",
+ "wikibase-api-target-not-empty": "リダイレクトは空、または削除された実体の上にしか作ることができません。",
"wikibase-api-target-is-redirect": "リダイレクト先もリダイレクトであってはなりません。",
"wikibase-api-target-is-incompatible": "異なる種類の実体へのリダイレクトをしようとしました。",
"wikibase-self-conflict-patched":
"編集内容を最新版に反映させたため、あなたの中間の版での変更が上書きされます。",
diff --git a/extensions/Wikibase/repo/i18n/ka.json
b/extensions/Wikibase/repo/i18n/ka.json
index 126de20..4885aff 100644
--- a/extensions/Wikibase/repo/i18n/ka.json
+++ b/extensions/Wikibase/repo/i18n/ka.json
@@ -39,8 +39,8 @@
"wikibase-alias-edit-placeholder": "ფსევდონიმის შეყვანა",
"wikibase-label-input-help-message": "დაამატეთ ამ მონაცემთა ნაკრების
სათაური შემდეგ ენაზე: $1.",
"wikibase-description-input-help-message": "დაამატეთ მოკლე აღწერა
შემდეგ ენაზე: $1.",
- "wikibase-statements": "ფაქტები",
- "wikibase-sitelinks": "ამ ელემენტზე გადამისამართებული გვერდების სია",
+ "wikibase-statementsection-statements": "ფაქტები",
+ "wikibase-sitelinks": "ამ ელემენტზე გადამისამართებული გვერდების სია.",
"wikibase-sitelinks-empty": "საიტის არცერთ გვერდს არ აქვს აქ ბმული.",
"wikibase-sitelinks-input-help-message": "ამ ელემენტთან დაკავშირებულ
გვერდზე ბმულის დაყენება.",
"wikibase-sitelinks-special": "სხვა საიტები",
@@ -141,7 +141,7 @@
"wikibase-dispatchstats-median": "საშუალება",
"wikibase-dispatchstats-average": "საშუალო",
"special-listdatatypes": "ყველა ხელმისაწვდომი მონაცემთა ტიპების სია",
- "wikibase-listdatatypes-intro": "ეს არის ამ ისტალაციის ყველა ამჟამად
გამოყენებადი მონაცემთა ტიპების სია:",
+ "wikibase-listdatatypes-intro": "ეს არის ამ ინსტალაციის ყველა ამჟამად
გამოყენებადი მონაცემთა ტიპების სია:",
"wikibase-history-title-with-label": "ცვლილებების ისტორია „$2“-თვის
($1)",
"wikibase-history-title-without-label": "$1 — ცვლილებების ისტორია",
"wikibase-entitieswithoutlabel-label-language": "ენის კოდი:",
@@ -152,7 +152,7 @@
"special-itemswithoutsitelinks": "ელემენტები საიტის ბმულების გარეშე",
"wikibase-restoreold": "აღდგენა",
"wikibase-restore-summary": "მომხმარებელმა
[[Special:Contributions/$2|$2]] აღადგინა ვერსია $1",
- "wikibase-noentity": "მონაცემებთა მსგავსი ნაკრები არ არსებობს. თქვენ
შეგიძლიათ\n<span
class=\"plainlinks\">[{{fullurl:{{#Special:Log}}|page={{FULLPAGENAMEE}}}}
მოძებნოთ შესაბამისი ჩანაწერები ჟურნალში]</span>\nრათა გაიგოთ სად წავიდა ის.",
+ "wikibase-noentity": "მონაცემებთა მსგავსი ნაკრები არ არსებობს. თქვენ
შეგიძლიათ\n<span
class=\"plainlinks\">[{{fullurl:{{#Special:Log}}|page={{FULLPAGENAMEE}}}}
მოძებნოთ შესაბამისი ჩანაწერები ჟურნალში]</span>რათა გაიგოთ სად წავიდა ის.",
"wikibase-noentity-createone": "თქვენ აგრეთვე შეგიძლიათ [[$1|შექმნათ
ის]].",
"wikibase-listdatatypes-wikibase-item-head": "ელემენტი",
"wikibase-listdatatypes-commonsmedia-head": "ვიკისაწყობის მედიაფაილი",
diff --git a/extensions/Wikibase/repo/i18n/ps.json
b/extensions/Wikibase/repo/i18n/ps.json
index 8a3d8f5..8c486fb 100644
--- a/extensions/Wikibase/repo/i18n/ps.json
+++ b/extensions/Wikibase/repo/i18n/ps.json
@@ -13,6 +13,7 @@
"wikibase-entitytermsview-entitytermsforlanguagelistview-toggler": "په
نورو ژبو کې",
"wikibase-entitytermsforlanguagelistview-description": "څرگندونه",
"wikibase-entitytermsforlanguagelistview-language": "ژبه",
+ "wikibase-entitytermsforlanguagelistview-more": "نورې ژبې",
"wikibase-label-empty": "کوم لېبل نه دی څرگند شوی",
"wikibase-description-empty": "کوم تعريف نه دی څرگند شوی",
"wikibase-diffview-rank": "پوړ",
diff --git a/extensions/Wikibase/repo/includes/api/EditEntity.php
b/extensions/Wikibase/repo/includes/api/EditEntity.php
index f7b2ca2..007fcdd 100644
--- a/extensions/Wikibase/repo/includes/api/EditEntity.php
+++ b/extensions/Wikibase/repo/includes/api/EditEntity.php
@@ -23,6 +23,7 @@
use Wikibase\DataModel\Entity\Property;
use Wikibase\DataModel\Entity\EntityIdParser;
use Wikibase\DataModel\Statement\Statement;
+use Wikibase\DataModel\Statement\StatementListProvider;
use Wikibase\DataModel\Term\FingerprintProvider;
use Wikibase\Lib\ContentLanguages;
use Wikibase\Lib\Store\EntityRevisionLookup;
@@ -562,9 +563,9 @@
}
/**
- * @param Entity $entity
+ * @param EntityDocument $entity
*/
- private function buildResult( Entity $entity ) {
+ private function buildResult( EntityDocument $entity ) {
$builder = $this->getResultBuilder();
if ( $entity instanceof FingerprintProvider ) {
@@ -579,7 +580,9 @@
$builder->addSiteLinkList( $entity->getSiteLinkList(),
'entity' );
}
- $builder->addStatements( $entity->getClaims(), 'entity' );
+ if ( $entity instanceof StatementListProvider ) {
+ $builder->addStatements( $entity->getStatements(),
'entity' );
+ }
}
/**
diff --git a/extensions/Wikibase/repo/includes/api/GetClaims.php
b/extensions/Wikibase/repo/includes/api/GetClaims.php
index bdfab37..49d1e09 100644
--- a/extensions/Wikibase/repo/includes/api/GetClaims.php
+++ b/extensions/Wikibase/repo/includes/api/GetClaims.php
@@ -11,6 +11,7 @@
use Wikibase\DataModel\Services\Statement\StatementGuidParser;
use Wikibase\DataModel\Services\Statement\StatementGuidValidator;
use Wikibase\DataModel\Statement\Statement;
+use Wikibase\DataModel\Statement\StatementList;
use Wikibase\DataModel\Statement\StatementListProvider;
use Wikibase\Lib\Store\EntityRevisionLookup;
use Wikibase\Repo\WikibaseRepo;
@@ -102,8 +103,8 @@
);
$entity = $entityRevision->getEntity();
- $claims = $this->getClaims( $entity, $guid );
- $this->resultBuilder->addStatements( $claims, null,
$params['props'] );
+ $statements = $this->getStatements( $entity, $guid );
+ $this->resultBuilder->addStatements( $statements, null,
$params['props'] );
}
private function validateParameters( array $params ) {
@@ -119,21 +120,21 @@
* @param EntityDocument $entity
* @param string|null $guid
*
- * @return Statement[]
+ * @return StatementList
*/
- private function getClaims( EntityDocument $entity, $guid = null ) {
+ private function getStatements( EntityDocument $entity, $guid = null ) {
if ( !( $entity instanceof StatementListProvider ) ) {
- return array();
+ return new StatementList();
}
$statements = $entity->getStatements();
if ( $guid === null ) {
- return $statements->filter(
$this->newRequestParamsBasedFilter() )->toArray();
+ return $statements->filter(
$this->newRequestParamsBasedFilter() );
}
$statement = $statements->getFirstStatementWithGuid( $guid );
- return $statement === null ? array() : array( $statement );
+ return new StatementList( $statement === null ? array() :
$statement );
}
private function newRequestParamsBasedFilter() {
diff --git a/extensions/Wikibase/repo/includes/api/ResultBuilder.php
b/extensions/Wikibase/repo/includes/api/ResultBuilder.php
index 960ec14..7e5b99a 100644
--- a/extensions/Wikibase/repo/includes/api/ResultBuilder.php
+++ b/extensions/Wikibase/repo/includes/api/ResultBuilder.php
@@ -812,14 +812,14 @@
*
* @since 0.5
*
- * @param Statement[] $statements the labels to set in the result
+ * @param StatementList $statements the labels to set in the result
* @param array|string $path where the data is located
* @param array|string $props a list of fields to include, or "all"
*/
- public function addStatements( array $statements, $path, $props = 'all'
) {
+ public function addStatements( StatementList $statements, $path, $props
= 'all' ) {
$serializer =
$this->serializerFactory->newStatementListSerializer();
- $values = $serializer->serialize( new StatementList(
$statements ) );
+ $values = $serializer->serialize( $statements );
if ( is_array( $props ) && !in_array( 'references', $props ) ) {
$values = $this->modifier->modifyUsingCallback(
diff --git
a/extensions/Wikibase/repo/tests/phpunit/includes/api/ResultBuilderTest.php
b/extensions/Wikibase/repo/tests/phpunit/includes/api/ResultBuilderTest.php
index 6e38395..b51f338 100644
--- a/extensions/Wikibase/repo/tests/phpunit/includes/api/ResultBuilderTest.php
+++ b/extensions/Wikibase/repo/tests/phpunit/includes/api/ResultBuilderTest.php
@@ -18,6 +18,7 @@
use Wikibase\DataModel\Snak\PropertyValueSnak;
use Wikibase\DataModel\Snak\SnakList;
use Wikibase\DataModel\Statement\Statement;
+use Wikibase\DataModel\Statement\StatementList;
use Wikibase\DataModel\Term\AliasGroup;
use Wikibase\DataModel\Term\AliasGroupList;
use Wikibase\DataModel\Term\Term;
@@ -1038,7 +1039,7 @@
}
$resultBuilder = $this->getResultBuilder( $result, $addMetaData
);
- $resultBuilder->addStatements( array( $statement ), $path );
+ $resultBuilder->addStatements( new StatementList( $statement ),
$path );
$data = $result->getResultData();
@@ -1085,7 +1086,7 @@
$props = array();
$resultBuilder = $this->getResultBuilder( $result );
- $resultBuilder->addStatements( array( $statement ), $path,
$props );
+ $resultBuilder->addStatements( new StatementList( $statement ),
$path, $props );
$data = $result->getResultData();
diff --git
a/extensions/Wikibase/repo/tests/phpunit/includes/api/SetClaimValueTest.php
b/extensions/Wikibase/repo/tests/phpunit/includes/api/SetClaimValueTest.php
index 4cbd50d..0638704 100644
--- a/extensions/Wikibase/repo/tests/phpunit/includes/api/SetClaimValueTest.php
+++ b/extensions/Wikibase/repo/tests/phpunit/includes/api/SetClaimValueTest.php
@@ -8,7 +8,6 @@
use UsageException;
use ValueFormatters\FormatterOptions;
use ValueFormatters\ValueFormatter;
-use Wikibase\DataModel\Entity\Entity;
use Wikibase\DataModel\Entity\Item;
use Wikibase\DataModel\Entity\ItemId;
use Wikibase\DataModel\Entity\Property;
@@ -107,8 +106,8 @@
foreach ( $item->getStatements()->toArray() as
$statement ) {
$value = new StringValue( 'Kittens.png' );
$argLists[] = array(
- 'entity' => $item,
- 'claimGuid' => $statement->getGuid(),
+ 'itemId' => $item->getId(),
+ 'guid' => $statement->getGuid(),
'value' => $value->getArrayValue(),
'expectedSummary' =>
$this->getExpectedSummary( $statement, $value )
);
@@ -120,11 +119,12 @@
}
}
- public function doTestValidRequest( Entity $entity, $guid, $value,
$expectedSummary ) {
+ public function doTestValidRequest( ItemId $itemId, $guid, $value,
$expectedSummary ) {
$wikibaseRepo = WikibaseRepo::getDefaultInstance();
$entityLookup = $wikibaseRepo->getEntityLookup();
- $obtainedEntity = $entityLookup->getEntity( $entity->getId() );
- $claimCount = count( $obtainedEntity->getClaims() );
+ /** @var Item $obtainedEntity */
+ $obtainedEntity = $entityLookup->getEntity( $itemId );
+ $statementCount = $obtainedEntity->getStatements()->count();
$params = array(
'action' => 'wbsetclaimvalue',
@@ -144,15 +144,19 @@
$this->assertEquals( $value,
$claim['mainsnak']['datavalue']['value'] );
/** @var StatementListProvider $obtainedEntity */
- $obtainedEntity = $entityLookup->getEntity( $entity->getId() );
+ $obtainedEntity = $entityLookup->getEntity( $itemId );
- $page = new WikiPage(
$wikibaseRepo->getEntityTitleLookup()->getTitleForId( $entity->getId() ) );
+ $page = new WikiPage(
$wikibaseRepo->getEntityTitleLookup()->getTitleForId( $itemId ) );
$generatedSummary = $page->getRevision()->getComment(
Revision::RAW );
$this->assertEquals( $expectedSummary, $generatedSummary,
'Summary mismatch' );
$statements = $obtainedEntity->getStatements();
- $this->assertEquals( $claimCount, $statements->count(), 'Claim
count should not change after doing a setclaimvalue request' );
+ $this->assertSame(
+ $statementCount,
+ $statements->count(),
+ 'Statement count should not change after doing a
setclaimvalue request'
+ );
$obtainedClaim = $statements->getFirstStatementWithGuid( $guid
);
diff --git a/extensions/Wikibase/view/resources.php
b/extensions/Wikibase/view/resources.php
index 3f66461..d41f390 100644
--- a/extensions/Wikibase/view/resources.php
+++ b/extensions/Wikibase/view/resources.php
@@ -1,7 +1,9 @@
<?php
/**
- * @license GNU GPL v2+
+ * @since 0.5
+ *
+ * @licence GNU GPL v2+
* @author Adrian Heine < adrian.he...@wikimedia.de >
*/
return call_user_func( function() {
diff --git a/extensions/Wikibase/view/resources.test.php
b/extensions/Wikibase/view/resources.test.php
index 94f3b24..cfed07b 100644
--- a/extensions/Wikibase/view/resources.test.php
+++ b/extensions/Wikibase/view/resources.test.php
@@ -1,7 +1,9 @@
<?php
/**
- * @license GNU GPL v2+
+ * @since 0.5
+ *
+ * @licence GNU GPL v2+
* @author Adrian Heine < adrian.he...@wikimedia.de >
*/
global $wgHooks;
diff --git
a/extensions/Wikibase/view/resources/jquery/wikibase/snakview/snakview.js
b/extensions/Wikibase/view/resources/jquery/wikibase/snakview/snakview.js
index fbf4c84..58f32b6 100644
--- a/extensions/Wikibase/view/resources/jquery/wikibase/snakview/snakview.js
+++ b/extensions/Wikibase/view/resources/jquery/wikibase/snakview/snakview.js
@@ -705,7 +705,7 @@
propertyId = this.value().property;
if ( this.options.locked.property
- && ( this.$property.contents().length ||
this.options.drawProperty )
+ && ( this.$property.contents().length ||
!this.options.drawProperty )
) {
return deferred.resolve().promise();
}
diff --git a/extensions/Wikibase/view/resources/resources.php
b/extensions/Wikibase/view/resources/resources.php
index 0c1132b..b95770b 100644
--- a/extensions/Wikibase/view/resources/resources.php
+++ b/extensions/Wikibase/view/resources/resources.php
@@ -1,7 +1,9 @@
<?php
/**
- * @license GNU GPL v2+
+ * @since 0.5
+ *
+ * @licence GNU GPL v2+
* @author Adrian Heine < adrian.he...@wikimedia.de >
*/
return call_user_func( function() {
diff --git
a/extensions/Wikibase/view/resources/wikibase/entityChangers/resources.php
b/extensions/Wikibase/view/resources/wikibase/entityChangers/resources.php
index 99b2e23..4520bf8 100644
--- a/extensions/Wikibase/view/resources/wikibase/entityChangers/resources.php
+++ b/extensions/Wikibase/view/resources/wikibase/entityChangers/resources.php
@@ -1,6 +1,9 @@
<?php
+
/**
- * @license GNU GPL v2+
+ * @since 0.5
+ *
+ * @licence GNU GPL v2+
* @author Adrian Lang <adrian.l...@wikimedia.de>
*/
return call_user_func( function() {
diff --git
a/extensions/Wikibase/view/resources/wikibase/entityIdFormatter/resources.php
b/extensions/Wikibase/view/resources/wikibase/entityIdFormatter/resources.php
index a14ef99..a0bd386 100644
---
a/extensions/Wikibase/view/resources/wikibase/entityIdFormatter/resources.php
+++
b/extensions/Wikibase/view/resources/wikibase/entityIdFormatter/resources.php
@@ -1,7 +1,9 @@
<?php
/**
- * @license GNU GPL v2+
+ * @since 0.5
+ *
+ * @licence GNU GPL v2+
* @author Adrian Heine < adrian.he...@wikimedia.de >
*/
return call_user_func( function() {
diff --git a/extensions/Wikibase/view/resources/wikibase/view/resources.php
b/extensions/Wikibase/view/resources/wikibase/view/resources.php
index 22a4b22..f99454b 100644
--- a/extensions/Wikibase/view/resources/wikibase/view/resources.php
+++ b/extensions/Wikibase/view/resources/wikibase/view/resources.php
@@ -1,7 +1,9 @@
<?php
/**
- * @license GNU GPL v2+
+ * @since 0.5
+ *
+ * @licence GNU GPL v2+
* @author Adrian Heine < adrian.he...@wikimedia.de >
*/
return call_user_func( function() {
diff --git a/extensions/Wikibase/view/src/EmptyEditSectionGenerator.php
b/extensions/Wikibase/view/src/EmptyEditSectionGenerator.php
index 30a741f..a65ec21 100644
--- a/extensions/Wikibase/view/src/EmptyEditSectionGenerator.php
+++ b/extensions/Wikibase/view/src/EmptyEditSectionGenerator.php
@@ -9,6 +9,9 @@
/**
* An EditSectionGenerator returning empty string for edit sections
*
+ * @since 0.5
+ *
+ * @licence GNU GPL v2+
* @author Adrian Heine < adrian.he...@wikimedia.de >
*/
class EmptyEditSectionGenerator implements EditSectionGenerator {
diff --git a/extensions/Wikibase/view/src/EntityIdFormatterFactory.php
b/extensions/Wikibase/view/src/EntityIdFormatterFactory.php
index 43fe049..f2f223e 100644
--- a/extensions/Wikibase/view/src/EntityIdFormatterFactory.php
+++ b/extensions/Wikibase/view/src/EntityIdFormatterFactory.php
@@ -8,7 +8,9 @@
/**
* A factory interface for generating EntityIdFormatters.
*
- * @license GPL 2+
+ * @since 0.5
+ *
+ * @licence GNU GPL v2+
* @author Daniel Kinzler
*/
interface EntityIdFormatterFactory {
diff --git a/extensions/Wikibase/view/src/HtmlSnakFormatterFactory.php
b/extensions/Wikibase/view/src/HtmlSnakFormatterFactory.php
index c80ba59..87fe94d 100644
--- a/extensions/Wikibase/view/src/HtmlSnakFormatterFactory.php
+++ b/extensions/Wikibase/view/src/HtmlSnakFormatterFactory.php
@@ -8,7 +8,10 @@
/**
* A factory constructing SnakFormatters that output HTML.
+ *
* @since 0.5
+ *
+ * @licence GNU GPL v2+
* @author Adrian Heine < adrian.he...@wikimedia.de >
*/
interface HtmlSnakFormatterFactory {
diff --git a/extensions/Wikibase/view/src/SpecialPageLinker.php
b/extensions/Wikibase/view/src/SpecialPageLinker.php
index 88d1430..a1abddb 100644
--- a/extensions/Wikibase/view/src/SpecialPageLinker.php
+++ b/extensions/Wikibase/view/src/SpecialPageLinker.php
@@ -5,6 +5,9 @@
/**
* A service returning a URL for a specific special page with optional
parameters.
*
+ * @since 0.5
+ *
+ * @licence GNU GPL v2+
* @author Adrian Heine < adrian.he...@wikimedia.de >
*/
interface SpecialPageLinker {
diff --git a/extensions/Wikibase/view/src/Template/TemplateFactory.php
b/extensions/Wikibase/view/src/Template/TemplateFactory.php
index bc83352..21ef349 100644
--- a/extensions/Wikibase/view/src/Template/TemplateFactory.php
+++ b/extensions/Wikibase/view/src/Template/TemplateFactory.php
@@ -3,7 +3,9 @@
namespace Wikibase\View\Template;
/**
- * @license GNU GPL v2+
+ * @since 0.5
+ *
+ * @licence GNU GPL v2+
* @author Adrian Lang < adrian.l...@wikimedia.de >
* @author Thiemo Mättig
*/
diff --git a/extensions/Wikibase/view/tests/qunit/jquery/resources.php
b/extensions/Wikibase/view/tests/qunit/jquery/resources.php
index b627d23..14327c8 100644
--- a/extensions/Wikibase/view/tests/qunit/jquery/resources.php
+++ b/extensions/Wikibase/view/tests/qunit/jquery/resources.php
@@ -1,6 +1,9 @@
<?php
+
/**
- * @license GNU GPL v2+
+ * @since 0.5
+ *
+ * @licence GNU GPL v2+
* @author H. Snater < mediaw...@snater.com >
*
* @codeCoverageIgnoreStart
diff --git a/extensions/Wikibase/view/tests/qunit/resources.php
b/extensions/Wikibase/view/tests/qunit/resources.php
index 0e78847..f9c5de6 100644
--- a/extensions/Wikibase/view/tests/qunit/resources.php
+++ b/extensions/Wikibase/view/tests/qunit/resources.php
@@ -1,7 +1,9 @@
<?php
/**
- * @license GNU GPL v2+
+ * @since 0.5
+ *
+ * @licence GNU GPL v2+
* @author Adrian Heine < adrian.he...@wikimedia.de >
*/
$remoteExtPathParts = explode(
diff --git
a/extensions/Wikibase/view/tests/qunit/wikibase/entityChangers/resources.php
b/extensions/Wikibase/view/tests/qunit/wikibase/entityChangers/resources.php
index 95e5522..757fef8 100644
--- a/extensions/Wikibase/view/tests/qunit/wikibase/entityChangers/resources.php
+++ b/extensions/Wikibase/view/tests/qunit/wikibase/entityChangers/resources.php
@@ -1,7 +1,9 @@
<?php
/**
- * @license GNU GPL v2+
+ * @since 0.5
+ *
+ * @licence GNU GPL v2+
* @author Adrian Lang <adrian.l...@wikimedia.de>
*/
return call_user_func( function() {
diff --git
a/extensions/Wikibase/view/tests/qunit/wikibase/entityIdFormatter/resources.php
b/extensions/Wikibase/view/tests/qunit/wikibase/entityIdFormatter/resources.php
index 8a69ce9..047cc81 100644
---
a/extensions/Wikibase/view/tests/qunit/wikibase/entityIdFormatter/resources.php
+++
b/extensions/Wikibase/view/tests/qunit/wikibase/entityIdFormatter/resources.php
@@ -1,7 +1,9 @@
<?php
/**
- * @license GNU GPL v2+
+ * @since 0.5
+ *
+ * @licence GNU GPL v2+
* @author Adrian Heine < adrian.he...@wikimedia.de >
*/
return call_user_func( function() {
diff --git
a/extensions/Wikibase/view/tests/qunit/wikibase/utilities/resources.php
b/extensions/Wikibase/view/tests/qunit/wikibase/utilities/resources.php
index ab8a330..6741590 100644
--- a/extensions/Wikibase/view/tests/qunit/wikibase/utilities/resources.php
+++ b/extensions/Wikibase/view/tests/qunit/wikibase/utilities/resources.php
@@ -1,7 +1,9 @@
<?php
/**
- * @license GNU GPL v2+
+ * @since 0.5
+ *
+ * @licence GNU GPL v2+
* @author H. Snater < mediaw...@snater.com >
*/
return call_user_func( function() {
diff --git a/extensions/Wikibase/view/tests/qunit/wikibase/view/resources.php
b/extensions/Wikibase/view/tests/qunit/wikibase/view/resources.php
index cce98fb..3c7febd 100644
--- a/extensions/Wikibase/view/tests/qunit/wikibase/view/resources.php
+++ b/extensions/Wikibase/view/tests/qunit/wikibase/view/resources.php
@@ -1,7 +1,9 @@
<?php
/**
- * @license GNU GPL v2+
+ * @since 0.5
+ *
+ * @licence GNU GPL v2+
* @author Adrian Heine < adrian.he...@wikimedia.de >
*/
return call_user_func( function() {
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index 55013bc..40c203a 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -106,19 +106,19 @@
"source": {
"type": "git",
"url":
"https://github.com/wikimedia/mediawiki-extensions-ArticlePlaceholder.git";,
- "reference": "a704bce577caff9b6a62a20f8ae2be0ea6b48b8e"
+ "reference": "922c260fd2fb74bbfedbcef2001b0745cb32859f"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-ArticlePlaceholder/zipball/a704bce577caff9b6a62a20f8ae2be0ea6b48b8e";,
- "reference": "a704bce577caff9b6a62a20f8ae2be0ea6b48b8e",
+ "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-ArticlePlaceholder/zipball/922c260fd2fb74bbfedbcef2001b0745cb32859f";,
+ "reference": "922c260fd2fb74bbfedbcef2001b0745cb32859f",
"shasum": ""
},
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
"mediawiki/mediawiki-codesniffer": "0.5.1"
},
- "time": "2016-01-28 20:06:55",
+ "time": "2016-02-05 11:13:55",
"type": "mediawiki-extension",
"installation-source": "dist",
"notification-url": "https://packagist.org/downloads/";,
@@ -1271,12 +1271,12 @@
"source": {
"type": "git",
"url":
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";,
- "reference": "47be3f6446d4dcb1d4304b99569c1c42e2a79347"
+ "reference": "4072055fbaab63af0ea10306821b4782af5994bd"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/47be3f6446d4dcb1d4304b99569c1c42e2a79347";,
- "reference": "47be3f6446d4dcb1d4304b99569c1c42e2a79347",
+ "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/4072055fbaab63af0ea10306821b4782af5994bd";,
+ "reference": "4072055fbaab63af0ea10306821b4782af5994bd",
"shasum": ""
},
"require": {
@@ -1308,7 +1308,7 @@
"jakub-onderka/php-parallel-lint": "0.9.2",
"mediawiki/mediawiki-codesniffer": "0.4.0|0.5.0"
},
- "time": "2016-02-05 09:31:01",
+ "time": "2016-02-05 20:55:08",
"type": "mediawiki-extension",
"installation-source": "dist",
"autoload": {
--
To view, visit https://gerrit.wikimedia.org/r/268861
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I87921fb6cefc0ed822a5a93d2887491f74d4e7ef
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikidata
Gerrit-Branch: master
Gerrit-Owner: WikidataBuilder <wikidata-servi...@wikimedia.de>
Gerrit-Reviewer: Addshore <addshorew...@gmail.com>
Gerrit-Reviewer: Aude <aude.w...@gmail.com>
Gerrit-Reviewer: JanZerebecki <jan.wikime...@zerebecki.de>
Gerrit-Reviewer: Siebrand <siebr...@kitano.nl>
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
