Bene has uploaded a new change for review.
https://gerrit.wikimedia.org/r/223258
Change subject: Remove global state from EditFilterHookRunner
......................................................................
Remove global state from EditFilterHookRunner
Change-Id: I408ad1fad75f0ecec708c0344e48c2181fe396e1
---
M repo/includes/Hooks/EditFilterHookRunner.php
M repo/includes/UpdateRepo/UpdateRepoJob.php
M repo/includes/UpdateRepo/UpdateRepoOnDeleteJob.php
M repo/includes/UpdateRepo/UpdateRepoOnMoveJob.php
4 files changed, 8 insertions(+), 14 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/58/223258/1
diff --git a/repo/includes/Hooks/EditFilterHookRunner.php
b/repo/includes/Hooks/EditFilterHookRunner.php
index 9a3e16d..bb187c8 100644
--- a/repo/includes/Hooks/EditFilterHookRunner.php
+++ b/repo/includes/Hooks/EditFilterHookRunner.php
@@ -38,24 +38,15 @@
private $entityContentFactory;
/**
- * @var RequestContext|DerivativeContext
+ * @var IContextSource
*/
private $context;
public function __construct(
EntityTitleLookup $titleLookup,
EntityContentFactory $entityContentFactory,
- $context = null
+ IContextSource $context
) {
- if ( $context !== null && !$context instanceof RequestContext
&& !$context instanceof DerivativeContext ) {
- throw new InvalidArgumentException( '$context must be
an instance of RequestContext'
- . ' or DerivativeContext' );
- }
-
- if ( $context === null ) {
- $context = RequestContext::getMain();
- }
-
$this->titleLookup = $titleLookup;
$this->entityContentFactory = $entityContentFactory;
$this->context = $context;
diff --git a/repo/includes/UpdateRepo/UpdateRepoJob.php
b/repo/includes/UpdateRepo/UpdateRepoJob.php
index b211277..cc58be3 100644
--- a/repo/includes/UpdateRepo/UpdateRepoJob.php
+++ b/repo/includes/UpdateRepo/UpdateRepoJob.php
@@ -80,7 +80,8 @@
$wikibaseRepo->getEntityPermissionChecker(),
new EditFilterHookRunner(
$titleLookup,
- $wikibaseRepo->getEntityContentFactory()
+ $wikibaseRepo->getEntityContentFactory(),
+ RequestContext::getMain()
)
);
}
diff --git a/repo/includes/UpdateRepo/UpdateRepoOnDeleteJob.php
b/repo/includes/UpdateRepo/UpdateRepoOnDeleteJob.php
index bc02a35..4fbce25 100644
--- a/repo/includes/UpdateRepo/UpdateRepoOnDeleteJob.php
+++ b/repo/includes/UpdateRepo/UpdateRepoOnDeleteJob.php
@@ -62,7 +62,8 @@
$wikibaseRepo->getSiteStore(),
new EditFilterHookRunner(
$titleLookup,
- $wikibaseRepo->getEntityContentFactory()
+ $wikibaseRepo->getEntityContentFactory(),
+ RequestContext::getMain()
)
);
}
diff --git a/repo/includes/UpdateRepo/UpdateRepoOnMoveJob.php
b/repo/includes/UpdateRepo/UpdateRepoOnMoveJob.php
index 824a84a..8744c01 100644
--- a/repo/includes/UpdateRepo/UpdateRepoOnMoveJob.php
+++ b/repo/includes/UpdateRepo/UpdateRepoOnMoveJob.php
@@ -67,7 +67,8 @@
$wikibaseRepo->getSiteStore(),
new EditFilterHookRunner(
$titleLookup,
- $wikibaseRepo->getEntityContentFactory()
+ $wikibaseRepo->getEntityContentFactory(),
+ RequestContext::getMain()
)
);
}
--
To view, visit https://gerrit.wikimedia.org/r/223258
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I408ad1fad75f0ecec708c0344e48c2181fe396e1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Bene <benestar.wikime...@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
