jenkins-bot has submitted this change and it was merged.
Change subject: Clean-up ChangeNotifier related code
......................................................................
Clean-up ChangeNotifier related code
This patch is now completely different from the previous patch set,
please review again.
Change-Id: Ic84dc0f32564f61ce37cf6a10fa9118c58816957
---
M repo/includes/WikibaseRepo.php
M repo/tests/phpunit/includes/Notifications/ChangeNotifierTest.php
2 files changed, 15 insertions(+), 39 deletions(-)
Approvals:
Aude: Looks good to me, approved
jenkins-bot: Verified
diff --git a/repo/includes/WikibaseRepo.php b/repo/includes/WikibaseRepo.php
index 8b6caf1..89f3209 100644
--- a/repo/includes/WikibaseRepo.php
+++ b/repo/includes/WikibaseRepo.php
@@ -109,7 +109,6 @@
use Wikibase\Repo\Localizer\ParseExceptionLocalizer;
use Wikibase\Repo\Modules\EntityTypesConfigValueProvider;
use Wikibase\Repo\Notifications\ChangeNotifier;
-use Wikibase\Repo\Notifications\ChangeTransmitter;
use Wikibase\Repo\Notifications\DatabaseChangeTransmitter;
use Wikibase\Repo\Notifications\HookChangeTransmitter;
use Wikibase\Repo\ParserOutput\DispatchingEntityViewFactory;
@@ -1189,30 +1188,18 @@
}
/**
- * @return ChangeTransmitter[]
- */
- private function getChangeTransmitters() {
- $transmitters = array();
-
- $transmitters[] = new HookChangeTransmitter(
'WikibaseChangeNotification' );
-
- if ( $this->settings->getSetting( 'useChangesTable' ) ) {
- $transmitters[] = new DatabaseChangeTransmitter(
- $this->getStore()->getChangeStore()
- );
- }
-
- return $transmitters;
- }
-
- /**
* @return ChangeNotifier
*/
public function getChangeNotifier() {
- return new ChangeNotifier(
- $this->getEntityChangeFactory(),
- $this->getChangeTransmitters()
- );
+ $transmitters = [
+ new HookChangeTransmitter( 'WikibaseChangeNotification'
),
+ ];
+
+ if ( $this->settings->getSetting( 'useChangesTable' ) ) {
+ $transmitters[] = new DatabaseChangeTransmitter(
$this->getStore()->getChangeStore() );
+ }
+
+ return new ChangeNotifier( $this->getEntityChangeFactory(),
$transmitters );
}
/**
diff --git a/repo/tests/phpunit/includes/Notifications/ChangeNotifierTest.php
b/repo/tests/phpunit/includes/Notifications/ChangeNotifierTest.php
index b30bd94..7b8b1b8 100644
--- a/repo/tests/phpunit/includes/Notifications/ChangeNotifierTest.php
+++ b/repo/tests/phpunit/includes/Notifications/ChangeNotifierTest.php
@@ -34,12 +34,8 @@
$changeTransmitter->expects( $this->exactly(
$expectNotifications ) )
->method( 'transmitChange' );
- $notifier = new ChangeNotifier(
-
WikibaseRepo::getDefaultInstance()->getEntityChangeFactory(),
- array( $changeTransmitter )
- );
-
- return $notifier;
+ $changeFactory =
WikibaseRepo::getDefaultInstance()->getEntityChangeFactory();
+ return new ChangeNotifier( $changeFactory, [ $changeTransmitter
] );
}
/**
@@ -48,10 +44,7 @@
* @return ItemContent
*/
private function makeItemContent( ItemId $id ) {
- $item = new Item( $id );
-
- $content = ItemContent::newFromItem( $item );
- return $content;
+ return ItemContent::newFromItem( new Item( $id ) );
}
/**
@@ -63,9 +56,7 @@
*/
protected function makeItemRedirectContent( ItemId $id, ItemId $target
) {
$title = Title::newFromText( $target->getSerialization() );
- $redirect = new EntityRedirect( $id, $target );
- $content = ItemContent::newFromRedirect( $redirect, $title );
- return $content;
+ return ItemContent::newFromRedirect( new EntityRedirect( $id,
$target ), $title );
}
/**
@@ -78,7 +69,7 @@
* @return Revision
*/
private function makeRevision( Content $content, User $user,
$revisionId, $timestamp, $parent_id = 0 ) {
- $revision = new Revision( array(
+ return new Revision( [
'id' => $revisionId,
'page' => 7,
'content' => $content,
@@ -86,9 +77,7 @@
'user_text' => $user->getName(),
'timestamp' => $timestamp,
'parent_id' => $parent_id,
- ) );
-
- return $revision;
+ ] );
}
private function makeUser( $name ) {
--
To view, visit https://gerrit.wikimedia.org/r/141666
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic84dc0f32564f61ce37cf6a10fa9118c58816957
Gerrit-PatchSet: 7
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) <thiemo.maet...@wikimedia.de>
Gerrit-Reviewer: Addshore <addshorew...@gmail.com>
Gerrit-Reviewer: Adrian Heine <m...@adrianheine.de>
Gerrit-Reviewer: Aude <aude.w...@gmail.com>
Gerrit-Reviewer: Daniel Kinzler <daniel.kinz...@wikimedia.de>
Gerrit-Reviewer: Hoo man <h...@online.de>
Gerrit-Reviewer: Thiemo Mättig (WMDE) <thiemo.maet...@wikimedia.de>
Gerrit-Reviewer: WikidataJenkins <wikidata-servi...@wikimedia.de>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
