[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: remove unused injectrecentChanges option
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/370972 )
Change subject: remove unused injectrecentChanges option
..
remove unused injectrecentChanges option
This setting has been ineffective since I19f29d7784fae
Change-Id: I3d38a459460f19744fbfdb8ff31c0a9ededb8499
---
M client/config/WikibaseClient.default.php
M client/config/WikibaseClient.example.php
M client/includes/Changes/ChangeHandler.php
M client/includes/WikibaseClient.php
M client/tests/phpunit/includes/Changes/ChangeHandlerTest.php
M docs/options.wiki
6 files changed, 4 insertions(+), 30 deletions(-)
Approvals:
jenkins-bot: Verified
Thiemo Mättig (WMDE): Looks good to me, approved
diff --git a/client/config/WikibaseClient.default.php
b/client/config/WikibaseClient.default.php
index 0f233c3..29b8098 100644
--- a/client/config/WikibaseClient.default.php
+++ b/client/config/WikibaseClient.default.php
@@ -24,7 +24,6 @@
// but we will need to make sure the caching works good enough
'siteLocalID' => $wgLanguageCode,
'languageLinkSiteGroup' => null,
- 'injectRecentChanges' => true,
'showExternalRecentChanges' => true,
'sendEchoNotification' => false,
'echoIcon' => false,
diff --git a/client/config/WikibaseClient.example.php
b/client/config/WikibaseClient.example.php
index 27469f0..07d4489 100644
--- a/client/config/WikibaseClient.example.php
+++ b/client/config/WikibaseClient.example.php
@@ -20,7 +20,6 @@
// Defaults to $wgDBname.
// $wgWBClientSettings['siteGlobalID'] = "mywiki";
-$wgWBClientSettings['injectRecentChanges'] = true;
$wgWBClientSettings['showExternalRecentChanges'] = true;
// If this wiki also runs the Wikibase repo extension,
diff --git a/client/includes/Changes/ChangeHandler.php
b/client/includes/Changes/ChangeHandler.php
index 58dc2ec..3c65800 100644
--- a/client/includes/Changes/ChangeHandler.php
+++ b/client/includes/Changes/ChangeHandler.php
@@ -50,23 +50,11 @@
private $siteLookup;
/**
-* @var string
-*/
- private $repoId;
-
- /**
-* @var bool
-*/
- private $injectRecentChanges;
-
- /**
* @param AffectedPagesFinder $affectedPagesFinder
* @param TitleFactory $titleFactory
* @param PageUpdater $updater
* @param ChangeRunCoalescer $changeRunCoalescer
* @param SiteLookup $siteLookup
-* @param string $repoId
-* @param bool $injectRecentChanges
*
* @throws InvalidArgumentException
*/
@@ -75,21 +63,13 @@
TitleFactory $titleFactory,
PageUpdater $updater,
ChangeRunCoalescer $changeRunCoalescer,
- SiteLookup $siteLookup,
- $repoId,
- $injectRecentChanges = true
+ SiteLookup $siteLookup
) {
- if ( !is_bool( $injectRecentChanges ) ) {
- throw new InvalidArgumentException(
'$injectRecentChanges must be a bool' );
- }
-
$this->affectedPagesFinder = $affectedPagesFinder;
$this->titleFactory = $titleFactory;
$this->updater = $updater;
$this->changeRunCoalescer = $changeRunCoalescer;
$this->siteLookup = $siteLookup;
- $this->repoId = $repoId;
- $this->injectRecentChanges = $injectRecentChanges;
}
/**
diff --git a/client/includes/WikibaseClient.php
b/client/includes/WikibaseClient.php
index 164f09f..8a250dc 100644
--- a/client/includes/WikibaseClient.php
+++ b/client/includes/WikibaseClient.php
@@ -1199,8 +1199,7 @@
new TitleFactory(),
$pageUpdater,
$changeListTransformer,
- $this->siteLookup,
- $this->settings->getSetting( 'injectRecentChanges' )
+ $this->siteLookup
);
}
diff --git a/client/tests/phpunit/includes/Changes/ChangeHandlerTest.php
b/client/tests/phpunit/includes/Changes/ChangeHandlerTest.php
index a3dc146..5857711 100644
--- a/client/tests/phpunit/includes/Changes/ChangeHandlerTest.php
+++ b/client/tests/phpunit/includes/Changes/ChangeHandlerTest.php
@@ -78,9 +78,7 @@
$titleFactory,
$updater ?: new MockPageUpdater(),
$this->getChangeRunCoalescer(),
- $this->getMock( SiteLookup::class ),
- 'repowiki',
- true
+ $this->getMock( SiteLookup::class )
);
return $handler;
diff --git a/docs/options.wiki b/docs/options.wiki
index f1905ca..3e8a570 100644
--- a/docs/options.wiki
+++ b/docs/options.wiki
@@ -106,8
[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: remove unused injectrecentChanges option
Daniel Kinzler has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/370972 )
Change subject: remove unused injectrecentChanges option
..
remove unused injectrecentChanges option
This setting has been ineffective since I19f29d7784fae
Change-Id: I3d38a459460f19744fbfdb8ff31c0a9ededb8499
---
M client/config/WikibaseClient.default.php
M client/config/WikibaseClient.example.php
M client/includes/Changes/ChangeHandler.php
M client/includes/WikibaseClient.php
M client/tests/phpunit/includes/Changes/ChangeHandlerTest.php
M docs/options.wiki
6 files changed, 4 insertions(+), 30 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/72/370972/1
diff --git a/client/config/WikibaseClient.default.php
b/client/config/WikibaseClient.default.php
index 0f233c3..29b8098 100644
--- a/client/config/WikibaseClient.default.php
+++ b/client/config/WikibaseClient.default.php
@@ -24,7 +24,6 @@
// but we will need to make sure the caching works good enough
'siteLocalID' => $wgLanguageCode,
'languageLinkSiteGroup' => null,
- 'injectRecentChanges' => true,
'showExternalRecentChanges' => true,
'sendEchoNotification' => false,
'echoIcon' => false,
diff --git a/client/config/WikibaseClient.example.php
b/client/config/WikibaseClient.example.php
index 27469f0..07d4489 100644
--- a/client/config/WikibaseClient.example.php
+++ b/client/config/WikibaseClient.example.php
@@ -20,7 +20,6 @@
// Defaults to $wgDBname.
// $wgWBClientSettings['siteGlobalID'] = "mywiki";
-$wgWBClientSettings['injectRecentChanges'] = true;
$wgWBClientSettings['showExternalRecentChanges'] = true;
// If this wiki also runs the Wikibase repo extension,
diff --git a/client/includes/Changes/ChangeHandler.php
b/client/includes/Changes/ChangeHandler.php
index 58dc2ec..3c65800 100644
--- a/client/includes/Changes/ChangeHandler.php
+++ b/client/includes/Changes/ChangeHandler.php
@@ -50,23 +50,11 @@
private $siteLookup;
/**
-* @var string
-*/
- private $repoId;
-
- /**
-* @var bool
-*/
- private $injectRecentChanges;
-
- /**
* @param AffectedPagesFinder $affectedPagesFinder
* @param TitleFactory $titleFactory
* @param PageUpdater $updater
* @param ChangeRunCoalescer $changeRunCoalescer
* @param SiteLookup $siteLookup
-* @param string $repoId
-* @param bool $injectRecentChanges
*
* @throws InvalidArgumentException
*/
@@ -75,21 +63,13 @@
TitleFactory $titleFactory,
PageUpdater $updater,
ChangeRunCoalescer $changeRunCoalescer,
- SiteLookup $siteLookup,
- $repoId,
- $injectRecentChanges = true
+ SiteLookup $siteLookup
) {
- if ( !is_bool( $injectRecentChanges ) ) {
- throw new InvalidArgumentException(
'$injectRecentChanges must be a bool' );
- }
-
$this->affectedPagesFinder = $affectedPagesFinder;
$this->titleFactory = $titleFactory;
$this->updater = $updater;
$this->changeRunCoalescer = $changeRunCoalescer;
$this->siteLookup = $siteLookup;
- $this->repoId = $repoId;
- $this->injectRecentChanges = $injectRecentChanges;
}
/**
diff --git a/client/includes/WikibaseClient.php
b/client/includes/WikibaseClient.php
index 164f09f..8a250dc 100644
--- a/client/includes/WikibaseClient.php
+++ b/client/includes/WikibaseClient.php
@@ -1199,8 +1199,7 @@
new TitleFactory(),
$pageUpdater,
$changeListTransformer,
- $this->siteLookup,
- $this->settings->getSetting( 'injectRecentChanges' )
+ $this->siteLookup
);
}
diff --git a/client/tests/phpunit/includes/Changes/ChangeHandlerTest.php
b/client/tests/phpunit/includes/Changes/ChangeHandlerTest.php
index a3dc146..5857711 100644
--- a/client/tests/phpunit/includes/Changes/ChangeHandlerTest.php
+++ b/client/tests/phpunit/includes/Changes/ChangeHandlerTest.php
@@ -78,9 +78,7 @@
$titleFactory,
$updater ?: new MockPageUpdater(),
$this->getChangeRunCoalescer(),
- $this->getMock( SiteLookup::class ),
- 'repowiki',
- true
+ $this->getMock( SiteLookup::class )
);
return $handler;
diff --git a/docs/options.wiki b/docs/options.wiki
index f1905ca..3e8a570 100644
--- a/docs/options.wiki
+++ b/docs/options.wiki
@
