From: addshore <addshorewiki@gmail.com>
Date: Fri, 26 Jan 2018 19:17:27 +0000 (-0800)
Subject: DI for CommentStore in WatchedItemQueryService
X-Git-Tag: 1.31.0-rc.0~687
X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=commitdiff_plain;h=d9c25c2f4776832c0fe3d7be091fd7f776991122;hp=409e870719b66cdbfd8cc34667f99fafb9755c7b

DI for CommentStore in WatchedItemQueryService

Change-Id: I93d9ed5f66297da7009d5b99aa9ed48e1b10582f
---

diff --git a/includes/ServiceWiring.php b/includes/ServiceWiring.php
index 9217fc020c..397a7d25c3 100644
--- a/includes/ServiceWiring.php
+++ b/includes/ServiceWiring.php
@@ -176,7 +176,10 @@ return [
 	},
 
 	'WatchedItemQueryService' => function ( MediaWikiServices $services ) {
-		return new WatchedItemQueryService( $services->getDBLoadBalancer() );
+		return new WatchedItemQueryService(
+			$services->getDBLoadBalancer(),
+			$services->getCommentStore()
+		);
 	},
 
 	'CryptRand' => function ( MediaWikiServices $services ) {
diff --git a/includes/watcheditem/WatchedItemQueryService.php b/includes/watcheditem/WatchedItemQueryService.php
index d546f0a4e8..abe9b89fb2 100644
--- a/includes/watcheditem/WatchedItemQueryService.php
+++ b/includes/watcheditem/WatchedItemQueryService.php
@@ -59,9 +59,12 @@ class WatchedItemQueryService {
 	/** @var CommentStore */
 	private $commentStore;
 
-	public function __construct( LoadBalancer $loadBalancer ) {
+	public function __construct(
+		LoadBalancer $loadBalancer,
+		CommentStore $commentStore
+	) {
 		$this->loadBalancer = $loadBalancer;
-		$this->commentStore = CommentStore::getStore();
+		$this->commentStore = $commentStore;
 	}
 
 	/**
diff --git a/tests/phpunit/includes/watcheditem/WatchedItemQueryServiceUnitTest.php b/tests/phpunit/includes/watcheditem/WatchedItemQueryServiceUnitTest.php
index cb0e376146..5e36e94c87 100644
--- a/tests/phpunit/includes/watcheditem/WatchedItemQueryServiceUnitTest.php
+++ b/tests/phpunit/includes/watcheditem/WatchedItemQueryServiceUnitTest.php
@@ -1,5 +1,6 @@
 <?php
 
+use Wikimedia\Rdbms\LoadBalancer;
 use Wikimedia\TestingAccessWrapper;
 
 /**
@@ -9,7 +10,10 @@ class WatchedItemQueryServiceUnitTest extends MediaWikiTestCase {
 
 	use MediaWikiCoversValidator;
 
-	private function overrideCommentStore() {
+	/**
+	 * @return PHPUnit_Framework_MockObject_MockObject|CommentStore
+	 */
+	private function getMockCommentStore() {
 		$mockStore = $this->getMockBuilder( CommentStore::class )
 			->disableOriginalConstructor()
 			->getMock();
@@ -23,8 +27,18 @@ class WatchedItemQueryServiceUnitTest extends MediaWikiTestCase {
 				'fields' => [ 'commentstore' => 'field' ],
 				'joins' => [ 'commentstore' => 'join' ],
 			] );
+		return $mockStore;
+	}
 
-		$this->setService( 'CommentStore', $mockStore );
+	/**
+	 * @param PHPUnit_Framework_MockObject_MockObject|Database $mockDb
+	 * @return WatchedItemQueryService
+	 */
+	private function newService( $mockDb ) {
+		return new WatchedItemQueryService(
+			$this->getMockLoadBalancer( $mockDb ),
+			$this->getMockCommentStore()
+		);
 	}
 
 	/**
@@ -249,7 +263,7 @@ class WatchedItemQueryServiceUnitTest extends MediaWikiTestCase {
 				] ),
 			] ) );
 
-		$queryService = new WatchedItemQueryService( $this->getMockLoadBalancer( $mockDb ) );
+		$queryService = $this->newService( $mockDb );
 		$user = $this->getMockUnrestrictedNonAnonUserWithId( 1 );
 
 		$startFrom = null;
@@ -409,7 +423,7 @@ class WatchedItemQueryServiceUnitTest extends MediaWikiTestCase {
 				$startFrom = [ '20160203123456', 42 ];
 			} ) );
 
-		$queryService = new WatchedItemQueryService( $this->getMockLoadBalancer( $mockDb ) );
+		$queryService = $this->newService( $mockDb );
 		TestingAccessWrapper::newFromObject( $queryService )->extensions = [ $mockExtension ];
 
 		$startFrom = null;
@@ -808,8 +822,6 @@ class WatchedItemQueryServiceUnitTest extends MediaWikiTestCase {
 		array $expectedDbOptions,
 		array $expectedExtraJoinConds
 	) {
-		$this->overrideCommentStore();
-
 		$expectedTables = array_merge( [ 'recentchanges', 'watchlist', 'page' ], $expectedExtraTables );
 		$expectedFields = array_merge(
 			[
@@ -861,7 +873,7 @@ class WatchedItemQueryServiceUnitTest extends MediaWikiTestCase {
 			)
 			->will( $this->returnValue( [] ) );
 
-		$queryService = new WatchedItemQueryService( $this->getMockLoadBalancer( $mockDb ) );
+		$queryService = $this->newService( $mockDb );
 		$user = $this->getMockUnrestrictedNonAnonUserWithId( 1 );
 
 		$items = $queryService->getWatchedItemsWithRecentChangeInfo( $user, $options, $startFrom );
@@ -898,7 +910,7 @@ class WatchedItemQueryServiceUnitTest extends MediaWikiTestCase {
 
 		$user = $this->getMockNonAnonUserWithIdAndNoPatrolRights( 1 );
 
-		$queryService = new WatchedItemQueryService( $this->getMockLoadBalancer( $mockDb ) );
+		$queryService = $this->newService( $mockDb );
 		$items = $queryService->getWatchedItemsWithRecentChangeInfo(
 			$user,
 			[ 'filters' => [ $filtersOption ] ]
@@ -959,7 +971,7 @@ class WatchedItemQueryServiceUnitTest extends MediaWikiTestCase {
 			->method( 'getType' )
 			->will( $this->returnValue( $dbType ) );
 
-		$queryService = new WatchedItemQueryService( $this->getMockLoadBalancer( $mockDb ) );
+		$queryService = $this->newService( $mockDb );
 		$user = $this->getMockUnrestrictedNonAnonUserWithId( 1 );
 
 		$items = $queryService->getWatchedItemsWithRecentChangeInfo( $user, $options );
@@ -1058,7 +1070,7 @@ class WatchedItemQueryServiceUnitTest extends MediaWikiTestCase {
 
 		$user = $this->getMockNonAnonUserWithIdAndRestrictedPermissions( 1, $notAllowedAction );
 
-		$queryService = new WatchedItemQueryService( $this->getMockLoadBalancer( $mockDb ) );
+		$queryService = $this->newService( $mockDb );
 		$items = $queryService->getWatchedItemsWithRecentChangeInfo( $user, $options );
 
 		$this->assertEmpty( $items );
@@ -1098,7 +1110,7 @@ class WatchedItemQueryServiceUnitTest extends MediaWikiTestCase {
 			)
 			->will( $this->returnValue( [] ) );
 
-		$queryService = new WatchedItemQueryService( $this->getMockLoadBalancer( $mockDb ) );
+		$queryService = $this->newService( $mockDb );
 		$user = $this->getMockUnrestrictedNonAnonUserWithId( 1 );
 
 		$items = $queryService->getWatchedItemsWithRecentChangeInfo( $user, [ 'allRevisions' => true ] );
@@ -1183,7 +1195,7 @@ class WatchedItemQueryServiceUnitTest extends MediaWikiTestCase {
 		$mockDb->expects( $this->never() )
 			->method( $this->anything() );
 
-		$queryService = new WatchedItemQueryService( $this->getMockLoadBalancer( $mockDb ) );
+		$queryService = $this->newService( $mockDb );
 		$user = $this->getMockUnrestrictedNonAnonUserWithId( 1 );
 
 		$this->setExpectedException( InvalidArgumentException::class, $expectedInExceptionMessage );
@@ -1225,7 +1237,7 @@ class WatchedItemQueryServiceUnitTest extends MediaWikiTestCase {
 			)
 			->will( $this->returnValue( [] ) );
 
-		$queryService = new WatchedItemQueryService( $this->getMockLoadBalancer( $mockDb ) );
+		$queryService = $this->newService( $mockDb );
 		$user = $this->getMockUnrestrictedNonAnonUserWithId( 1 );
 
 		$items = $queryService->getWatchedItemsWithRecentChangeInfo(
@@ -1267,7 +1279,7 @@ class WatchedItemQueryServiceUnitTest extends MediaWikiTestCase {
 			)
 			->will( $this->returnValue( [] ) );
 
-		$queryService = new WatchedItemQueryService( $this->getMockLoadBalancer( $mockDb ) );
+		$queryService = $this->newService( $mockDb );
 		$user = $this->getMockUnrestrictedNonAnonUserWithId( 1 );
 
 		$items = $queryService->getWatchedItemsWithRecentChangeInfo(
@@ -1295,7 +1307,7 @@ class WatchedItemQueryServiceUnitTest extends MediaWikiTestCase {
 			)
 			->will( $this->returnValue( [] ) );
 
-		$queryService = new WatchedItemQueryService( $this->getMockLoadBalancer( $mockDb ) );
+		$queryService = $this->newService( $mockDb );
 		$user = $this->getMockUnrestrictedNonAnonUserWithId( 1 );
 		$otherUser = $this->getMockUnrestrictedNonAnonUserWithId( 2 );
 		$otherUser->expects( $this->once() )
@@ -1326,7 +1338,7 @@ class WatchedItemQueryServiceUnitTest extends MediaWikiTestCase {
 		$mockDb->expects( $this->never() )
 			->method( $this->anything() );
 
-		$queryService = new WatchedItemQueryService( $this->getMockLoadBalancer( $mockDb ) );
+		$queryService = $this->newService( $mockDb );
 		$user = $this->getMockUnrestrictedNonAnonUserWithId( 1 );
 		$otherUser = $this->getMockUnrestrictedNonAnonUserWithId( 2 );
 		$otherUser->expects( $this->once() )
@@ -1363,7 +1375,7 @@ class WatchedItemQueryServiceUnitTest extends MediaWikiTestCase {
 				] ),
 			] ) );
 
-		$queryService = new WatchedItemQueryService( $this->getMockLoadBalancer( $mockDb ) );
+		$queryService = $this->newService( $mockDb );
 		$user = $this->getMockNonAnonUserWithId( 1 );
 
 		$items = $queryService->getWatchedItemsForUser( $user );
@@ -1463,7 +1475,7 @@ class WatchedItemQueryServiceUnitTest extends MediaWikiTestCase {
 			)
 			->will( $this->returnValue( [] ) );
 
-		$queryService = new WatchedItemQueryService( $this->getMockLoadBalancer( $mockDb ) );
+		$queryService = $this->newService( $mockDb );
 
 		$items = $queryService->getWatchedItemsForUser( $user, $options );
 		$this->assertEmpty( $items );
@@ -1576,7 +1588,7 @@ class WatchedItemQueryServiceUnitTest extends MediaWikiTestCase {
 			)
 			->will( $this->returnValue( [] ) );
 
-		$queryService = new WatchedItemQueryService( $this->getMockLoadBalancer( $mockDb ) );
+		$queryService = $this->newService( $mockDb );
 
 		$items = $queryService->getWatchedItemsForUser( $user, $options );
 		$this->assertEmpty( $items );
@@ -1614,7 +1626,7 @@ class WatchedItemQueryServiceUnitTest extends MediaWikiTestCase {
 		array $options,
 		$expectedInExceptionMessage
 	) {
-		$queryService = new WatchedItemQueryService( $this->getMockLoadBalancer( $this->getMockDb() ) );
+		$queryService = $this->newService( $this->getMockDb() );
 
 		$this->setExpectedException( InvalidArgumentException::class, $expectedInExceptionMessage );
 		$queryService->getWatchedItemsForUser( $this->getMockNonAnonUserWithId( 1 ), $options );
@@ -1626,7 +1638,7 @@ class WatchedItemQueryServiceUnitTest extends MediaWikiTestCase {
 		$mockDb->expects( $this->never() )
 			->method( $this->anything() );
 
-		$queryService = new WatchedItemQueryService( $this->getMockLoadBalancer( $mockDb ) );
+		$queryService = $this->newService( $mockDb );
 
 		$items = $queryService->getWatchedItemsForUser( $this->getMockAnonUser() );
 		$this->assertEmpty( $items );