jenkins-bot has submitted this change and it was merged.
Change subject: Update Wikibase: Revert T136598 fixes
......................................................................
Update Wikibase: Revert T136598 fixes
Change-Id: Iee417540fb2c2e2ed837125f2076128cc983df26
---
M composer.lock
M extensions/Wikibase/client/includes/Store/UsageUpdater.php
M extensions/Wikibase/client/tests/phpunit/includes/Store/UsageUpdaterTest.php
M vendor/composer/installed.json
4 files changed, 102 insertions(+), 126 deletions(-)
Approvals:
Hoo man: Looks good to me, approved
jenkins-bot: Verified
diff --git a/composer.lock b/composer.lock
index 2890304..28f8356 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1460,12 +1460,12 @@
"source": {
"type": "git",
"url":
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";,
- "reference": "6a15ffa288f5bd5050ade1fafaf100663c0a789b"
+ "reference": "709c5e0455ba7d5739dde7312044a71a93209f0a"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/6a15ffa288f5bd5050ade1fafaf100663c0a789b";,
- "reference": "6a15ffa288f5bd5050ade1fafaf100663c0a789b",
+ "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/709c5e0455ba7d5739dde7312044a71a93209f0a";,
+ "reference": "709c5e0455ba7d5739dde7312044a71a93209f0a",
"shasum": ""
},
"require": {
@@ -1537,7 +1537,7 @@
"wikibaserepo",
"wikidata"
],
- "time": "2016-06-09 18:36:22"
+ "time": "2016-06-09 20:08:24"
},
{
"name": "wikibase/wikimedia-badges",
diff --git a/extensions/Wikibase/client/includes/Store/UsageUpdater.php
b/extensions/Wikibase/client/includes/Store/UsageUpdater.php
index cce7bae..23b0ec0 100644
--- a/extensions/Wikibase/client/includes/Store/UsageUpdater.php
+++ b/extensions/Wikibase/client/includes/Store/UsageUpdater.php
@@ -72,16 +72,11 @@
if ( !is_int( $pageId ) ) {
throw new InvalidArgumentException( '$pageId must be an
int!' );
}
- if ( empty( $usages ) ) {
- return;
- }
-
- $usageEntityIds = $this->getEntityIds( $usages );
- $newlyUsedEntities = $this->usageLookup->getUnusedEntities(
$usageEntityIds );
$this->usageTracker->addUsedEntities( $pageId, $usages );
+ $newlyUsedEntities = $this->getEntityIds( $usages );
- // Subscribe to anything that was unused before.
+ // Subscribe to anything that was added
if ( !empty( $newlyUsedEntities ) ) {
$this->subscriptionManager->subscribe( $this->clientId,
$newlyUsedEntities );
}
diff --git
a/extensions/Wikibase/client/tests/phpunit/includes/Store/UsageUpdaterTest.php
b/extensions/Wikibase/client/tests/phpunit/includes/Store/UsageUpdaterTest.php
index b938295..47cd71a 100644
---
a/extensions/Wikibase/client/tests/phpunit/includes/Store/UsageUpdaterTest.php
+++
b/extensions/Wikibase/client/tests/phpunit/includes/Store/UsageUpdaterTest.php
@@ -30,25 +30,13 @@
return array(
'empty' => array(
array(),
- array()
+ array(),
),
'add usages' => array(
array( new EntityUsage( $q1,
EntityUsage::LABEL_USAGE ),
new EntityUsage( $q2,
EntityUsage::ALL_USAGE ) ),
- array( $q1, $q2 )
- ),
-
- 'add usages, Q1 already subscribed' => array(
- array( new EntityUsage( $q1,
EntityUsage::LABEL_USAGE ),
- new EntityUsage( $q2,
EntityUsage::ALL_USAGE ) ),
- array( $q2 )
- ),
-
- 'add usages, all usages already subscribed' => array(
- array( new EntityUsage( $q1,
EntityUsage::LABEL_USAGE ),
- new EntityUsage( $q2,
EntityUsage::ALL_USAGE ) ),
- array()
+ array( $q1, $q2 ),
),
);
}
@@ -56,34 +44,27 @@
/**
* @dataProvider addUsagesForPageProvider
*/
- public function testAddUsagesForPage( $newUsage,
$unusedEntitiesToSubscribe ) {
+ public function testAddUsagesForPage( $newUsage, $subscribe ) {
$usageTracker = $this->getMock( UsageTracker::class );
- $usageTracker->expects( empty( $newUsage ) ? $this->never() :
$this->once() )
+ $usageTracker->expects( $this->once() )
->method( 'addUsedEntities' )
->with( 23, $newUsage );
-
- $usageEntityIds = [];
- foreach ( $newUsage as $usage ) {
-
$usageEntityIds[$usage->getEntityId()->getSerialization()] =
$usage->getEntityId();
- }
$usageLookup = $this->getMock( UsageLookup::class );
$usageLookup->expects( $this->never() )
->method( 'getUsagesForPage' );
- $usageLookup->expects( empty( $newUsage ) ? $this->never() :
$this->once() )
- ->method( 'getUnusedEntities' )
- ->with( $usageEntityIds )
- ->will( $this->returnValue( $unusedEntitiesToSubscribe
) );
+ $usageLookup->expects( $this->never() )
+ ->method( 'getUnusedEntities' );
$subscriptionManager = $this->getMock(
SubscriptionManager::class );
$subscriptionManager->expects( $this->never() )
->method( 'unsubscribe' );
- $subscriptionManager->expects( empty(
$unusedEntitiesToSubscribe ) ? $this->never() : $this->once() )
+ $subscriptionManager->expects( empty( $subscribe ) ?
$this->never() : $this->once() )
->method( 'subscribe' )
->with( 'testwiki', $this->callback(
- function ( $actualSubscribe ) use (
$unusedEntitiesToSubscribe ) {
- return self::arraysHaveSameContent(
$actualSubscribe, $unusedEntitiesToSubscribe );
+ function ( $actualSubscribe ) use ( $subscribe
) {
+ return self::arraysHaveSameContent(
$actualSubscribe, $subscribe );
}
) );
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index 40870cf..0938693 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -1562,93 +1562,6 @@
"description": "JavaScript client for the Wikibase Repository web API"
},
{
- "name": "wikibase/wikibase",
- "version": "dev-wmf/1.28.0-wmf.3",
- "version_normalized": "dev-wmf/1.28.0-wmf.3",
- "source": {
- "type": "git",
- "url":
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";,
- "reference": "6a15ffa288f5bd5050ade1fafaf100663c0a789b"
- },
- "dist": {
- "type": "zip",
- "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/6a15ffa288f5bd5050ade1fafaf100663c0a789b";,
- "reference": "6a15ffa288f5bd5050ade1fafaf100663c0a789b",
- "shasum": ""
- },
- "require": {
- "data-values/common": "~0.3.0",
- "data-values/data-types": "~0.5.0",
- "data-values/data-values": "~1.0",
- "data-values/geo": "~1.0",
- "data-values/interfaces": "~0.2.0|~0.1.5",
- "data-values/javascript": "~0.8.0",
- "data-values/number": "~0.7.0",
- "data-values/serialization": "~1.0",
- "data-values/time": "~0.8.4",
- "data-values/validators": "~0.1.0",
- "data-values/value-view": "~0.17.1",
- "diff/diff": "~2.0",
- "php": ">=5.5.0",
- "wikibase/data-model": "~6.0",
- "wikibase/data-model-javascript": "~2.0.0",
- "wikibase/data-model-serialization": "~2.2",
- "wikibase/data-model-services": "~3.5",
- "wikibase/internal-serialization": "~2.3",
- "wikibase/javascript-api": "~1.1",
- "wikibase/serialization-javascript": "~2.0.5",
- "wikimedia/purtle": "~1.0"
- },
- "conflict": {
- "mediawiki/mediawiki": "<1.25"
- },
- "require-dev": {
- "jakub-onderka/php-parallel-lint": "0.9.2",
- "mediawiki/mediawiki-codesniffer": "0.4.0|0.5.0"
- },
- "time": "2016-06-09 18:36:22",
- "type": "mediawiki-extension",
- "installation-source": "dist",
- "autoload": {
- "classmap": [
- "client/includes/",
- "client/WikibaseClient.hooks.php",
- "client/tests/phpunit/MockClientStore.php",
- "lib/includes/",
- "lib/WikibaseLib.hooks.php",
- "lib/maintenance/",
- "repo/includes/",
- "repo/maintenance/",
- "repo/tests/phpunit/",
- "repo/Wikibase.hooks.php"
- ],
- "psr-4": {
- "Wikibase\\Client\\Tests\\": "client/tests/phpunit/includes",
- "Wikibase\\Lib\\Tests\\": "lib/tests/phpunit",
- "Wikibase\\View\\": "view/src",
- "Wikibase\\View\\Tests\\": "view/tests/phpunit"
- }
- },
- "notification-url": "https://packagist.org/downloads/";,
- "license": [
- "GPL-2.0+"
- ],
- "authors": [
- {
- "name": "The Wikidata team"
- }
- ],
- "description": "Structured data repository for MediaWiki",
- "homepage": "http://wikiba.se";,
- "keywords": [
- "wikibase",
- "wikibaseclient",
- "wikibaselib",
- "wikibaserepo",
- "wikidata"
- ]
- },
- {
"name": "mediawiki/article-placeholder",
"version": "dev-wmf/1.28.0-wmf.3",
"version_normalized": "dev-wmf/1.28.0-wmf.3",
@@ -1692,5 +1605,92 @@
"issues": "https://phabricator.wikimedia.org/";,
"irc": "irc://irc.freenode.net/wikidata"
}
+ },
+ {
+ "name": "wikibase/wikibase",
+ "version": "dev-wmf/1.28.0-wmf.3",
+ "version_normalized": "dev-wmf/1.28.0-wmf.3",
+ "source": {
+ "type": "git",
+ "url":
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";,
+ "reference": "709c5e0455ba7d5739dde7312044a71a93209f0a"
+ },
+ "dist": {
+ "type": "zip",
+ "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/709c5e0455ba7d5739dde7312044a71a93209f0a";,
+ "reference": "709c5e0455ba7d5739dde7312044a71a93209f0a",
+ "shasum": ""
+ },
+ "require": {
+ "data-values/common": "~0.3.0",
+ "data-values/data-types": "~0.5.0",
+ "data-values/data-values": "~1.0",
+ "data-values/geo": "~1.0",
+ "data-values/interfaces": "~0.2.0|~0.1.5",
+ "data-values/javascript": "~0.8.0",
+ "data-values/number": "~0.7.0",
+ "data-values/serialization": "~1.0",
+ "data-values/time": "~0.8.4",
+ "data-values/validators": "~0.1.0",
+ "data-values/value-view": "~0.17.1",
+ "diff/diff": "~2.0",
+ "php": ">=5.5.0",
+ "wikibase/data-model": "~6.0",
+ "wikibase/data-model-javascript": "~2.0.0",
+ "wikibase/data-model-serialization": "~2.2",
+ "wikibase/data-model-services": "~3.5",
+ "wikibase/internal-serialization": "~2.3",
+ "wikibase/javascript-api": "~1.1",
+ "wikibase/serialization-javascript": "~2.0.5",
+ "wikimedia/purtle": "~1.0"
+ },
+ "conflict": {
+ "mediawiki/mediawiki": "<1.25"
+ },
+ "require-dev": {
+ "jakub-onderka/php-parallel-lint": "0.9.2",
+ "mediawiki/mediawiki-codesniffer": "0.4.0|0.5.0"
+ },
+ "time": "2016-06-09 20:08:24",
+ "type": "mediawiki-extension",
+ "installation-source": "dist",
+ "autoload": {
+ "classmap": [
+ "client/includes/",
+ "client/WikibaseClient.hooks.php",
+ "client/tests/phpunit/MockClientStore.php",
+ "lib/includes/",
+ "lib/WikibaseLib.hooks.php",
+ "lib/maintenance/",
+ "repo/includes/",
+ "repo/maintenance/",
+ "repo/tests/phpunit/",
+ "repo/Wikibase.hooks.php"
+ ],
+ "psr-4": {
+ "Wikibase\\Client\\Tests\\": "client/tests/phpunit/includes",
+ "Wikibase\\Lib\\Tests\\": "lib/tests/phpunit",
+ "Wikibase\\View\\": "view/src",
+ "Wikibase\\View\\Tests\\": "view/tests/phpunit"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/";,
+ "license": [
+ "GPL-2.0+"
+ ],
+ "authors": [
+ {
+ "name": "The Wikidata team"
+ }
+ ],
+ "description": "Structured data repository for MediaWiki",
+ "homepage": "http://wikiba.se";,
+ "keywords": [
+ "wikibase",
+ "wikibaseclient",
+ "wikibaselib",
+ "wikibaserepo",
+ "wikidata"
+ ]
}
]
--
To view, visit https://gerrit.wikimedia.org/r/293570
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iee417540fb2c2e2ed837125f2076128cc983df26
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikidata
Gerrit-Branch: wmf/1.28.0-wmf.3
Gerrit-Owner: Hoo man <[email protected]>
Gerrit-Reviewer: Addshore <[email protected]>
Gerrit-Reviewer: Aude <[email protected]>
Gerrit-Reviewer: Hoo man <[email protected]>
Gerrit-Reviewer: Tobias Gritschacher <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
