Daniel Kinzler has uploaded a new change for review.
https://gerrit.wikimedia.org/r/212265
Change subject: Apply usage tracking in all namespaces.
......................................................................
Apply usage tracking in all namespaces.
Without arbitrary access, we only needed to track usage in "connected"
namespace. With arbitrary access enabled, we need to track usage everywhere,
since entity data may be used anywhere, regardless of whether the local page
is "connected" to a data item.
Bug: T99774
Change-Id: Ib7fb9e3d41c5b40148631b0df871f4f817d3f531
---
M client/includes/Hooks/DataUpdateHookHandlers.php
M client/tests/phpunit/includes/Hooks/DataUpdateHookHandlersTest.php
2 files changed, 3 insertions(+), 46 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/65/212265/1
diff --git a/client/includes/Hooks/DataUpdateHookHandlers.php
b/client/includes/Hooks/DataUpdateHookHandlers.php
index 90987e0..45daed9 100644
--- a/client/includes/Hooks/DataUpdateHookHandlers.php
+++ b/client/includes/Hooks/DataUpdateHookHandlers.php
@@ -26,11 +26,6 @@
class DataUpdateHookHandlers {
/**
- * @var NamespaceChecker
- */
- private $namespaceChecker;
-
- /**
* @var UsageUpdater
*/
private $usageUpdater;
@@ -39,7 +34,6 @@
$wikibaseClient = WikibaseClient::getDefaultInstance();
$settings = $wikibaseClient->getSettings();
- $namespaceChecker = $wikibaseClient->getNamespaceChecker();
$usageUpdater = new UsageUpdater(
$settings->getSetting( 'siteGlobalID' ),
$wikibaseClient->getStore()->getUsageTracker(),
@@ -48,7 +42,6 @@
);
return new DataUpdateHookHandlers(
- $namespaceChecker,
$usageUpdater
);
}
@@ -97,11 +90,8 @@
}
public function __construct(
- NamespaceChecker $namespaceChecker,
UsageUpdater $usageUpdater
) {
-
- $this->namespaceChecker = $namespaceChecker;
$this->usageUpdater = $usageUpdater;
}
@@ -115,11 +105,6 @@
*/
public function doArticleEditUpdates( WikiPage $page, &$editInfo,
$changed ) {
$title = $page->getTitle();
-
- if ( !$this->namespaceChecker->isWikibaseEnabled(
$title->getNamespace() ) ) {
- // shorten out
- return;
- }
$usageAcc = new ParserOutputUsageAccumulator( $editInfo->output
);
@@ -137,11 +122,6 @@
* @param int $pageId
*/
public function doArticleDeleteComplete( $namespace, $pageId ) {
- if ( !$this->namespaceChecker->isWikibaseEnabled( $namespace )
) {
- // shorten out
- return;
- }
-
$this->usageUpdater->updateUsageForPage(
$pageId,
array(),
diff --git a/client/tests/phpunit/includes/Hooks/DataUpdateHookHandlersTest.php
b/client/tests/phpunit/includes/Hooks/DataUpdateHookHandlersTest.php
index 5ed7f66..49a06ae 100644
--- a/client/tests/phpunit/includes/Hooks/DataUpdateHookHandlersTest.php
+++ b/client/tests/phpunit/includes/Hooks/DataUpdateHookHandlersTest.php
@@ -10,9 +10,6 @@
use Wikibase\Client\Usage\ParserOutputUsageAccumulator;
use Wikibase\DataModel\Entity\EntityId;
use Wikibase\DataModel\Entity\ItemId;
-use Wikibase\NamespaceChecker;
-use Wikibase\Settings;
-use Wikibase\SettingsArray;
use WikiPage;
/**
@@ -26,20 +23,6 @@
* @author Daniel Kinzler
*/
class DataUpdateHookHandlersTest extends \MediaWikiTestCase {
-
- /**
- * @param array $settings
- *
- * @return Settings
- */
- private function newSettings( array $settings ) {
- $defaults = array(
- 'namespaces' => array( NS_MAIN, NS_CATEGORY ),
- 'siteGlobalid' => 'enwiki',
- );
-
- return new SettingsArray( array_merge( $defaults, $settings ) );
- }
/**
* @param Title $title
@@ -92,15 +75,9 @@
* @return DataUpdateHookHandlers
*/
private function newDataUpdateHookHandlers( Title $title, array
$expectedUsages = null, array $settings = array() ) {
- $settings = $this->newSettings( $settings );
-
- $namespaces = $settings->getSetting( 'namespaces' );
- $namespaceChecker = new NamespaceChecker( array(), $namespaces
);
-
$usageUpdater = $this->newUsageUpdater( $title, $expectedUsages
);
return new DataUpdateHookHandlers(
- $namespaceChecker,
$usageUpdater
);
}
@@ -178,9 +155,9 @@
array(),
),
- 'ignored-namespace' => array(
- Title::makeTitle( NS_USER, 'Foo' ),
- null,
+ 'other namespace' => array(
+ Title::makeTitle( NS_USER_TALK, 'Foo' ),
+ array(),
),
);
}
--
To view, visit https://gerrit.wikimedia.org/r/212265
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib7fb9e3d41c5b40148631b0df871f4f817d3f531
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Daniel Kinzler <daniel.kinz...@wikimedia.de>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
