WikidataBuilder has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/384320 )
Change subject: New Wikidata Build - 2017-10-15T10:00:01+0000
......................................................................
New Wikidata Build - 2017-10-15T10:00:01+0000
Change-Id: I626586ad5bf24d01f94cac814a934460ceaff665
---
M composer.lock
M extensions/ArticlePlaceholder/i18n/fa.json
M extensions/Wikibase/client/includes/Changes/ChangeRunCoalescer.php
M
extensions/Wikibase/client/tests/phpunit/includes/Changes/ChangeRunCoalescerTest.php
M
extensions/Wikibase/client/tests/phpunit/includes/DataAccess/PropertyIdResolverTest.php
M
extensions/Wikibase/client/tests/phpunit/includes/DataAccess/Scribunto/LuaWikibaseEntityLibraryTests.lua
M extensions/Wikibase/repo/includes/Modules/PropertyValueExpertsModule.php
M vendor/composer/installed.json
8 files changed, 62 insertions(+), 26 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikidata
refs/changes/20/384320/1
diff --git a/composer.lock b/composer.lock
index 663f12b..8b6964b 100644
--- a/composer.lock
+++ b/composer.lock
@@ -767,12 +767,12 @@
"source": {
"type": "git",
"url":
"https://github.com/wikimedia/mediawiki-extensions-ArticlePlaceholder.git";,
- "reference": "7ddd442a26a300bcf4173f4aae3c8c9a712df994"
+ "reference": "be789567b9df4773e174d2a603de5fdc8da87c4e"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-ArticlePlaceholder/zipball/7ddd442a26a300bcf4173f4aae3c8c9a712df994";,
- "reference": "7ddd442a26a300bcf4173f4aae3c8c9a712df994",
+ "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-ArticlePlaceholder/zipball/be789567b9df4773e174d2a603de5fdc8da87c4e";,
+ "reference": "be789567b9df4773e174d2a603de5fdc8da87c4e",
"shasum": ""
},
"require": {
@@ -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": "2017-10-11 18:54:40"
+ "time": "2017-10-14 20:17:08"
},
{
"name": "propertysuggester/property-suggester",
@@ -1548,12 +1548,12 @@
"source": {
"type": "git",
"url":
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";,
- "reference": "873a2356bd2ff284b1c11726bda02fe790e03f1e"
+ "reference": "71fcdcc656609259fe6b018daaa1a01b2820db85"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/873a2356bd2ff284b1c11726bda02fe790e03f1e";,
- "reference": "873a2356bd2ff284b1c11726bda02fe790e03f1e",
+ "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/71fcdcc656609259fe6b018daaa1a01b2820db85";,
+ "reference": "71fcdcc656609259fe6b018daaa1a01b2820db85",
"shasum": ""
},
"require": {
@@ -1631,7 +1631,7 @@
"wikibaserepo",
"wikidata"
],
- "time": "2017-10-13 21:00:12"
+ "time": "2017-10-15 01:55:04"
},
{
"name": "wikibase/wikimedia-badges",
diff --git a/extensions/ArticlePlaceholder/i18n/fa.json
b/extensions/ArticlePlaceholder/i18n/fa.json
index 8a6d60d..54afa0c 100644
--- a/extensions/ArticlePlaceholder/i18n/fa.json
+++ b/extensions/ArticlePlaceholder/i18n/fa.json
@@ -7,8 +7,13 @@
},
"createtopicpage": "ایجاد صفحه",
"articleplaceholder-abouttopic": "درباره موضوع",
+ "articleplaceholder-abouttopic-create-article-title": "یک مقاله جدید
بسازید",
"articleplaceholder-abouttopic-create-article-label": "عنوان مقاله",
+ "articleplaceholder-abouttopic-create-article-mandatory": "عنوان مقاله
اجباری است.",
+ "articleplaceholder-abouttopic-create-article-button": "یک مقاله
بسازید",
+ "articleplaceholder-abouttopic-create-emtpy-article-button": "مقالهای
جدید شروع کنید",
"articleplaceholder-abouttopic-translate-article-label": "زبان مبدأ:",
+ "articleplaceholder-abouttopic-translate-article-button": "ترجمه مقاله",
"articleplaceholder-abouttopic-create-article-submit-button": "ارسال",
"articleplaceholder-abouttopic-lua-reference": "منبع",
"articleplaceholder-abouttopic-lua-identifier": "منابع خارجی",
diff --git a/extensions/Wikibase/client/includes/Changes/ChangeRunCoalescer.php
b/extensions/Wikibase/client/includes/Changes/ChangeRunCoalescer.php
index ce9acfd..1369684 100644
--- a/extensions/Wikibase/client/includes/Changes/ChangeRunCoalescer.php
+++ b/extensions/Wikibase/client/includes/Changes/ChangeRunCoalescer.php
@@ -2,6 +2,8 @@
namespace Wikibase\Client\Changes;
+use Diff\DiffOp\Diff\Diff;
+use Diff\DiffOp\DiffOp;
use Exception;
use MWException;
use Wikibase\Change;
@@ -196,6 +198,15 @@
}
/**
+ * @param DiffOp $siteLinkDiffOp
+ *
+ * @return bool
+ */
+ private function isBadgesOnlyChange( DiffOp $siteLinkDiffOp ) {
+ return $siteLinkDiffOp instanceof Diff && !array_key_exists(
'name', $siteLinkDiffOp );
+ }
+
+ /**
* 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
@@ -230,8 +241,8 @@
if ( !$break && ( $change instanceof ItemChange
) ) {
$siteLinkDiff =
$change->getSiteLinkDiff();
- if ( isset( $siteLinkDiff[
$this->localSiteId ] ) ) {
- // TODO: don't break if only
the link's badges changed
+ if ( isset(
$siteLinkDiff[$this->localSiteId] )
+ && !$this->isBadgesOnlyChange(
$siteLinkDiff[$this->localSiteId] ) ) {
$break = true;
$breakNext = true;
}
diff --git
a/extensions/Wikibase/client/tests/phpunit/includes/Changes/ChangeRunCoalescerTest.php
b/extensions/Wikibase/client/tests/phpunit/includes/Changes/ChangeRunCoalescerTest.php
index df39c27..4bc5c1c 100644
---
a/extensions/Wikibase/client/tests/phpunit/includes/Changes/ChangeRunCoalescerTest.php
+++
b/extensions/Wikibase/client/tests/phpunit/includes/Changes/ChangeRunCoalescerTest.php
@@ -69,6 +69,10 @@
$entity1->getSiteLinkList()->addNewSiteLink( 'dewiki',
'Testen' );
$repo->putEntity( $entity1, $offset + 14 );
+ // entity 1, revision 1115
+ $entity1->getSiteLinkList()->setSiteLink( new SiteLink(
'enwiki', 'Original', [ new ItemId( 'Q12345' ) ] ) );
+ $repo->putEntity( $entity1, $offset + 15 );
+
// entity 1, revision 1117
$entity1->getSiteLinkList()->setSiteLink( new SiteLink(
'enwiki', 'Spam', [ new ItemId( 'Q12345' ) ] ) );
$repo->putEntity( $entity1, $offset + 17 );
@@ -270,6 +274,17 @@
'parent_id' => 1113,
] );
+ // change link to other wiki
+ $update11Badge = $this->makeChange( [
+ 'id' => ++$id,
+ 'type' => 'wikibase-item~update',
+ 'time' => '20130101020305',
+ 'object_id' => 'Q1',
+ 'revision_id' => 1115,
+ 'user_id' => 1,
+ 'parent_id' => 1114,
+ ] );
+
// change link to local wiki
$update11Link = $this->makeChange( [
'id' => ++$id,
@@ -278,7 +293,7 @@
'object_id' => 'Q1',
'revision_id' => 1117,
'user_id' => 1,
- 'parent_id' => 1114,
+ 'parent_id' => 1115,
] );
// delete
@@ -368,6 +383,11 @@
[ $update11, $update11Link ], // $expected
],
+ 'local link badge change' => [
+ [ $update11, $update11Badge ], // $changes
+ [ $this->combineChanges( $update11,
$update11Badge ) ], // $expected
+ ],
+
'other link merges' => [
[ $update11, $update11XLink ], // $changes
[ $this->combineChanges( $update11,
$update11XLink ) ], // $expected
diff --git
a/extensions/Wikibase/client/tests/phpunit/includes/DataAccess/PropertyIdResolverTest.php
b/extensions/Wikibase/client/tests/phpunit/includes/DataAccess/PropertyIdResolverTest.php
index 95645f7..9c5fdd1 100644
---
a/extensions/Wikibase/client/tests/phpunit/includes/DataAccess/PropertyIdResolverTest.php
+++
b/extensions/Wikibase/client/tests/phpunit/includes/DataAccess/PropertyIdResolverTest.php
@@ -74,12 +74,12 @@
/**
* @dataProvider
resolvePropertyIdWithInvalidInput_throwsExceptionProvider
*/
- public function testResolvePropertyIdWithInvalidInput_throwsException(
$propertyIdOrLabel ) {
+ public function testResolvePropertyIdWithInvalidInput_throwsException(
$propertyLabelOrId ) {
$propertyIdResolver = $this->getPropertyIdResolver();
$this->setExpectedException(
PropertyLabelNotResolvedException::class );
- $propertyIdResolver->resolvePropertyId( $propertyIdOrLabel,
'en' );
+ $propertyIdResolver->resolvePropertyId( $propertyLabelOrId,
'en' );
}
public function
resolvePropertyIdWithInvalidInput_throwsExceptionProvider() {
diff --git
a/extensions/Wikibase/client/tests/phpunit/includes/DataAccess/Scribunto/LuaWikibaseEntityLibraryTests.lua
b/extensions/Wikibase/client/tests/phpunit/includes/DataAccess/Scribunto/LuaWikibaseEntityLibraryTests.lua
index 3d20045..58bb2ab 100644
---
a/extensions/Wikibase/client/tests/phpunit/includes/DataAccess/Scribunto/LuaWikibaseEntityLibraryTests.lua
+++
b/extensions/Wikibase/client/tests/phpunit/includes/DataAccess/Scribunto/LuaWikibaseEntityLibraryTests.lua
@@ -153,10 +153,10 @@
return entity:formatPropertyValues( label )
end
-local function integrationTestFormatPropertyValuesNoSuchProperty(
propertyIdOrLabel )
+local function integrationTestFormatPropertyValuesNoSuchProperty(
propertyLabelOrId )
local entity = mw.wikibase.getEntityObject( 'Q199024' )
- return entity:formatPropertyValues( propertyIdOrLabel )
+ return entity:formatPropertyValues( propertyLabelOrId )
end
local function integrationTestFormatPropertyValuesProperty()
@@ -178,10 +178,10 @@
return entity:formatStatements( label )
end
-local function integrationTestFormatStatementsNoSuchProperty(
propertyIdOrLabel )
+local function integrationTestFormatStatementsNoSuchProperty(
propertyLabelOrId )
local entity = mw.wikibase.getEntityObject( 'Q199024' )
- return entity:formatStatements( propertyIdOrLabel )
+ return entity:formatStatements( propertyLabelOrId )
end
local function integrationTestFormatStatementsProperty()
diff --git
a/extensions/Wikibase/repo/includes/Modules/PropertyValueExpertsModule.php
b/extensions/Wikibase/repo/includes/Modules/PropertyValueExpertsModule.php
index 063c9a5..928af32 100644
--- a/extensions/Wikibase/repo/includes/Modules/PropertyValueExpertsModule.php
+++ b/extensions/Wikibase/repo/includes/Modules/PropertyValueExpertsModule.php
@@ -22,7 +22,7 @@
}
public function getScript( ResourceLoaderContext $context ) {
- $expertModuleMap = \XML::encodeJsVar(
$this->dataTypeDefinitions->getExpertModules() );
+ $expertModuleMap = \Xml::encodeJsVar(
$this->dataTypeDefinitions->getExpertModules() );
$js = <<<JS
module.exports = ( function () {
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index b33416d..33eb4d5 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -125,12 +125,12 @@
"source": {
"type": "git",
"url":
"https://github.com/wikimedia/mediawiki-extensions-ArticlePlaceholder.git";,
- "reference": "7ddd442a26a300bcf4173f4aae3c8c9a712df994"
+ "reference": "be789567b9df4773e174d2a603de5fdc8da87c4e"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-ArticlePlaceholder/zipball/7ddd442a26a300bcf4173f4aae3c8c9a712df994";,
- "reference": "7ddd442a26a300bcf4173f4aae3c8c9a712df994",
+ "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-ArticlePlaceholder/zipball/be789567b9df4773e174d2a603de5fdc8da87c4e";,
+ "reference": "be789567b9df4773e174d2a603de5fdc8da87c4e",
"shasum": ""
},
"require": {
@@ -141,7 +141,7 @@
"jakub-onderka/php-parallel-lint": "0.9.2",
"wikibase/wikibase-codesniffer": "^0.1.0"
},
- "time": "2017-10-11 18:54:40",
+ "time": "2017-10-14 20:17:08",
"type": "mediawiki-extension",
"installation-source": "dist",
"autoload": {
@@ -1389,12 +1389,12 @@
"source": {
"type": "git",
"url":
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";,
- "reference": "873a2356bd2ff284b1c11726bda02fe790e03f1e"
+ "reference": "71fcdcc656609259fe6b018daaa1a01b2820db85"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/873a2356bd2ff284b1c11726bda02fe790e03f1e";,
- "reference": "873a2356bd2ff284b1c11726bda02fe790e03f1e",
+ "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/71fcdcc656609259fe6b018daaa1a01b2820db85";,
+ "reference": "71fcdcc656609259fe6b018daaa1a01b2820db85",
"shasum": ""
},
"require": {
@@ -1429,7 +1429,7 @@
"mediawiki/minus-x": "0.1.0",
"wikibase/wikibase-codesniffer": "^0.1.0"
},
- "time": "2017-10-13 21:00:12",
+ "time": "2017-10-15 01:55:04",
"type": "mediawiki-extension",
"installation-source": "dist",
"autoload": {
--
To view, visit https://gerrit.wikimedia.org/r/384320
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I626586ad5bf24d01f94cac814a934460ceaff665
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikidata
Gerrit-Branch: master
Gerrit-Owner: WikidataBuilder <wikidata-servi...@wikimedia.de>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
