WikidataBuilder has uploaded a new change for review.
https://gerrit.wikimedia.org/r/303779
Change subject: New Wikidata Build - 2016-08-09T10:00:01+0000
......................................................................
New Wikidata Build - 2016-08-09T10:00:01+0000
Change-Id: I50b564543c8c558ae9febb91aeafcc13d159804b
---
M composer.lock
M extensions/ArticlePlaceholder/README.md
M extensions/ArticlePlaceholder/extension.json
M extensions/ArticlePlaceholder/includes/Hooks.php
M
extensions/ArticlePlaceholder/includes/Lua/Scribunto_LuaArticlePlaceholderLibrary.php
A extensions/ArticlePlaceholder/includes/Template/Wikidata-P18.xml
M extensions/ArticlePlaceholder/includes/specials/SpecialAboutTopic.php
M extensions/ArticlePlaceholder/includes/specials/SpecialCreateTopicPage.php
M extensions/ArticlePlaceholder/phpcs.xml
M extensions/MediaInfo/tests/phpunit/composer/DataModel/MediaInfoIdTest.php
M extensions/MediaInfo/tests/phpunit/composer/DataModel/MediaInfoTest.php
M
extensions/MediaInfo/tests/phpunit/composer/DataModel/Serialization/MediaInfoDeserializerTest.php
M
extensions/MediaInfo/tests/phpunit/composer/DataModel/Serialization/MediaInfoSerializerTest.php
M
extensions/MediaInfo/tests/phpunit/composer/DataModel/Services/Diff/MediaInfoDifferTest.php
M
extensions/MediaInfo/tests/phpunit/composer/DataModel/Services/Diff/MediaInfoPatcherTest.php
M extensions/MediaInfo/tests/phpunit/mediawiki/Content/MediaInfoContentTest.php
M extensions/MediaInfo/tests/phpunit/mediawiki/Content/MediaInfoHandlerTest.php
M
extensions/MediaInfo/tests/phpunit/mediawiki/Content/MissingMediaInfoHandlerTest.php
M extensions/MediaInfo/tests/phpunit/mediawiki/EntityTypesTest.php
M extensions/MediaInfo/tests/phpunit/mediawiki/Services/FilePageLookupTest.php
M
extensions/MediaInfo/tests/phpunit/mediawiki/Services/MediaInfoIdLookupTest.php
M
extensions/MediaInfo/tests/phpunit/mediawiki/Services/MediaInfoServicesTest.php
M extensions/MediaInfo/tests/phpunit/mediawiki/View/MediaInfoViewTest.php
M extensions/MediaInfo/tests/phpunit/mediawiki/WikibaseMediaInfoHooksTest.php
A extensions/Quality/i18n/sl.json
M extensions/Wikibase/client/i18n/gl.json
M extensions/Wikibase/client/includes/Changes/ChangeRunCoalescer.php
M
extensions/Wikibase/client/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseLibrary.php
M extensions/Wikibase/client/includes/WikibaseClient.php
M
extensions/Wikibase/client/tests/phpunit/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseLibraryTestCase.php
M
extensions/Wikibase/client/tests/phpunit/includes/RecentChanges/RecentChangeFactoryTest.php
M extensions/Wikibase/lib/i18n/bn.json
M extensions/Wikibase/lib/i18n/gl.json
M extensions/Wikibase/lib/i18n/ru.json
M extensions/Wikibase/lib/tests/phpunit/Store/TermIndexTest.php
M extensions/Wikibase/repo/i18n/bn.json
M extensions/Wikibase/repo/i18n/cs.json
M extensions/Wikibase/repo/i18n/en.json
M extensions/Wikibase/repo/i18n/eu.json
M extensions/Wikibase/repo/i18n/gl.json
M extensions/Wikibase/repo/i18n/he.json
M extensions/Wikibase/repo/i18n/ko.json
M extensions/Wikibase/repo/i18n/pl.json
M extensions/Wikibase/repo/i18n/pt.json
M extensions/Wikibase/repo/i18n/qqq.json
M extensions/Wikibase/repo/i18n/ru.json
M extensions/Wikibase/repo/i18n/yi.json
M extensions/Wikibase/repo/includes/Actions/EditEntityAction.php
D extensions/Wikibase/repo/includes/Actions/EditItemAction.php
D extensions/Wikibase/repo/includes/Actions/EditPropertyAction.php
D extensions/Wikibase/repo/includes/Actions/SubmitItemAction.php
D extensions/Wikibase/repo/includes/Actions/SubmitPropertyAction.php
M extensions/Wikibase/repo/includes/Actions/ViewEntityAction.php
D extensions/Wikibase/repo/includes/Actions/ViewItemAction.php
D extensions/Wikibase/repo/includes/Actions/ViewPropertyAction.php
M extensions/Wikibase/repo/includes/Api/EditEntity.php
M extensions/Wikibase/repo/includes/Api/ModifyEntity.php
M extensions/Wikibase/repo/includes/Api/SearchEntities.php
M extensions/Wikibase/repo/includes/Api/SetAliases.php
M extensions/Wikibase/repo/includes/Api/SetDescription.php
M extensions/Wikibase/repo/includes/Api/SetLabel.php
M extensions/Wikibase/repo/includes/Api/SetSiteLink.php
M extensions/Wikibase/repo/includes/Content/ItemHandler.php
M extensions/Wikibase/repo/includes/Content/PropertyHandler.php
M vendor/composer/autoload_classmap.php
M vendor/composer/installed.json
66 files changed, 306 insertions(+), 242 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikidata
refs/changes/79/303779/1
diff --git a/composer.lock b/composer.lock
index 41e858b..1d11fa2 100644
--- a/composer.lock
+++ b/composer.lock
@@ -782,12 +782,12 @@
"source": {
"type": "git",
"url":
"https://github.com/wikimedia/mediawiki-extensions-ArticlePlaceholder.git";,
- "reference": "d60bda49676181f39b584d32103eddd3681dca2a"
+ "reference": "d1e62cfdb986f8dab0f757043111722e44683276"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-ArticlePlaceholder/zipball/d60bda49676181f39b584d32103eddd3681dca2a";,
- "reference": "d60bda49676181f39b584d32103eddd3681dca2a",
+ "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-ArticlePlaceholder/zipball/d1e62cfdb986f8dab0f757043111722e44683276";,
+ "reference": "d1e62cfdb986f8dab0f757043111722e44683276",
"shasum": ""
},
"require-dev": {
@@ -812,7 +812,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-08-05 20:30:37"
+ "time": "2016-08-09 00:30:09"
},
{
"name": "propertysuggester/property-suggester",
@@ -1419,7 +1419,7 @@
"source": {
"type": "git",
"url":
"https://gerrit.wikimedia.org/r/mediawiki/extensions/WikibaseMediaInfo";,
- "reference": "ad08bf52aa712797feeb82ce046471753b6bc5e8"
+ "reference": "c0f08eb81346c7aa4bae23b1140ff9b605703fc3"
},
"require": {
"php": ">=5.5.0",
@@ -1465,7 +1465,7 @@
"issues": "https://phabricator.wikimedia.org/";,
"irc": "irc://irc.freenode.net/wikidata"
},
- "time": "2016-08-05 20:23:00"
+ "time": "2016-08-08 10:27:54"
},
{
"name": "wikibase/quality",
@@ -1473,7 +1473,7 @@
"source": {
"type": "git",
"url":
"https://gerrit.wikimedia.org/r/mediawiki/extensions/WikibaseQuality";,
- "reference": "003ba2bd82cdc8e04a6197d4378b1016f0ef4abc"
+ "reference": "6f31cf2e63140f0abf021002f643af0b13b40efa"
},
"require": {
"php": ">=5.3.0",
@@ -1519,7 +1519,7 @@
"support": {
"issues":
"https://phabricator.wikimedia.org/project/profile/989/";
},
- "time": "2016-08-05 19:44:22"
+ "time": "2016-08-08 20:38:02"
},
{
"name": "wikibase/serialization-javascript",
@@ -1568,12 +1568,12 @@
"source": {
"type": "git",
"url":
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";,
- "reference": "c7fda6f6d56aac766660176dbec9b34549b82df8"
+ "reference": "02b7252c8ab1481e21300fe48231fb2ed35bf27a"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/c7fda6f6d56aac766660176dbec9b34549b82df8";,
- "reference": "c7fda6f6d56aac766660176dbec9b34549b82df8",
+ "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/02b7252c8ab1481e21300fe48231fb2ed35bf27a";,
+ "reference": "02b7252c8ab1481e21300fe48231fb2ed35bf27a",
"shasum": ""
},
"require": {
@@ -1645,7 +1645,7 @@
"wikibaserepo",
"wikidata"
],
- "time": "2016-08-07 20:48:25"
+ "time": "2016-08-09 00:19:58"
},
{
"name": "wikibase/wikimedia-badges",
diff --git a/extensions/ArticlePlaceholder/README.md
b/extensions/ArticlePlaceholder/README.md
index b04ea91..2489529 100644
--- a/extensions/ArticlePlaceholder/README.md
+++ b/extensions/ArticlePlaceholder/README.md
@@ -6,6 +6,8 @@
ArticlePlaceholder enables placeholder pages on Wikibase Client installations
using data of the repository.
+The file includes/Template/Wikidata-P18.xml shouldn't be used in production
but is for testing purposes.
+
## Installation
### Dependencies
diff --git a/extensions/ArticlePlaceholder/extension.json
b/extensions/ArticlePlaceholder/extension.json
index c6720cd..24da7e4 100644
--- a/extensions/ArticlePlaceholder/extension.json
+++ b/extensions/ArticlePlaceholder/extension.json
@@ -70,9 +70,6 @@
],
"SpecialSearchResultsAppend": [
"ArticlePlaceholder\\SearchHookHandler::onSpecialSearchResultsAppend"
- ],
- "UnitTestsList": [
- "ArticlePlaceholder\\Hooks::onUnitTestsList"
]
},
"config": {
diff --git a/extensions/ArticlePlaceholder/includes/Hooks.php
b/extensions/ArticlePlaceholder/includes/Hooks.php
index f349851..6e38f2b 100644
--- a/extensions/ArticlePlaceholder/includes/Hooks.php
+++ b/extensions/ArticlePlaceholder/includes/Hooks.php
@@ -40,11 +40,4 @@
}
}
- /**
- * @param string[] $files
- */
- public static function onUnitTestsList( array &$files ) {
- $files[] = __DIR__ . '/../tests/phpunit/';
- }
-
}
diff --git
a/extensions/ArticlePlaceholder/includes/Lua/Scribunto_LuaArticlePlaceholderLibrary.php
b/extensions/ArticlePlaceholder/includes/Lua/Scribunto_LuaArticlePlaceholderLibrary.php
index 35009a5..deea20f 100644
---
a/extensions/ArticlePlaceholder/includes/Lua/Scribunto_LuaArticlePlaceholderLibrary.php
+++
b/extensions/ArticlePlaceholder/includes/Lua/Scribunto_LuaArticlePlaceholderLibrary.php
@@ -58,4 +58,5 @@
__DIR__ .
'/mw.ext.articlePlaceholder.entityRenderer.lua', $lib, []
);
}
+
}
diff --git a/extensions/ArticlePlaceholder/includes/Template/Wikidata-P18.xml
b/extensions/ArticlePlaceholder/includes/Template/Wikidata-P18.xml
new file mode 100644
index 0000000..6eb8d49
--- /dev/null
+++ b/extensions/ArticlePlaceholder/includes/Template/Wikidata-P18.xml
@@ -0,0 +1,60 @@
+<mediawiki xmlns="http://www.mediawiki.org/xml/export-0.10/";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://www.mediawiki.org/xml/export-0.10/
http://www.mediawiki.org/xml/export-0.10.xsd"; version="0.10" xml:lang="en">
+ <siteinfo>
+ <sitename>Wikidata</sitename>
+ <dbname>wikidatawiki</dbname>
+ <base>https://www.wikidata.org/wiki/Wikidata:Main_Page</base>
+ <generator>MediaWiki 1.28.0-wmf.7</generator>
+ <case>first-letter</case>
+ <namespaces>
+ <namespace key="-2" case="first-letter">Media</namespace>
+ <namespace key="-1" case="first-letter">Special</namespace>
+ <namespace key="0" case="first-letter"/>
+ <namespace key="1" case="first-letter">Talk</namespace>
+ <namespace key="2" case="first-letter">User</namespace>
+ <namespace key="3" case="first-letter">User talk</namespace>
+ <namespace key="4" case="first-letter">Wikidata</namespace>
+ <namespace key="5" case="first-letter">Wikidata talk</namespace>
+ <namespace key="6" case="first-letter">File</namespace>
+ <namespace key="7" case="first-letter">File talk</namespace>
+ <namespace key="8" case="first-letter">MediaWiki</namespace>
+ <namespace key="9" case="first-letter">MediaWiki talk</namespace>
+ <namespace key="10" case="first-letter">Template</namespace>
+ <namespace key="11" case="first-letter">Template talk</namespace>
+ <namespace key="12" case="first-letter">Help</namespace>
+ <namespace key="13" case="first-letter">Help talk</namespace>
+ <namespace key="14" case="first-letter">Category</namespace>
+ <namespace key="15" case="first-letter">Category talk</namespace>
+ <namespace key="120" case="first-letter">Property</namespace>
+ <namespace key="121" case="first-letter">Property talk</namespace>
+ <namespace key="122" case="first-letter">Query</namespace>
+ <namespace key="123" case="first-letter">Query talk</namespace>
+ <namespace key="828" case="first-letter">Module</namespace>
+ <namespace key="829" case="first-letter">Module talk</namespace>
+ <namespace key="1198" case="first-letter">Translations</namespace>
+ <namespace key="1199" case="first-letter">Translations talk</namespace>
+ <namespace key="2300" case="first-letter">Gadget</namespace>
+ <namespace key="2301" case="first-letter">Gadget talk</namespace>
+ <namespace key="2302" case="case-sensitive">Gadget definition</namespace>
+ <namespace key="2303" case="case-sensitive">Gadget definition
talk</namespace>
+ <namespace key="2600" case="first-letter">Topic</namespace>
+ </namespaces>
+ </siteinfo>
+ <page>
+ <title>Property:P18</title>
+ <ns>120</ns>
+ <id>3917782</id>
+ <revision>
+ <id>349845191</id>
+ <parentid>349845185</parentid>
+ <timestamp>2016-06-22T11:03:04Z</timestamp>
+ <contributor>
+ <username>VASHGIRD</username>
+ <id>205345</id>
+ </contributor>
+ <comment>/* wbsetaliases-add:3|tg */ расм, тасвир, сурат</comment>
+ <model>wikibase-property</model>
+ <format>application/json</format>
+ <text xml:space="preserve"
bytes="33258">{"type":"property","datatype":"commonsMedia","id":"P18","labels":{"en":{"language":"en","value":"image"}},"claims":{}}</text>
+ </revision>
+ </page>
+</mediawiki>
diff --git
a/extensions/ArticlePlaceholder/includes/specials/SpecialAboutTopic.php
b/extensions/ArticlePlaceholder/includes/specials/SpecialAboutTopic.php
index bed4919..8709272 100644
--- a/extensions/ArticlePlaceholder/includes/specials/SpecialAboutTopic.php
+++ b/extensions/ArticlePlaceholder/includes/specials/SpecialAboutTopic.php
@@ -230,7 +230,7 @@
'id' => 'create-article-button',
'infusable' => true,
'label' => $this->msg(
'articleplaceholder-abouttopic-create-article-button' )->text(),
- 'href' => SpecialPage::getTitleFor( 'CreateTopicPage',
$labelTitle->getPrefixedText() )
+ 'href' => SpecialPage::getTitleFor( 'CreateTopicPage',
$labelTitle->getPrefixedText() )
->getLocalURL( [ 'ref' => 'button' ] ),
'target' => 'blank'
] );
diff --git
a/extensions/ArticlePlaceholder/includes/specials/SpecialCreateTopicPage.php
b/extensions/ArticlePlaceholder/includes/specials/SpecialCreateTopicPage.php
index 104bf7e..447d990 100644
--- a/extensions/ArticlePlaceholder/includes/specials/SpecialCreateTopicPage.php
+++ b/extensions/ArticlePlaceholder/includes/specials/SpecialCreateTopicPage.php
@@ -18,6 +18,7 @@
* @license GNU General Public Licence 2.0 or later
*/
class SpecialCreateTopicPage extends UnlistedSpecialPage {
+
public function __construct() {
parent::__construct( 'CreateTopicPage' );
}
@@ -107,4 +108,5 @@
->prepareForm()
->displayForm( false );
}
+
}
diff --git a/extensions/ArticlePlaceholder/phpcs.xml
b/extensions/ArticlePlaceholder/phpcs.xml
index 409f3eb..df524dd 100644
--- a/extensions/ArticlePlaceholder/phpcs.xml
+++ b/extensions/ArticlePlaceholder/phpcs.xml
@@ -1,11 +1,36 @@
<?xml version="1.0"?>
-<ruleset>
+<ruleset name="ArticlePlaceholder">
+ <!-- See
https://github.com/wikimedia/mediawiki-tools-codesniffer/blob/master/MediaWiki/ruleset.xml
-->
<rule ref="vendor/mediawiki/mediawiki-codesniffer/MediaWiki"/>
+
+ <rule ref="Generic.ControlStructures" />
+ <rule ref="Generic.PHP.CharacterBeforePHPOpeningTag" />
+
+ <rule ref="PSR1" />
+ <rule ref="PSR2.Files" />
+
+ <rule ref="Squiz.Classes.DuplicateProperty" />
+ <rule ref="Squiz.Classes.SelfMemberReference" />
+ <rule ref="Squiz.Classes.ValidClassName.NotCamelCaps">
+
<exclude-pattern>Scribunto_LuaArticlePlaceholderLibrary</exclude-pattern>
+ </rule>
+ <rule ref="Squiz.ControlStructures.ControlSignature" />
+ <rule ref="Squiz.Functions.FunctionDuplicateArgument" />
+ <rule ref="Squiz.Functions.GlobalFunction" />
+ <rule ref="Squiz.Scope" />
+ <rule ref="Squiz.WhiteSpace.FunctionSpacing">
+ <properties>
+ <property name="spacing" value="1" />
+ </properties>
+ </rule>
+ <rule ref="Squiz.WhiteSpace.OperatorSpacing">
+ <properties>
+ <property name="ignoreNewlines" value="true" />
+ </properties>
+ </rule>
+
<file>.</file>
<arg name="extensions" value="php,php5,inc"/>
<arg name="encoding" value="utf8"/>
<exclude-pattern>vendor</exclude-pattern>
- <rule ref="Squiz.Classes.ValidClassName.NotCamelCaps">
-
<exclude-pattern>Scribunto_LuaArticlePlaceholderLibrary</exclude-pattern>
- </rule>
</ruleset>
diff --git
a/extensions/MediaInfo/tests/phpunit/composer/DataModel/MediaInfoIdTest.php
b/extensions/MediaInfo/tests/phpunit/composer/DataModel/MediaInfoIdTest.php
index 98c5911..6a7ce91 100644
--- a/extensions/MediaInfo/tests/phpunit/composer/DataModel/MediaInfoIdTest.php
+++ b/extensions/MediaInfo/tests/phpunit/composer/DataModel/MediaInfoIdTest.php
@@ -9,6 +9,8 @@
/**
* @covers Wikibase\MediaInfo\DataModel\MediaInfoId
*
+ * @group WikibaseMediaInfo
+ *
* @license GPL-2.0+
* @author Bene* < [email protected] >
*/
diff --git
a/extensions/MediaInfo/tests/phpunit/composer/DataModel/MediaInfoTest.php
b/extensions/MediaInfo/tests/phpunit/composer/DataModel/MediaInfoTest.php
index 4875ba7..e8d9487 100644
--- a/extensions/MediaInfo/tests/phpunit/composer/DataModel/MediaInfoTest.php
+++ b/extensions/MediaInfo/tests/phpunit/composer/DataModel/MediaInfoTest.php
@@ -16,6 +16,8 @@
/**
* @covers Wikibase\MediaInfo\DataModel\MediaInfo
*
+ * @group WikibaseMediaInfo
+ *
* @license GPL-2.0+
* @author Bene* < [email protected] >
*/
diff --git
a/extensions/MediaInfo/tests/phpunit/composer/DataModel/Serialization/MediaInfoDeserializerTest.php
b/extensions/MediaInfo/tests/phpunit/composer/DataModel/Serialization/MediaInfoDeserializerTest.php
index fe22635..696b347 100644
---
a/extensions/MediaInfo/tests/phpunit/composer/DataModel/Serialization/MediaInfoDeserializerTest.php
+++
b/extensions/MediaInfo/tests/phpunit/composer/DataModel/Serialization/MediaInfoDeserializerTest.php
@@ -15,6 +15,8 @@
/**
* @covers Wikibase\MediaInfo\DataModel\Serialization}MediaInfoDeserializer
*
+ * @group WikibaseMediaInfo
+ *
* @license GPL-2.0+
* @author Bene* < [email protected] >
*/
diff --git
a/extensions/MediaInfo/tests/phpunit/composer/DataModel/Serialization/MediaInfoSerializerTest.php
b/extensions/MediaInfo/tests/phpunit/composer/DataModel/Serialization/MediaInfoSerializerTest.php
index 10be3df..542dd03 100644
---
a/extensions/MediaInfo/tests/phpunit/composer/DataModel/Serialization/MediaInfoSerializerTest.php
+++
b/extensions/MediaInfo/tests/phpunit/composer/DataModel/Serialization/MediaInfoSerializerTest.php
@@ -17,6 +17,8 @@
/**
* @covers Wikibase\MediaInfo\DataModel\Serialization\MediaInfoSerializer
*
+ * @group WikibaseMediaInfo
+ *
* @license GPL-2.0+
* @author Bene* < [email protected] >
*/
diff --git
a/extensions/MediaInfo/tests/phpunit/composer/DataModel/Services/Diff/MediaInfoDifferTest.php
b/extensions/MediaInfo/tests/phpunit/composer/DataModel/Services/Diff/MediaInfoDifferTest.php
index 8307cba..ed831d5 100644
---
a/extensions/MediaInfo/tests/phpunit/composer/DataModel/Services/Diff/MediaInfoDifferTest.php
+++
b/extensions/MediaInfo/tests/phpunit/composer/DataModel/Services/Diff/MediaInfoDifferTest.php
@@ -14,6 +14,8 @@
/**
* @covers Wikibase\MediaInfo\DataModel\Services\Diff\MediaInfoDiffer
*
+ * @group WikibaseMediaInfo
+ *
* @license GPL-2.0+
* @author Jeroen De Dauw < [email protected] >
* @author Thiemo Mättig
diff --git
a/extensions/MediaInfo/tests/phpunit/composer/DataModel/Services/Diff/MediaInfoPatcherTest.php
b/extensions/MediaInfo/tests/phpunit/composer/DataModel/Services/Diff/MediaInfoPatcherTest.php
index 46060cc..8157e93 100644
---
a/extensions/MediaInfo/tests/phpunit/composer/DataModel/Services/Diff/MediaInfoPatcherTest.php
+++
b/extensions/MediaInfo/tests/phpunit/composer/DataModel/Services/Diff/MediaInfoPatcherTest.php
@@ -18,6 +18,8 @@
/**
* @covers Wikibase\MediaInfo\DataModel\Services\Diff\MediaInfoPatcher
*
+ * @group WikibaseMediaInfo
+ *
* @license GPL-2.0+
* @author Jeroen De Dauw < [email protected] >
* @author Thiemo Mättig
diff --git
a/extensions/MediaInfo/tests/phpunit/mediawiki/Content/MediaInfoContentTest.php
b/extensions/MediaInfo/tests/phpunit/mediawiki/Content/MediaInfoContentTest.php
index 6f57d34..f2b10de 100644
---
a/extensions/MediaInfo/tests/phpunit/mediawiki/Content/MediaInfoContentTest.php
+++
b/extensions/MediaInfo/tests/phpunit/mediawiki/Content/MediaInfoContentTest.php
@@ -14,6 +14,8 @@
/**
* @covers Wikibase\MediaInfo\Content\MediaInfoContent
*
+ * @group WikibaseMediaInfo
+ *
* @license GPL-2.0+
* @author Bene* < [email protected] >
*/
diff --git
a/extensions/MediaInfo/tests/phpunit/mediawiki/Content/MediaInfoHandlerTest.php
b/extensions/MediaInfo/tests/phpunit/mediawiki/Content/MediaInfoHandlerTest.php
index 5d34787..3ef4e13 100644
---
a/extensions/MediaInfo/tests/phpunit/mediawiki/Content/MediaInfoHandlerTest.php
+++
b/extensions/MediaInfo/tests/phpunit/mediawiki/Content/MediaInfoHandlerTest.php
@@ -30,6 +30,8 @@
/**
* @covers Wikibase\MediaInfo\Content\MediaInfoHandler
*
+ * @group WikibaseMediaInfo
+ *
* @license GPL-2.0+
* @author Bene* < [email protected] >
*/
diff --git
a/extensions/MediaInfo/tests/phpunit/mediawiki/Content/MissingMediaInfoHandlerTest.php
b/extensions/MediaInfo/tests/phpunit/mediawiki/Content/MissingMediaInfoHandlerTest.php
index 7784c29..50ed95e 100644
---
a/extensions/MediaInfo/tests/phpunit/mediawiki/Content/MissingMediaInfoHandlerTest.php
+++
b/extensions/MediaInfo/tests/phpunit/mediawiki/Content/MissingMediaInfoHandlerTest.php
@@ -19,6 +19,8 @@
/**
* @covers Wikibase\MediaInfo\Content\MissingMediaInfoHandler
*
+ * @group WikibaseMediaInfo
+ *
* @license GPL-2.0+
* @author DanielKinzler
*/
diff --git a/extensions/MediaInfo/tests/phpunit/mediawiki/EntityTypesTest.php
b/extensions/MediaInfo/tests/phpunit/mediawiki/EntityTypesTest.php
index 75f4694..dcab28d 100644
--- a/extensions/MediaInfo/tests/phpunit/mediawiki/EntityTypesTest.php
+++ b/extensions/MediaInfo/tests/phpunit/mediawiki/EntityTypesTest.php
@@ -20,6 +20,8 @@
/**
* @covers WikibaseMediaInfo.entitytypes.php
*
+ * @group WikibaseMediaInfo
+ *
* @license GPL-2.0+
* @author Bene* < [email protected] >
*/
diff --git
a/extensions/MediaInfo/tests/phpunit/mediawiki/Services/FilePageLookupTest.php
b/extensions/MediaInfo/tests/phpunit/mediawiki/Services/FilePageLookupTest.php
index 109fa8b..0de23c0 100644
---
a/extensions/MediaInfo/tests/phpunit/mediawiki/Services/FilePageLookupTest.php
+++
b/extensions/MediaInfo/tests/phpunit/mediawiki/Services/FilePageLookupTest.php
@@ -11,6 +11,8 @@
/**
* @covers Wikibase\MediaInfo\IdLookup\FilePageLookup
*
+ * @group WikibaseMediaInfo
+ *
* @license GPL-2.0+
* @author Daniel Kinzler
*/
diff --git
a/extensions/MediaInfo/tests/phpunit/mediawiki/Services/MediaInfoIdLookupTest.php
b/extensions/MediaInfo/tests/phpunit/mediawiki/Services/MediaInfoIdLookupTest.php
index 3dae0cb..6c5e7e8 100644
---
a/extensions/MediaInfo/tests/phpunit/mediawiki/Services/MediaInfoIdLookupTest.php
+++
b/extensions/MediaInfo/tests/phpunit/mediawiki/Services/MediaInfoIdLookupTest.php
@@ -10,6 +10,8 @@
/**
* @covers Wikibase\MediaInfo\IdLookup\MediaInfoIdLookup
*
+ * @group WikibaseMediaInfo
+ *
* @license GPL-2.0+
* @author Daniel Kinzler
*/
diff --git
a/extensions/MediaInfo/tests/phpunit/mediawiki/Services/MediaInfoServicesTest.php
b/extensions/MediaInfo/tests/phpunit/mediawiki/Services/MediaInfoServicesTest.php
index a4b65bc..4b310f6 100644
---
a/extensions/MediaInfo/tests/phpunit/mediawiki/Services/MediaInfoServicesTest.php
+++
b/extensions/MediaInfo/tests/phpunit/mediawiki/Services/MediaInfoServicesTest.php
@@ -9,6 +9,8 @@
/**
* @covers Wikibase\MediaInfo\Services\MediaInfoServices
*
+ * @group WikibaseMediaInfo
+ *
* @license GPL-2.0+
* @author Daniel Kinzler
*/
diff --git
a/extensions/MediaInfo/tests/phpunit/mediawiki/View/MediaInfoViewTest.php
b/extensions/MediaInfo/tests/phpunit/mediawiki/View/MediaInfoViewTest.php
index afa59dc..3f59b36 100644
--- a/extensions/MediaInfo/tests/phpunit/mediawiki/View/MediaInfoViewTest.php
+++ b/extensions/MediaInfo/tests/phpunit/mediawiki/View/MediaInfoViewTest.php
@@ -26,6 +26,8 @@
/**
* @covers Wikibase\MediaInfo\View\MediaInfoView
*
+ * @group WikibaseMediaInfo
+ *
* @license GPL-2.0+
* @author Adrian Heine < [email protected] >
*/
diff --git
a/extensions/MediaInfo/tests/phpunit/mediawiki/WikibaseMediaInfoHooksTest.php
b/extensions/MediaInfo/tests/phpunit/mediawiki/WikibaseMediaInfoHooksTest.php
index c56af6c..10dc376 100644
---
a/extensions/MediaInfo/tests/phpunit/mediawiki/WikibaseMediaInfoHooksTest.php
+++
b/extensions/MediaInfo/tests/phpunit/mediawiki/WikibaseMediaInfoHooksTest.php
@@ -11,6 +11,8 @@
/**
* @covers Wikibase\MediaInfo\WikibaseMediaInfoHooks
*
+ * @group WikibaseMediaInfo
+ *
* @license GPL-2.0+
* @author Bene* < [email protected] >
*/
diff --git a/extensions/Quality/i18n/sl.json b/extensions/Quality/i18n/sl.json
new file mode 100644
index 0000000..a917642
--- /dev/null
+++ b/extensions/Quality/i18n/sl.json
@@ -0,0 +1,9 @@
+{
+ "@metadata": {
+ "authors": [
+ "Eleassar"
+ ]
+ },
+ "wbq-violations-next-page": "Naslednja stran >>",
+ "wbq-violations-prev-page": "<< Prejšnja stran"
+}
diff --git a/extensions/Wikibase/client/i18n/gl.json
b/extensions/Wikibase/client/i18n/gl.json
index 7b11d5a..1b55962 100644
--- a/extensions/Wikibase/client/i18n/gl.json
+++ b/extensions/Wikibase/client/i18n/gl.json
@@ -81,5 +81,6 @@
"echo-category-title-wikibase-action":
"{{PLURAL:$1|Conexión|Conexións}} con {{WBREPONAME}}",
"echo-pref-tooltip-wikibase-action": "Avisarme cando alguén conecte
unha páxina que {{GENDER:|eu creei}} a un elemento de {{WBREPONAME}}.",
"notification-header-page-connection": "A páxina <strong>$3</strong>
foi {{GENDER:$2|conectada}} a un elemento de {{WBREPONAME}} .",
- "notification-link-text-view-item": "{{GENDER:$1|Ver}} elemento"
+ "notification-link-text-view-item": "{{GENDER:$1|Ver}} elemento",
+ "notification-subject-page-connection": "Unha páxina de {{SITENAME}}
que {{GENDER:$3|creaches}} foi {{GENDER:$2|conectada}} cun obxecto
{{WBREPONAME}}"
}
diff --git a/extensions/Wikibase/client/includes/Changes/ChangeRunCoalescer.php
b/extensions/Wikibase/client/includes/Changes/ChangeRunCoalescer.php
index d4bd60d..a553f46 100644
--- a/extensions/Wikibase/client/includes/Changes/ChangeRunCoalescer.php
+++ b/extensions/Wikibase/client/includes/Changes/ChangeRunCoalescer.php
@@ -5,6 +5,7 @@
use Exception;
use MWException;
use Wikibase\Change;
+use Wikibase\DataModel\Entity\EntityId;
use Wikibase\EntityChange;
use Wikibase\ItemChange;
use Wikibase\Lib\Changes\EntityChangeFactory;
@@ -65,8 +66,9 @@
$coalesced = array();
$changesByEntity = $this->groupChangesByEntity( $changes );
+ /** @var EntityChange[] $entityChanges */
foreach ( $changesByEntity as $entityChanges ) {
- $entityChanges = $this->coalesceRuns( $entityChanges );
+ $entityChanges = $this->coalesceRuns(
$entityChanges[0]->getEntityId(), $entityChanges );
$coalesced = array_merge( $coalesced, $entityChanges );
}
@@ -110,15 +112,14 @@
* If $changes is empty, this method returns null. If $changes contains
exactly one change,
* that change is returned. Otherwise, a combined change is returned.
*
+ * @param EntityId $entityId
* @param EntityChange[] $changes The changes to combine.
*
* @throws MWException
* @return Change a combined change representing the activity from all
the original changes.
*/
- private function mergeChanges( array $changes ) {
- if ( empty( $changes ) ) {
- return null;
- } elseif ( count( $changes ) === 1 ) {
+ private function mergeChanges( EntityId $entityId, array $changes ) {
+ if ( count( $changes ) === 1 ) {
return reset( $changes );
}
@@ -146,8 +147,6 @@
$lastmeta = $last->getMetadata();
$firstmeta = $first->getMetadata();
- $entityId = $first->getEntityId();
-
$parentRevId = $firstmeta['parent_id'];
$latestRevId = $lastmeta['rev_id'];
@@ -171,7 +170,6 @@
array(
'revision_id' => $last->getField( 'revision_id'
),
'user_id' => $last->getField( 'user_id' ),
- 'object_id' => $last->getField( 'object_id' ),
'time' => $last->getField( 'time' ),
)
);
@@ -197,22 +195,22 @@
/**
* Coalesce consecutive changes by the same user to the same entity
into one.
+ *
* A run of changes may be broken if the action performed changes (e.g.
deletion
* instead of update) or if a sitelink pointing to the local wiki was
modified.
*
* Some types of actions, like deletion, will break runs.
- * Interleaved changes to different items will break runs.
*
+ * @param EntityId $entityId
* @param EntityChange[] $changes
*
- * @return EntityChange[] grouped changes
+ * @return Change[] grouped changes
*/
- private function coalesceRuns( array $changes ) {
+ private function coalesceRuns( EntityId $entityId, array $changes ) {
$coalesced = array();
$currentRun = array();
$currentUser = null;
- $currentEntity = null;
$currentAction = null;
$breakNext = false;
@@ -221,12 +219,10 @@
$action = $change->getAction();
$meta = $change->getMetadata();
$user = $meta['user_text'];
- $entityId =
$change->getEntityId()->__toString();
$break = $breakNext
|| $currentAction !== $action
- || $currentUser !== $user
- || $currentEntity !== $entityId;
+ || $currentUser !== $user;
$breakNext = false;
@@ -242,7 +238,7 @@
if ( $break ) {
if ( !empty( $currentRun ) ) {
try {
- $coalesced[] =
$this->mergeChanges( $currentRun );
+ $coalesced[] =
$this->mergeChanges( $entityId, $currentRun );
} catch ( MWException $ex ) {
// Something went wrong
while trying to merge the changes.
// Just keep the
original run.
@@ -253,7 +249,6 @@
$currentRun = array();
$currentUser = $user;
- $currentEntity = $entityId;
$currentAction = $action ===
EntityChange::ADD ? EntityChange::UPDATE : $action;
}
@@ -266,7 +261,7 @@
if ( !empty( $currentRun ) ) {
try {
- $coalesced[] = $this->mergeChanges( $currentRun
);
+ $coalesced[] = $this->mergeChanges( $entityId,
$currentRun );
} catch ( MWException $ex ) {
// Something went wrong while trying to merge
the changes.
// Just keep the original run.
diff --git
a/extensions/Wikibase/client/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseLibrary.php
b/extensions/Wikibase/client/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseLibrary.php
index 6b1a57d..aadd17c 100644
---
a/extensions/Wikibase/client/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseLibrary.php
+++
b/extensions/Wikibase/client/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseLibrary.php
@@ -19,7 +19,6 @@
use Wikibase\DataModel\Entity\EntityIdParsingException;
use Wikibase\DataModel\SerializerFactory;
use Wikibase\DataModel\Services\Lookup\EntityAccessLimitException;
-use Wikibase\DataModel\Services\Lookup\EntityRetrievingTermLookup;
use Wikibase\LanguageFallbackChain;
use Wikibase\Lib\SnakFormatter;
use Wikibase\Lib\Store\LanguageFallbackLabelDescriptionLookup;
@@ -246,12 +245,11 @@
private function newLuaBindings() {
$wikibaseClient = WikibaseClient::getDefaultInstance();
- $entityLookup = $wikibaseClient->getStore()->getEntityLookup();
$usageAccumulator = $this->getUsageAccumulator();
$labelDescriptionLookup = new
LanguageFallbackLabelDescriptionLookup(
new UsageTrackingTermLookup(
- new EntityRetrievingTermLookup( $entityLookup ),
+ $wikibaseClient->getTermLookup(),
$usageAccumulator
),
$this->getLanguageFallbackChain()
@@ -259,7 +257,7 @@
return new WikibaseLuaBindings(
$wikibaseClient->getEntityIdParser(),
- $entityLookup,
+ $wikibaseClient->getStore()->getEntityLookup(),
$wikibaseClient->getStore()->getSiteLinkLookup(),
$wikibaseClient->getSettings(),
$labelDescriptionLookup,
diff --git a/extensions/Wikibase/client/includes/WikibaseClient.php
b/extensions/Wikibase/client/includes/WikibaseClient.php
index 11752fe..8b473b2 100644
--- a/extensions/Wikibase/client/includes/WikibaseClient.php
+++ b/extensions/Wikibase/client/includes/WikibaseClient.php
@@ -526,6 +526,23 @@
}
/**
+ * Overrides the TermLookup to be used.
+ * This is intended for use by test cases.
+ *
+ * @param TermLookup|null $lookup
+ *
+ * @throws LogicException If MW_PHPUNIT_TEST is not defined, to avoid
this
+ * method being abused in production code.
+ */
+ public function overrideTermLookup( TermLookup $lookup = null ) {
+ if ( !defined( 'MW_PHPUNIT_TEST' ) ) {
+ throw new LogicException( 'Overriding TermLookup is
only supported in test mode' );
+ }
+
+ $this->termLookup = $lookup;
+ }
+
+ /**
* @since 0.4
*
* @return Language
diff --git
a/extensions/Wikibase/client/tests/phpunit/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseLibraryTestCase.php
b/extensions/Wikibase/client/tests/phpunit/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseLibraryTestCase.php
index c252ea2..f8e41ab 100644
---
a/extensions/Wikibase/client/tests/phpunit/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseLibraryTestCase.php
+++
b/extensions/Wikibase/client/tests/phpunit/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseLibraryTestCase.php
@@ -10,6 +10,7 @@
use Wikibase\Client\Tests\DataAccess\WikibaseDataAccessTestItemSetUpHelper;
use Wikibase\Client\WikibaseClient;
use Wikibase\DataModel\Services\Lookup\EntityLookup;
+use Wikibase\DataModel\Services\Lookup\EntityRetrievingTermLookup;
use Wikibase\Test\MockClientStore;
if ( !class_exists( Scribunto_LuaEngineTestBase::class ) ) {
@@ -63,9 +64,15 @@
$wikibaseClient = WikibaseClient::getDefaultInstance( 'reset' );
$store = new MockClientStore( 'de' );
- $store->setEntityLookup( static::getEntityLookup() );
+ $entityLookup = static::getEntityLookup();
+ $store->setEntityLookup( $entityLookup );
$wikibaseClient->overrideStore( $store );
+ // Create a term lookup from the ovewritten EntityLookup or the
MockClientStore one
+ $wikibaseClient->overrideTermLookup(
+ new EntityRetrievingTermLookup( $entityLookup ?:
$store->getEntityLookup() )
+ );
+
$settings = $wikibaseClient->getSettings();
if ( self::$oldAllowArbitraryDataAccess === null ) {
// Only need to set this once, as this is supposed to
be the original value
diff --git
a/extensions/Wikibase/client/tests/phpunit/includes/RecentChanges/RecentChangeFactoryTest.php
b/extensions/Wikibase/client/tests/phpunit/includes/RecentChanges/RecentChangeFactoryTest.php
index 97051bd..a3d3ca4 100644
---
a/extensions/Wikibase/client/tests/phpunit/includes/RecentChanges/RecentChangeFactoryTest.php
+++
b/extensions/Wikibase/client/tests/phpunit/includes/RecentChanges/RecentChangeFactoryTest.php
@@ -262,7 +262,20 @@
$this->assertEquals( $expected, $actual, 'attributes' );
}
- private function makeItemChangeFromMetaData( $action, Diff $diff, array
$fields = array(), array $metadata = array() ) {
+ /**
+ * @param string $action
+ * @param Diff $diff
+ * @param array $fields
+ * @param array $metadata
+ *
+ * @return EntityChange
+ */
+ private function makeItemChangeFromMetaData(
+ $action,
+ Diff $diff,
+ array $fields,
+ array $metadata
+ ) {
$fields = array_merge( array(
'id' => '13',
'time' => '20150202030303',
@@ -303,8 +316,8 @@
$expectedComment,
$action,
Diff $diff,
- array $fields = array(),
- array $metadata = array()
+ array $fields,
+ array $metadata
) {
//@todo: also check pre-generated HTML when I5439a76c is merged
diff --git a/extensions/Wikibase/lib/i18n/bn.json
b/extensions/Wikibase/lib/i18n/bn.json
index 4b5a0fb..6c6779d 100644
--- a/extensions/Wikibase/lib/i18n/bn.json
+++ b/extensions/Wikibase/lib/i18n/bn.json
@@ -13,8 +13,8 @@
"wikibase-deletedentity-item": "আইটেম অপসারণ করা হয়েছে",
"wikibase-deletedentity-property": "বৈশিষ্ট্য অপসারিত হয়েছে",
"wikibase-error-unexpected": "ত্রুটি: $1।",
- "wikibase-error-save-generic": "সংরক্ষণ করার সময় একটি ত্রুটি দেখা
দিয়েছে। আপনার পরিবর্তনগুলো সম্পন্ন হয়নি।",
- "wikibase-error-remove-generic": "অপসারণ কার্য সম্পাদনার সময় একটি
ত্রুটি দেখা দিয়েছে। আপনার পরিবর্তনগুলো সম্পন্ন হয়নি।",
+ "wikibase-error-save-generic": "একটি ত্রুটির কারণে সংরক্ষণ করা যায়নি।",
+ "wikibase-error-remove-generic": "একটি ত্রুটির কারণে সরানো যায়নি।",
"wikibase-error-save-connection": "সংরক্ষণের সময় একটি যোগাযোগ ত্রুটি
দেখা দিয়েছে। আপনার পরিবর্তনগুলো সম্পন্ন হয়নি। অনুগ্রহ করে আপনার ইন্টারনেট
সংযোগটি পরীক্ষা করুন।",
"wikibase-error-remove-connection": "অপসারণের সময় একটি যোগাযোগ ত্রুটি
দেখা দিয়েছে। আপনার পরিবর্তনগুলো সম্পন্ন হয়নি। অনুগ্রহ করে আপনার ইন্টারনেট
সংযোগটি পরীক্ষা করুন।",
"wikibase-error-autocomplete-response": "সার্ভারের প্রতিক্রিয়া: $1",
diff --git a/extensions/Wikibase/lib/i18n/gl.json
b/extensions/Wikibase/lib/i18n/gl.json
index ea013ee..68ed174 100644
--- a/extensions/Wikibase/lib/i18n/gl.json
+++ b/extensions/Wikibase/lib/i18n/gl.json
@@ -4,7 +4,8 @@
"Toliño",
"Chairego apc",
"Macofe",
- "Elisardojm"
+ "Elisardojm",
+ "Banjo"
]
},
"wikibase-lib-desc": "Contén funcionalidades comúns para as extensións
Wikibase e Wikibase Client",
@@ -13,10 +14,10 @@
"wikibase-deletedentity-property": "Propiedade borrada",
"wikibase-deletedentity-query": "Pescuda borrada",
"wikibase-error-unexpected": "Erro: $1.",
- "wikibase-error-save-generic": "Houbo un erro ao levar a cabo o
gardado. Non se puideron completar os cambios.",
- "wikibase-error-remove-generic": "Houbo un erro ao levar a cabo a
eliminación. Non se puideron completar os cambios.",
- "wikibase-error-save-connection": "Houbo un erro na conexión ao levar a
cabo o gardado. Non se puideron completar os cambios. Comprobe a súa conexión á
internet.",
- "wikibase-error-remove-connection": "Houbo un erro na conexión ao levar
a cabo a eliminación. Non se puideron completar os cambios. Comprobe a súa
conexión á internet.",
+ "wikibase-error-save-generic": "Non se puido gardar por mor dun erro.",
+ "wikibase-error-remove-generic": "Non se puido eliminar por mor dun
erro.",
+ "wikibase-error-save-connection": "Non se puido gardar por mor dun erro
de conexión. Por favor, comproba a túa conexión de internet.",
+ "wikibase-error-remove-connection": "Non se puido eliminar por mor dun
erro de conexión. Por favor, comproba a túa conexión de internet.",
"wikibase-error-save-timeout": "Estamos experimentando dificultades
técnicas. Non se puido completar o gardado.",
"wikibase-error-remove-timeout": "Estamos experimentando dificultades
técnicas. Non se puido completar a eliminación.",
"wikibase-error-autocomplete-connection": "Non se puido pescudar na API
do sitio. Inténteo de novo máis tarde.",
diff --git a/extensions/Wikibase/lib/i18n/ru.json
b/extensions/Wikibase/lib/i18n/ru.json
index b1fe772..d1bd47d 100644
--- a/extensions/Wikibase/lib/i18n/ru.json
+++ b/extensions/Wikibase/lib/i18n/ru.json
@@ -8,7 +8,8 @@
"Ole Yves",
"ShinePhantom",
"Александр Сигачёв",
- "Macofe"
+ "Macofe",
+ "Mailman"
]
},
"wikibase-lib-desc": "Общие функции расширений Wikibase и Wikibase
Client",
@@ -17,7 +18,7 @@
"wikibase-deletedentity-property": "Удалённое свойство",
"wikibase-deletedentity-query": "Удалённый запрос",
"wikibase-error-unexpected": "Ошибка: $1.",
- "wikibase-error-save-generic": "При сохранении произошла ошибка. Ваши
изменения не могут быть завершены.",
+ "wikibase-error-save-generic": "Не удалось сохранить из-за возникшей
ошибки.",
"wikibase-error-remove-generic": "Произошла ошибка при попытке
выполнить удаление. Ваши изменения не могут быть завершены.",
"wikibase-error-save-connection": "При попытке выполнить сохранение
произошла ошибка подключения. Ваши изменения не могут быть завершены.
Пожалуйста, проверьте своё подключение к интернету.",
"wikibase-error-remove-connection": "При попытке выполнить удаление
произошла ошибка подключения. Ваши изменения не могут быть завершены.
Пожалуйста, проверьте своё подключение к интернету.",
diff --git a/extensions/Wikibase/lib/tests/phpunit/Store/TermIndexTest.php
b/extensions/Wikibase/lib/tests/phpunit/Store/TermIndexTest.php
index dcad9b3..6afeb81 100644
--- a/extensions/Wikibase/lib/tests/phpunit/Store/TermIndexTest.php
+++ b/extensions/Wikibase/lib/tests/phpunit/Store/TermIndexTest.php
@@ -805,15 +805,53 @@
"expected to find $k in terms for item" );
}
- protected function assertTermExists( TermIndex $termIndex, $text,
$termType = null, $language = null, $entityType = null ) {
- $this->assertTrue( $this->termExists( $termIndex, $text,
$termType, $language, $entityType ) );
+ /**
+ * @param TermIndex $termIndex
+ * @param string $text
+ * @param string|null $termType
+ * @param string|null $language
+ * @param string|null $entityType
+ */
+ private function assertTermExists(
+ TermIndex $termIndex,
+ $text,
+ $termType = null,
+ $language = null,
+ $entityType = null
+ ) {
+ $this->assertTrue(
+ $this->termExists( $termIndex, $text, $termType,
$language, $entityType ),
+ "Term \"$text\" should exist"
+ );
}
- protected function assertNotTermExists( TermIndex $termIndex, $text,
$termType = null, $language = null, $entityType = null ) {
- $this->assertFalse( $this->termExists( $termIndex, $text,
$termType, $language, $entityType ) );
+ /**
+ * @param TermIndex $termIndex
+ * @param string $text
+ */
+ private function assertNotTermExists( TermIndex $termIndex, $text ) {
+ $this->assertFalse(
+ $this->termExists( $termIndex, $text ),
+ "Term \"$text\" should not exist"
+ );
}
- private function termExists( TermIndex $termIndex, $text, $termType =
null, $language = null, $entityType = null ) {
+ /**
+ * @param TermIndex $termIndex
+ * @param string $text
+ * @param string|null $termType
+ * @param string|null $language
+ * @param string|null $entityType
+ *
+ * @return bool
+ */
+ private function termExists(
+ TermIndex $termIndex,
+ $text,
+ $termType = null,
+ $language = null,
+ $entityType = null
+ ) {
$termFields = array();
$termFields['termText'] = $text;
@@ -821,7 +859,11 @@
$termFields['termLanguage'] = $language;
}
- $matches = $termIndex->getMatchingTerms( array( new
TermIndexEntry( $termFields ) ), $termType, $entityType );
+ $matches = $termIndex->getMatchingTerms(
+ array( new TermIndexEntry( $termFields ) ),
+ $termType,
+ $entityType
+ );
return !empty( $matches );
}
diff --git a/extensions/Wikibase/repo/i18n/bn.json
b/extensions/Wikibase/repo/i18n/bn.json
index b25d08f..4c7eb48 100644
--- a/extensions/Wikibase/repo/i18n/bn.json
+++ b/extensions/Wikibase/repo/i18n/bn.json
@@ -28,7 +28,7 @@
"wikibase-entitytermsforlanguagelistview-description": "বিবরণ",
"wikibase-entitytermsforlanguagelistview-label": "লেবেল",
"wikibase-entitytermsforlanguagelistview-language": "ভাষা",
- "wikibase-entitytermsforlanguagelistview-more": "আরও ভাষা",
+ "wikibase-entitytermsforlanguagelistview-more": "সকল অন্তর্ভুক্ত ভাষা",
"wikibase-entitytermsforlanguagelistview-less": "কম ভাষা",
"wikibase-label-empty": "কোনো লেবেল নেই",
"wikibase-label-edit-placeholder": "লেবেল লিখুন",
diff --git a/extensions/Wikibase/repo/i18n/cs.json
b/extensions/Wikibase/repo/i18n/cs.json
index 301f71b..28fd4eb 100644
--- a/extensions/Wikibase/repo/i18n/cs.json
+++ b/extensions/Wikibase/repo/i18n/cs.json
@@ -39,7 +39,7 @@
"wikibase-entitytermsforlanguagelistview-description": "Popis",
"wikibase-entitytermsforlanguagelistview-label": "Štítek",
"wikibase-entitytermsforlanguagelistview-language": "Jazyk",
- "wikibase-entitytermsforlanguagelistview-more": "Více jazyků",
+ "wikibase-entitytermsforlanguagelistview-more": "Všechny zadané jazyky",
"wikibase-entitytermsforlanguagelistview-less": "Méně jazyků",
"wikibase-label-empty": "Štítek nebyl definován",
"wikibase-label-edit-placeholder": "vložte štítek",
diff --git a/extensions/Wikibase/repo/i18n/en.json
b/extensions/Wikibase/repo/i18n/en.json
index 9ad8e05..d4ac28b 100644
--- a/extensions/Wikibase/repo/i18n/en.json
+++ b/extensions/Wikibase/repo/i18n/en.json
@@ -520,6 +520,7 @@
"apihelp-wbsearchentities-example-1": "Search for \"abc\" in English
language, with defaults for type and limit",
"apihelp-wbsearchentities-example-2": "Search for \"abc\" in English
language with a limit of 50",
"apihelp-wbsearchentities-example-3": "Search for \"alphabet\" in
English language for type property",
+ "apihelp-wbsearchentities-example-4": "Search for \"abc\" in English
language with a limit of 2 and an offset of 2",
"apihelp-query+wbsearch-description": "Searches for entities using
labels and aliases.\nThis can be used as a generator for other
queries.\nReturns the matched term that should be displayed.",
"apihelp-query+wbsearch-param-search": "Search for this text.",
"apihelp-query+wbsearch-param-language": "Search in this language.",
diff --git a/extensions/Wikibase/repo/i18n/eu.json
b/extensions/Wikibase/repo/i18n/eu.json
index c846e56..6041afd 100644
--- a/extensions/Wikibase/repo/i18n/eu.json
+++ b/extensions/Wikibase/repo/i18n/eu.json
@@ -23,7 +23,7 @@
"wikibase-entitytermsforlanguagelistview-description": "Deskribapena",
"wikibase-entitytermsforlanguagelistview-label": "Etiketa",
"wikibase-entitytermsforlanguagelistview-language": "Hizkuntza",
- "wikibase-entitytermsforlanguagelistview-more": "Hizkuntza gehiago",
+ "wikibase-entitytermsforlanguagelistview-more": "Sartutako hizkuntza
guztiak",
"wikibase-label-empty": "Ez da etiketarik zehaztu",
"wikibase-label-edit-placeholder": "Sartu etiketa bat",
"wikibase-description-empty": "Ez dago difinituriko deskribapenik",
diff --git a/extensions/Wikibase/repo/i18n/gl.json
b/extensions/Wikibase/repo/i18n/gl.json
index 79a9f36..12143b9 100644
--- a/extensions/Wikibase/repo/i18n/gl.json
+++ b/extensions/Wikibase/repo/i18n/gl.json
@@ -32,7 +32,7 @@
"wikibase-entitytermsforlanguagelistview-description": "Descrición",
"wikibase-entitytermsforlanguagelistview-label": "Etiqueta",
"wikibase-entitytermsforlanguagelistview-language": "Lingua",
- "wikibase-entitytermsforlanguagelistview-more": "Máis linguas",
+ "wikibase-entitytermsforlanguagelistview-more": "Todas as linguas
introducidas",
"wikibase-entitytermsforlanguagelistview-less": "Menos linguas",
"wikibase-label-empty": "Non hai ningunha etiqueta definida",
"wikibase-label-edit-placeholder": "escriba unha etiqueta",
diff --git a/extensions/Wikibase/repo/i18n/he.json
b/extensions/Wikibase/repo/i18n/he.json
index 839d550..9a5374e 100644
--- a/extensions/Wikibase/repo/i18n/he.json
+++ b/extensions/Wikibase/repo/i18n/he.json
@@ -34,7 +34,7 @@
"wikibase-entitytermsforlanguagelistview-description": "תיאור",
"wikibase-entitytermsforlanguagelistview-label": "תווית",
"wikibase-entitytermsforlanguagelistview-language": "שפה",
- "wikibase-entitytermsforlanguagelistview-more": "עוד שפות",
+ "wikibase-entitytermsforlanguagelistview-more": "כל השפות שהוכנסו",
"wikibase-entitytermsforlanguagelistview-less": "פחות שפות",
"wikibase-label-empty": "לא הוגדרה תווית",
"wikibase-label-edit-placeholder": "נא להזין תווית",
diff --git a/extensions/Wikibase/repo/i18n/ko.json
b/extensions/Wikibase/repo/i18n/ko.json
index e9639d6..bfe8803 100644
--- a/extensions/Wikibase/repo/i18n/ko.json
+++ b/extensions/Wikibase/repo/i18n/ko.json
@@ -36,7 +36,7 @@
"wikibase-entitytermsforlanguagelistview-description": "설명",
"wikibase-entitytermsforlanguagelistview-label": "레이블",
"wikibase-entitytermsforlanguagelistview-language": "언어",
- "wikibase-entitytermsforlanguagelistview-more": "더 많은 언어",
+ "wikibase-entitytermsforlanguagelistview-more": "입력된 모든 언어",
"wikibase-entitytermsforlanguagelistview-less": "더 적은 언어",
"wikibase-label-empty": "정의한 레이블이 없습니다.",
"wikibase-label-edit-placeholder": "레이블 입력",
diff --git a/extensions/Wikibase/repo/i18n/pl.json
b/extensions/Wikibase/repo/i18n/pl.json
index 2389026..49c61cf 100644
--- a/extensions/Wikibase/repo/i18n/pl.json
+++ b/extensions/Wikibase/repo/i18n/pl.json
@@ -40,7 +40,7 @@
"wikibase-entitytermsforlanguagelistview-description": "Opis",
"wikibase-entitytermsforlanguagelistview-label": "Etykieta",
"wikibase-entitytermsforlanguagelistview-language": "Język",
- "wikibase-entitytermsforlanguagelistview-more": "Więcej języków",
+ "wikibase-entitytermsforlanguagelistview-more": "Wszystkie wprowadzone
języki",
"wikibase-entitytermsforlanguagelistview-less": "Mniej języków",
"wikibase-label-empty": "Etykieta nie została podana",
"wikibase-label-edit-placeholder": "podaj etykietę",
diff --git a/extensions/Wikibase/repo/i18n/pt.json
b/extensions/Wikibase/repo/i18n/pt.json
index 75aeba7..2a94caf 100644
--- a/extensions/Wikibase/repo/i18n/pt.json
+++ b/extensions/Wikibase/repo/i18n/pt.json
@@ -36,7 +36,7 @@
"wikibase-entitytermsforlanguagelistview-description": "Descrição",
"wikibase-entitytermsforlanguagelistview-label": "Rótulo",
"wikibase-entitytermsforlanguagelistview-language": "Idioma",
- "wikibase-entitytermsforlanguagelistview-more": "Mais idiomas",
+ "wikibase-entitytermsforlanguagelistview-more": "Todos os idiomas
introduzidos",
"wikibase-entitytermsforlanguagelistview-less": "Menos idiomas",
"wikibase-label-empty": "Nenhum rótulo definido",
"wikibase-label-edit-placeholder": "introduza um rótulo",
diff --git a/extensions/Wikibase/repo/i18n/qqq.json
b/extensions/Wikibase/repo/i18n/qqq.json
index b2c3cfb..2895782 100644
--- a/extensions/Wikibase/repo/i18n/qqq.json
+++ b/extensions/Wikibase/repo/i18n/qqq.json
@@ -551,6 +551,7 @@
"apihelp-wbsearchentities-example-1":
"{{doc-apihelp-example|wbsearchentities}}",
"apihelp-wbsearchentities-example-2":
"{{doc-apihelp-example|wbsearchentities}}",
"apihelp-wbsearchentities-example-3":
"{{doc-apihelp-example|wbsearchentities}}",
+ "apihelp-wbsearchentities-example-4":
"{{doc-apihelp-example|wbsearchentities}}",
"apihelp-query+wbsearch-description":
"{{doc-apihelp-description|query+wbsearch}}",
"apihelp-query+wbsearch-param-search":
"{{doc-apihelp-param|query+wbsearch|search}}",
"apihelp-query+wbsearch-param-language":
"{{doc-apihelp-param|query+wbsearch|language}}",
diff --git a/extensions/Wikibase/repo/i18n/ru.json
b/extensions/Wikibase/repo/i18n/ru.json
index 499daee..4123e32 100644
--- a/extensions/Wikibase/repo/i18n/ru.json
+++ b/extensions/Wikibase/repo/i18n/ru.json
@@ -23,7 +23,8 @@
"Mariya",
"Frhdkazan",
"Ядерный Трамвай",
- "Adam-Yourist"
+ "Adam-Yourist",
+ "Mailman"
]
},
"wikibase-desc": "Хранилище структурированных данных",
@@ -47,7 +48,7 @@
"wikibase-entitytermsforlanguagelistview-description": "Описание",
"wikibase-entitytermsforlanguagelistview-label": "Обозначение",
"wikibase-entitytermsforlanguagelistview-language": "Язык",
- "wikibase-entitytermsforlanguagelistview-more": "Больше языков",
+ "wikibase-entitytermsforlanguagelistview-more": "Все введенные языки",
"wikibase-entitytermsforlanguagelistview-less": "Меньше языков",
"wikibase-label-empty": "Метка (название) отсутствует",
"wikibase-label-edit-placeholder": "введите название",
diff --git a/extensions/Wikibase/repo/i18n/yi.json
b/extensions/Wikibase/repo/i18n/yi.json
index 6820242..bdece3f 100644
--- a/extensions/Wikibase/repo/i18n/yi.json
+++ b/extensions/Wikibase/repo/i18n/yi.json
@@ -26,7 +26,7 @@
"wikibase-entitytermsforlanguagelistview-description": "באַשרײַבונג",
"wikibase-entitytermsforlanguagelistview-label": "באצייכענונג",
"wikibase-entitytermsforlanguagelistview-language": "שפראַך",
- "wikibase-entitytermsforlanguagelistview-more": "נאך שפראַכן",
+ "wikibase-entitytermsforlanguagelistview-more": "אַלע איינגעגעבענע
שפראַכן",
"wikibase-entitytermsforlanguagelistview-less": "ווייניגע שפראכן",
"wikibase-label-empty": "קיין באצייכענונג נישט דעפֿינירט",
"wikibase-label-edit-placeholder": "אריינגעבן באצייכענונג",
diff --git a/extensions/Wikibase/repo/includes/Actions/EditEntityAction.php
b/extensions/Wikibase/repo/includes/Actions/EditEntityAction.php
index 37e9508..4a73bcd 100644
--- a/extensions/Wikibase/repo/includes/Actions/EditEntityAction.php
+++ b/extensions/Wikibase/repo/includes/Actions/EditEntityAction.php
@@ -40,7 +40,7 @@
* @author Jens Ohlig
* @author Daniel Kinzler
*/
-abstract class EditEntityAction extends ViewEntityAction {
+class EditEntityAction extends ViewEntityAction {
/**
* @var EntityDiffVisualizer
diff --git a/extensions/Wikibase/repo/includes/Actions/EditItemAction.php
b/extensions/Wikibase/repo/includes/Actions/EditItemAction.php
deleted file mode 100644
index f670c5f..0000000
--- a/extensions/Wikibase/repo/includes/Actions/EditItemAction.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-namespace Wikibase;
-
-/**
- * Handles the edit action for Wikibase items.
- *
- * @since 0.1
- *
- * @license GPL-2.0+
- * @author Jeroen De Dauw < [email protected] >
- * @author Daniel Kinzler
- */
-class EditItemAction extends EditEntityAction {
-
-}
diff --git a/extensions/Wikibase/repo/includes/Actions/EditPropertyAction.php
b/extensions/Wikibase/repo/includes/Actions/EditPropertyAction.php
deleted file mode 100644
index 26e11e5..0000000
--- a/extensions/Wikibase/repo/includes/Actions/EditPropertyAction.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-namespace Wikibase;
-
-/**
- * Handles the edit action for Wikibase properties.
- *
- * @since 0.1
- *
- * @license GPL-2.0+
- * @author Jeroen De Dauw < [email protected] >
- * @author Daniel Kinzler
- */
-class EditPropertyAction extends EditEntityAction {
-
-}
diff --git a/extensions/Wikibase/repo/includes/Actions/SubmitItemAction.php
b/extensions/Wikibase/repo/includes/Actions/SubmitItemAction.php
deleted file mode 100644
index 1aeae41..0000000
--- a/extensions/Wikibase/repo/includes/Actions/SubmitItemAction.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-namespace Wikibase;
-
-/**
- * Handles the submit action for Wikibase items.
- *
- * @since 0.1
- *
- * @license GPL-2.0+
- * @author Jeroen De Dauw < [email protected] >
- * @author Daniel Kinzler
- */
-class SubmitItemAction extends SubmitEntityAction {
-
-}
diff --git a/extensions/Wikibase/repo/includes/Actions/SubmitPropertyAction.php
b/extensions/Wikibase/repo/includes/Actions/SubmitPropertyAction.php
deleted file mode 100644
index ec558bb..0000000
--- a/extensions/Wikibase/repo/includes/Actions/SubmitPropertyAction.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-namespace Wikibase;
-
-/**
- * Handles the submit action for Wikibase properties.
- *
- * @since 0.1
- *
- * @license GPL-2.0+
- * @author Jeroen De Dauw < [email protected] >
- * @author Daniel Kinzler
- */
-class SubmitPropertyAction extends SubmitEntityAction {
-
-}
diff --git a/extensions/Wikibase/repo/includes/Actions/ViewEntityAction.php
b/extensions/Wikibase/repo/includes/Actions/ViewEntityAction.php
index 43a8031..f360f4c 100644
--- a/extensions/Wikibase/repo/includes/Actions/ViewEntityAction.php
+++ b/extensions/Wikibase/repo/includes/Actions/ViewEntityAction.php
@@ -17,7 +17,7 @@
* @author Jeroen De Dauw < [email protected] >
* @author Daniel Kinzler < [email protected] >
*/
-abstract class ViewEntityAction extends ViewAction {
+class ViewEntityAction extends ViewAction {
/**
* Handler for the BeforeDisplayNoArticleText called by Article.
diff --git a/extensions/Wikibase/repo/includes/Actions/ViewItemAction.php
b/extensions/Wikibase/repo/includes/Actions/ViewItemAction.php
deleted file mode 100644
index 14fb569..0000000
--- a/extensions/Wikibase/repo/includes/Actions/ViewItemAction.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-namespace Wikibase;
-
-/**
- * Handles the view action for Wikibase items.
- *
- * @since 0.1
- *
- * @license GPL-2.0+
- * @author Jeroen De Dauw < [email protected] >
- * @author Daniel Kinzler < [email protected] >
- */
-class ViewItemAction extends ViewEntityAction {
-
-}
diff --git a/extensions/Wikibase/repo/includes/Actions/ViewPropertyAction.php
b/extensions/Wikibase/repo/includes/Actions/ViewPropertyAction.php
deleted file mode 100644
index 1111ca9..0000000
--- a/extensions/Wikibase/repo/includes/Actions/ViewPropertyAction.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-namespace Wikibase;
-
-/**
- * Handles the view action for Wikibase properties.
- *
- * @since 0.1
- *
- * @license GPL-2.0+
- * @author Jeroen De Dauw < [email protected] >
- */
-class ViewPropertyAction extends ViewEntityAction {
-
-}
diff --git a/extensions/Wikibase/repo/includes/Api/EditEntity.php
b/extensions/Wikibase/repo/includes/Api/EditEntity.php
index 0c3501a..aa4a606 100644
--- a/extensions/Wikibase/repo/includes/Api/EditEntity.php
+++ b/extensions/Wikibase/repo/includes/Api/EditEntity.php
@@ -65,11 +65,6 @@
private $siteLinkChangeOpFactory;
/**
- * @var ApiErrorReporter
- */
- private $errorReporter;
-
- /**
* @var EntityRevisionLookup
*/
private $revisionLookup;
@@ -94,7 +89,6 @@
$wikibaseRepo = WikibaseRepo::getDefaultInstance();
$apiHelperFactory = $wikibaseRepo->getApiHelperFactory(
$this->getContext() );
$this->termsLanguages = $wikibaseRepo->getTermsLanguages();
- $this->errorReporter = $apiHelperFactory->getErrorReporter(
$this );
$this->revisionLookup = $wikibaseRepo->getEntityRevisionLookup(
'uncached' );
$this->idParser = $wikibaseRepo->getEntityIdParser();
$this->statementDeserializer =
$wikibaseRepo->getExternalFormatStatementDeserializer();
diff --git a/extensions/Wikibase/repo/includes/Api/ModifyEntity.php
b/extensions/Wikibase/repo/includes/Api/ModifyEntity.php
index 434dceb..d3f925f 100644
--- a/extensions/Wikibase/repo/includes/Api/ModifyEntity.php
+++ b/extensions/Wikibase/repo/includes/Api/ModifyEntity.php
@@ -83,7 +83,7 @@
/**
* @var ApiErrorReporter
*/
- private $errorReporter;
+ protected $errorReporter;
/**
* @var EntityPermissionChecker
diff --git a/extensions/Wikibase/repo/includes/Api/SearchEntities.php
b/extensions/Wikibase/repo/includes/Api/SearchEntities.php
index 756374b..ec74262 100644
--- a/extensions/Wikibase/repo/includes/Api/SearchEntities.php
+++ b/extensions/Wikibase/repo/includes/Api/SearchEntities.php
@@ -288,6 +288,8 @@
'apihelp-wbsearchentities-example-1',
'action=wbsearchentities&search=abc&language=en&limit=50' =>
'apihelp-wbsearchentities-example-2',
+
'action=wbsearchentities&search=abc&language=en&limit=2&continue=2' =>
+ 'apihelp-wbsearchentities-example-4',
'action=wbsearchentities&search=alphabet&language=en&type=property' =>
'apihelp-wbsearchentities-example-3',
);
diff --git a/extensions/Wikibase/repo/includes/Api/SetAliases.php
b/extensions/Wikibase/repo/includes/Api/SetAliases.php
index 60c601a..43f5062 100644
--- a/extensions/Wikibase/repo/includes/Api/SetAliases.php
+++ b/extensions/Wikibase/repo/includes/Api/SetAliases.php
@@ -32,11 +32,6 @@
private $termChangeOpFactory;
/**
- * @var ApiErrorReporter
- */
- private $errorReporter;
-
- /**
* @param ApiMain $mainModule
* @param string $moduleName
* @param string $modulePrefix
@@ -45,10 +40,8 @@
parent::__construct( $mainModule, $moduleName, $modulePrefix );
$wikibaseRepo = WikibaseRepo::getDefaultInstance();
- $apiHelperFactory = $wikibaseRepo->getApiHelperFactory(
$this->getContext() );
$changeOpFactoryProvider =
$wikibaseRepo->getChangeOpFactoryProvider();
- $this->errorReporter = $apiHelperFactory->getErrorReporter(
$this );
$this->termChangeOpFactory =
$changeOpFactoryProvider->getFingerprintChangeOpFactory();
}
diff --git a/extensions/Wikibase/repo/includes/Api/SetDescription.php
b/extensions/Wikibase/repo/includes/Api/SetDescription.php
index 494a34a..3ddf0e3 100644
--- a/extensions/Wikibase/repo/includes/Api/SetDescription.php
+++ b/extensions/Wikibase/repo/includes/Api/SetDescription.php
@@ -28,11 +28,6 @@
private $termChangeOpFactory;
/**
- * @var ApiErrorReporter
- */
- private $errorReporter;
-
- /**
* @param ApiMain $mainModule
* @param string $moduleName
* @param string $modulePrefix
@@ -41,10 +36,8 @@
parent::__construct( $mainModule, $moduleName, $modulePrefix );
$wikibaseRepo = WikibaseRepo::getDefaultInstance();
- $apiHelperFactory = $wikibaseRepo->getApiHelperFactory(
$this->getContext() );
$changeOpFactoryProvider =
$wikibaseRepo->getChangeOpFactoryProvider();
- $this->errorReporter = $apiHelperFactory->getErrorReporter(
$this );
$this->termChangeOpFactory =
$changeOpFactoryProvider->getFingerprintChangeOpFactory();
}
diff --git a/extensions/Wikibase/repo/includes/Api/SetLabel.php
b/extensions/Wikibase/repo/includes/Api/SetLabel.php
index 8421172..d548ee4 100644
--- a/extensions/Wikibase/repo/includes/Api/SetLabel.php
+++ b/extensions/Wikibase/repo/includes/Api/SetLabel.php
@@ -29,11 +29,6 @@
private $termChangeOpFactory;
/**
- * @var ApiErrorReporter
- */
- private $errorReporter;
-
- /**
* @param ApiMain $mainModule
* @param string $moduleName
* @param string $modulePrefix
@@ -42,10 +37,8 @@
parent::__construct( $mainModule, $moduleName, $modulePrefix );
$wikibaseRepo = WikibaseRepo::getDefaultInstance();
- $apiHelperFactory = $wikibaseRepo->getApiHelperFactory(
$this->getContext() );
$changeOpFactoryProvider =
$wikibaseRepo->getChangeOpFactoryProvider();
- $this->errorReporter = $apiHelperFactory->getErrorReporter(
$this );
$this->termChangeOpFactory =
$changeOpFactoryProvider->getFingerprintChangeOpFactory();
}
diff --git a/extensions/Wikibase/repo/includes/Api/SetSiteLink.php
b/extensions/Wikibase/repo/includes/Api/SetSiteLink.php
index e655c40..d475bcc 100644
--- a/extensions/Wikibase/repo/includes/Api/SetSiteLink.php
+++ b/extensions/Wikibase/repo/includes/Api/SetSiteLink.php
@@ -32,11 +32,6 @@
private $siteLinkChangeOpFactory;
/**
- * @var ApiErrorReporter
- */
- private $errorReporter;
-
- /**
* @param ApiMain $mainModule
* @param string $moduleName
* @param string $modulePrefix
@@ -45,10 +40,8 @@
parent::__construct( $mainModule, $moduleName, $modulePrefix );
$wikibaseRepo = WikibaseRepo::getDefaultInstance();
- $apiHelperFactory = $wikibaseRepo->getApiHelperFactory(
$this->getContext() );
$changeOpFactoryProvider =
$wikibaseRepo->getChangeOpFactoryProvider();
- $this->errorReporter = $apiHelperFactory->getErrorReporter(
$this );
$this->siteLinkChangeOpFactory =
$changeOpFactoryProvider->getSiteLinkChangeOpFactory();
}
diff --git a/extensions/Wikibase/repo/includes/Content/ItemHandler.php
b/extensions/Wikibase/repo/includes/Content/ItemHandler.php
index 744d4fd..aeb7cc4 100644
--- a/extensions/Wikibase/repo/includes/Content/ItemHandler.php
+++ b/extensions/Wikibase/repo/includes/Content/ItemHandler.php
@@ -10,7 +10,7 @@
use Wikibase\DataModel\Entity\Item;
use Wikibase\DataModel\Entity\ItemId;
use Wikibase\DataModel\Entity\EntityIdParser;
-use Wikibase\EditItemAction;
+use Wikibase\EditEntityAction;
use Wikibase\EntityContent;
use Wikibase\HistoryEntityAction;
use Wikibase\ItemContent;
@@ -21,10 +21,10 @@
use Wikibase\Repo\Validators\EntityConstraintProvider;
use Wikibase\Repo\Validators\ValidatorErrorLocalizer;
use Wikibase\Store\EntityIdLookup;
-use Wikibase\SubmitItemAction;
+use Wikibase\SubmitEntityAction;
use Wikibase\TermIndex;
use Wikibase\Updates\DataUpdateAdapter;
-use Wikibase\ViewItemAction;
+use Wikibase\ViewEntityAction;
/**
* Content handler for Wikibase items.
@@ -117,9 +117,9 @@
$this->labelLookupFactory->newLabelDescriptionLookup( $context->getLanguage() )
);
},
- 'view' => ViewItemAction::class,
- 'edit' => EditItemAction::class,
- 'submit' => SubmitItemAction::class,
+ 'view' => ViewEntityAction::class,
+ 'edit' => EditEntityAction::class,
+ 'submit' => SubmitEntityAction::class,
);
}
diff --git a/extensions/Wikibase/repo/includes/Content/PropertyHandler.php
b/extensions/Wikibase/repo/includes/Content/PropertyHandler.php
index 1c0619b..bea2e50 100644
--- a/extensions/Wikibase/repo/includes/Content/PropertyHandler.php
+++ b/extensions/Wikibase/repo/includes/Content/PropertyHandler.php
@@ -10,7 +10,7 @@
use Wikibase\DataModel\Entity\EntityIdParser;
use Wikibase\DataModel\Entity\Property;
use Wikibase\DataModel\Entity\PropertyId;
-use Wikibase\EditPropertyAction;
+use Wikibase\EditEntityAction;
use Wikibase\EntityContent;
use Wikibase\HistoryEntityAction;
use Wikibase\Lib\Store\EntityContentDataCodec;
@@ -22,10 +22,10 @@
use Wikibase\Repo\Validators\EntityConstraintProvider;
use Wikibase\Repo\Validators\ValidatorErrorLocalizer;
use Wikibase\Store\EntityIdLookup;
-use Wikibase\SubmitPropertyAction;
+use Wikibase\SubmitEntityAction;
use Wikibase\TermIndex;
use Wikibase\Updates\DataUpdateAdapter;
-use Wikibase\ViewPropertyAction;
+use Wikibase\ViewEntityAction;
/**
* Content handler for Wikibase items.
@@ -125,9 +125,9 @@
$this->labelLookupFactory->newLabelDescriptionLookup( $context->getLanguage() )
);
},
- 'view' => ViewPropertyAction::class,
- 'edit' => EditPropertyAction::class,
- 'submit' => SubmitPropertyAction::class,
+ 'view' => ViewEntityAction::class,
+ 'edit' => EditEntityAction::class,
+ 'submit' => SubmitEntityAction::class,
);
}
diff --git a/vendor/composer/autoload_classmap.php
b/vendor/composer/autoload_classmap.php
index e0c50ee..750d4b2 100644
--- a/vendor/composer/autoload_classmap.php
+++ b/vendor/composer/autoload_classmap.php
@@ -730,8 +730,6 @@
'Wikibase\\EditEntity' => $baseDir .
'/extensions/Wikibase/repo/includes/EditEntity.php',
'Wikibase\\EditEntityAction' => $baseDir .
'/extensions/Wikibase/repo/includes/Actions/EditEntityAction.php',
'Wikibase\\EditEntityFactory' => $baseDir .
'/extensions/Wikibase/repo/includes/EditEntityFactory.php',
- 'Wikibase\\EditItemAction' => $baseDir .
'/extensions/Wikibase/repo/includes/Actions/EditItemAction.php',
- 'Wikibase\\EditPropertyAction' => $baseDir .
'/extensions/Wikibase/repo/includes/Actions/EditPropertyAction.php',
'Wikibase\\EntityChange' => $baseDir .
'/extensions/Wikibase/lib/includes/Changes/EntityChange.php',
'Wikibase\\EntityContent' => $baseDir .
'/extensions/Wikibase/repo/includes/Content/EntityContent.php',
'Wikibase\\EntityFactory' => $baseDir .
'/extensions/Wikibase/lib/includes/EntityFactory.php',
@@ -1281,8 +1279,6 @@
'Wikibase\\Store\\SubscriptionLookup' => $baseDir .
'/extensions/Wikibase/repo/includes/Store/SubscriptionLookup.php',
'Wikibase\\StringNormalizer' => $baseDir .
'/extensions/Wikibase/lib/includes/StringNormalizer.php',
'Wikibase\\SubmitEntityAction' => $baseDir .
'/extensions/Wikibase/repo/includes/Actions/SubmitEntityAction.php',
- 'Wikibase\\SubmitItemAction' => $baseDir .
'/extensions/Wikibase/repo/includes/Actions/SubmitItemAction.php',
- 'Wikibase\\SubmitPropertyAction' => $baseDir .
'/extensions/Wikibase/repo/includes/Actions/SubmitPropertyAction.php',
'Wikibase\\Summary' => $baseDir .
'/extensions/Wikibase/lib/includes/Summary.php',
'Wikibase\\SummaryFormatter' => $baseDir .
'/extensions/Wikibase/repo/includes/SummaryFormatter.php',
'Wikibase\\TermIndex' => $baseDir .
'/extensions/Wikibase/lib/includes/Store/TermIndex.php',
@@ -1505,8 +1501,6 @@
'Wikibase\\Updates\\DataUpdateAdapter' => $baseDir .
'/extensions/Wikibase/repo/includes/updates/DataUpdateAdapter.php',
'Wikibase\\Updates\\Test\\DataUpdateAdapterTest' => $baseDir .
'/extensions/Wikibase/repo/tests/phpunit/includes/updates/DataUpdateAdapterTest.php',
'Wikibase\\ViewEntityAction' => $baseDir .
'/extensions/Wikibase/repo/includes/Actions/ViewEntityAction.php',
- 'Wikibase\\ViewItemAction' => $baseDir .
'/extensions/Wikibase/repo/includes/Actions/ViewItemAction.php',
- 'Wikibase\\ViewPropertyAction' => $baseDir .
'/extensions/Wikibase/repo/includes/Actions/ViewPropertyAction.php',
'Wikibase\\View\\ClaimHtmlGenerator' => $baseDir .
'/extensions/Wikibase/view/src/ClaimHtmlGenerator.php',
'Wikibase\\View\\DummyLocalizedTextProvider' => $baseDir .
'/extensions/Wikibase/view/src/DummyLocalizedTextProvider.php',
'Wikibase\\View\\EditSectionGenerator' => $baseDir .
'/extensions/Wikibase/view/src/EditSectionGenerator.php',
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index 12ce7b0..5f69c14 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -110,19 +110,19 @@
"source": {
"type": "git",
"url":
"https://github.com/wikimedia/mediawiki-extensions-ArticlePlaceholder.git";,
- "reference": "d60bda49676181f39b584d32103eddd3681dca2a"
+ "reference": "d1e62cfdb986f8dab0f757043111722e44683276"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-ArticlePlaceholder/zipball/d60bda49676181f39b584d32103eddd3681dca2a";,
- "reference": "d60bda49676181f39b584d32103eddd3681dca2a",
+ "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-ArticlePlaceholder/zipball/d1e62cfdb986f8dab0f757043111722e44683276";,
+ "reference": "d1e62cfdb986f8dab0f757043111722e44683276",
"shasum": ""
},
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
"mediawiki/mediawiki-codesniffer": "0.7.2"
},
- "time": "2016-08-05 20:30:37",
+ "time": "2016-08-09 00:30:09",
"type": "mediawiki-extension",
"installation-source": "dist",
"autoload": {
@@ -1348,12 +1348,12 @@
"source": {
"type": "git",
"url":
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";,
- "reference": "c7fda6f6d56aac766660176dbec9b34549b82df8"
+ "reference": "02b7252c8ab1481e21300fe48231fb2ed35bf27a"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/c7fda6f6d56aac766660176dbec9b34549b82df8";,
- "reference": "c7fda6f6d56aac766660176dbec9b34549b82df8",
+ "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/02b7252c8ab1481e21300fe48231fb2ed35bf27a";,
+ "reference": "02b7252c8ab1481e21300fe48231fb2ed35bf27a",
"shasum": ""
},
"require": {
@@ -1386,7 +1386,7 @@
"jakub-onderka/php-parallel-lint": "0.9.2",
"mediawiki/mediawiki-codesniffer": "0.4.0|0.5.0"
},
- "time": "2016-08-07 20:48:25",
+ "time": "2016-08-09 00:19:58",
"type": "mediawiki-extension",
"installation-source": "dist",
"autoload": {
@@ -1595,7 +1595,7 @@
"source": {
"type": "git",
"url":
"https://gerrit.wikimedia.org/r/mediawiki/extensions/WikibaseMediaInfo";,
- "reference": "ad08bf52aa712797feeb82ce046471753b6bc5e8"
+ "reference": "c0f08eb81346c7aa4bae23b1140ff9b605703fc3"
},
"require": {
"php": ">=5.5.0",
@@ -1609,7 +1609,7 @@
"mediawiki/mediawiki-codesniffer": "0.6.0",
"phpunit/phpunit": "~4.8"
},
- "time": "2016-08-05 19:52:50",
+ "time": "2016-08-08 10:27:54",
"type": "mediawiki-extension",
"installation-source": "source",
"autoload": {
@@ -1700,7 +1700,7 @@
"source": {
"type": "git",
"url":
"https://gerrit.wikimedia.org/r/mediawiki/extensions/WikibaseQuality";,
- "reference": "003ba2bd82cdc8e04a6197d4378b1016f0ef4abc"
+ "reference": "6f31cf2e63140f0abf021002f643af0b13b40efa"
},
"require": {
"php": ">=5.3.0",
@@ -1717,7 +1717,7 @@
"satooshi/php-coveralls": "master-dev",
"wikibase/data-model-serialization": ">=0.1 <3.0"
},
- "time": "2016-08-05 19:44:01",
+ "time": "2016-08-08 20:38:02",
"type": "mediawiki-extension",
"installation-source": "source",
"autoload": {
--
To view, visit https://gerrit.wikimedia.org/r/303779
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I50b564543c8c558ae9febb91aeafcc13d159804b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikidata
Gerrit-Branch: master
Gerrit-Owner: WikidataBuilder <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
